New project structure
Updated project structure and refactored
Merge branch 'master' of https://github.com/ssengupta14/project