Modularizing
Split project into modules
Readme updated
Merge branch 'develop'