Refactoring top-level of the build