Changes to the Naming Conventions
Added "Modules" back to the Naming Conventions
Merge pull request #25 from simurai/naming-conventions

Changes to the Naming Conventions