Merge pull request #4 from cshubhamrao/master

Include changes relating to general project structure