Cleaned up and unified services
Added StateService, useful for saving/restoring the game state