Reorganize modules
Fix path to main module
Merge pull request #12 from nirs/master

Reorganize modules