Cleaning directory structure.
Merge pull request #10 from Stuntaneous/master

Cleaning directory structure.