Game classes refactoring complete