Merge pull request #4 from theovoss/Restructuring

Restructuring
Merge remote-tracking branch 'origin/master' into Restructuring