There shall be (1) an Office of the State Fire Marshal, and (2) an Office of the State Building Inspector, within the Department of Administrative Services. The head of each office shall report to the Commissioner of Administrative Services.