Game entity refactoring