Reorganized server helper modules