Build architecture refactoring