Moved things into files, organised game structure into sub-classes