updated buildings to new spec, moved to new folder and renamed to be somewhat consistant with each other