Refactoring

* Moved code to different files
Moved views to view folder
Merge pull request #82 from prakashpp/develop

Refactoring #4388