Cleaning up modules
Readme update