Changed to module structure for non-IDLE servers