Use module system on goldbach.
Merge goldbach module changes with updates from other systems.