Restructured the Server