refactoring the buildings/structures hierarchy