Refactoring partially complete

Added all the game code, but am about to break the launcher, probably
More changes, seems to be working