Moved classes to real folders
Merge pull request #3 from michbeck100/master

Moved classes to real folders