diff --git a/auth_token/server/AuthTokenSvc/Makefile.am b/auth_token/server/AuthTokenSvc/Makefile.am
index ae83206c..3552375a 100644
--- a/auth_token/server/AuthTokenSvc/Makefile.am
+++ b/auth_token/server/AuthTokenSvc/Makefile.am
@@ -40,13 +40,21 @@ MODULE_NAME = CasaAuthToken
 MODULE_EXT = jar
 
 JAVAFILES = src/com/novell/casa/authtoksvc/ProtoDefs.java \
+	src/com/novell/casa/authtoksvc/SvcConfig.java \
+	src/com/novell/casa/authtoksvc/IdenTokenConfig.java \
+	src/com/novell/casa/authtoksvc/AuthTokenConfig.java \
+	src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \
+	src/com/novell/casa/authtoksvc/AuthMechanism.java \
+	src/com/novell/casa/authtoksvc/Authenticate.java \
+	src/com/novell/casa/authtoksvc/RpcMethod.java \
+	src/com/novell/casa/authtoksvc/Rpc.java \
+	src/com/novell/casa/authtoksvc/GetAuthPolicy.java \
 	src/com/novell/casa/authtoksvc/Base64Coder.java \
 	src/com/novell/casa/authtoksvc/AuthReqMsg.java \
 	src/com/novell/casa/authtoksvc/AuthRespMsg.java \
 	src/com/novell/casa/authtoksvc/IdentityToken.java \
 	src/com/novell/casa/authtoksvc/CasaIdentityToken.java \
 	src/com/novell/casa/authtoksvc/AuthToken.java \
-	src/com/novell/casa/authtoksvc/GetAuthPolicy.java \
 	src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java \
 	src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java \
 	src/com/novell/casa/authtoksvc/GetAuthToken.java \
@@ -61,6 +69,7 @@ BUILDDIR = build
 WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT)
 
 AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken.class \
+		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class \
 		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdentityToken.class \
 		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken.class \
 		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/Base64Coder.class
@@ -98,8 +107,6 @@ $(BUILDDIR):
 	[ -d $(BUILDDIR)/webapp/WEB-INF/classes ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/classes
 	[ -d $(BUILDDIR)/webapp/WEB-INF/lib ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/lib
 	[ -d $(BUILDDIR)/webapp/WEB-INF/conf ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf
-	[ -d $(BUILDDIR)/webapp/WEB-INF/conf/auth_policy ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/auth_policy
-	[ -d $(BUILDDIR)/webapp/WEB-INF/conf/iden_policy ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/iden_policy
 	[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR)
 	[ -d $(CASALIBDIR)/java ] || mkdir -p $(CASALIBDIR)/java