Reorganized folder structure
Merge pull request #33 from ianmorris101/master

Reorganized folder structure