Unstable into Testing

Major code organisation changes. Should make it easier to start making a game.