Merge pull request #25 from manojgn/CleanupBranch

More directory structure changes
Missed out a file from my previous commit.