Move Modules from Core to API.
Fix ref.