Fix up Modules source usage

Removed unused objects from Modules/ from the project.

Fixed up Modules/Setup to reference all remaining modules.