building: Move building type to separate field