Rename all modules and services
Merge pull request #340 from alexmckenley/renameModules

Rename all modules and services