Refactoring build system