Reogranised and added GameBase class