Module File Cleanup

Cleaned up the module files a little.