change folder hierachy
Merge remote-tracking branch 'origin/ManicDev'