Refactored SimpleChurch into MultipartBuilding
A few small issues