Major reorganization into core and modules.