Organize Server class