Start server refactoring