Build refactoring.