Dividing logic into GameEntry, Labyrinth and LabyrinthGame classes; Removing wrong inheritance; Moving fields from Labyrinth to LabyrinthGame class where they are actually used. Changing (and adding) public access modifiers. Adding appropriate references to moved fields.