Restructure folder
Minor Updates
Update
Merge pull request #14 from daven009/master

Resolve problem & Conflicts