Refactoring Building