updated folder heirarchies, renamed files to make more sense
Merge branch 'master' of github.com:sethhoward1988/mario-game