back to correct file structure, ready to merge changes
Merge pull request #4 from onweapps/master

back to correct file structure, ready to merge changes