moved folders around
Merge pull request #2 from amitgandhinz/master

moved folders around