Updated project structure
Merge branch 'master' of github.com:MelodyLucid/freezing-ironman