More simplification of the build mechanism.
Checkpoint in refactoring the core modules.