Refactor in game server package