Cleanup: Merge Modules

Merged related modules, and tweaked some imports.