Restructured folders
Merge pull request #22 from Screengoose/foldermove

Restructured folders