Restart
one less file per module
Merge pull request #5 from jay-doubleyou/master

merge to master