Minor refactoring of build structure.