Further re-organization of server module