Finished refactoring for now, added some basic comments.
Merge branch 'master' of https://github.com/Uncooked/TestGame