Refactored

refactored gamestate_play & gamestate server.