diff --git a/auth_token/server/AuthTokenSvc/WebContent/WEB-INF/web.xml b/auth_token/server/AuthTokenSvc/WebContent/WEB-INF/web.xml
index 36c26051..cf655ee5 100644
--- a/auth_token/server/AuthTokenSvc/WebContent/WEB-INF/web.xml
+++ b/auth_token/server/AuthTokenSvc/WebContent/WEB-INF/web.xml
@@ -2,58 +2,19 @@
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 	<display-name>
 	CasaAuthTokenSvc</display-name>
-	<servlet>
-		<description>
-		</description>
-		<display-name>
-		GetAuthPolicy</display-name>
-		<servlet-name>GetAuthPolicy</servlet-name>
-		<servlet-class>
-		com.novell.casa.authserver.GetAuthPolicy</servlet-class>
-	</servlet>
-	<servlet>
-		<description>
-		</description>
-		<display-name>
-		PwdAuthenticate</display-name>
-		<servlet-name>PwdAuthenticate</servlet-name>
-		<servlet-class>
-		com.novell.casa.authserver.PwdAuthenticate</servlet-class>
-	</servlet>
-	<servlet>
-		<description>
-		</description>
-		<display-name>
-		Krb5Authenticate</display-name>
-		<servlet-name>Krb5Authenticate</servlet-name>
-		<servlet-class>
-		com.novell.casa.authserver.Krb5Authenticate</servlet-class>
-	</servlet>
-	<servlet>
-		<description>
-		</description>
-		<display-name>
-		GetAuthToken</display-name>
-		<servlet-name>GetAuthToken</servlet-name>
-		<servlet-class>
-		com.novell.casa.authserver.GetAuthToken</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GetAuthPolicy</servlet-name>
-		<url-pattern>/GetAuthPolicy</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PwdAuthenticate</servlet-name>
-		<url-pattern>/PwdAuthenticate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Krb5Authenticate</servlet-name>
-		<url-pattern>/Krb5Authenticate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>GetAuthToken</servlet-name>
-		<url-pattern>/GetAuthToken</url-pattern>
-	</servlet-mapping>
+    <servlet>
+        <description>
+        </description>
+        <display-name>
+        Rpc</display-name>
+        <servlet-name>Rpc</servlet-name>
+        <servlet-class>
+        com.novell.casa.authtoksvc.Rpc</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Rpc</servlet-name>
+        <url-pattern>/Rpc</url-pattern>
+    </servlet-mapping>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>