[UPDATE] Updated module structure
Merge pull request #2 from TheSerapher/master

[UPDATE] Updated module structure