Updated directory structure
Merge pull request #1 from awestroke/update-structure

Updated directory structure