Fixed hack and restructured all code
Merge branch 'master' of https://github.com/DaysOfThePhoenix/TeamFranciumRepository