Games refactoring