Standardized module naming/directories
Removed context.xml
Merge pull request #14 from isuftin/master

Standardized module naming/directories