build tool refactoring