Cleaned up server module after restructure.