some file relocation
Merge branch 'master' of https://github.com/wormangel/CandyTripSaga