Lots of cleanup and folder organization
Merge pull request #1 from robmuh/master

Lots of cleanup and folder organization