diff --git a/CASA-auth-token/non-java/client/README b/CASA-auth-token/non-java/client/README
index bde5cec6..60986c80 100644
--- a/CASA-auth-token/non-java/client/README
+++ b/CASA-auth-token/non-java/client/README
@@ -40,7 +40,7 @@ libcasa_c_authtoken utilizes mechanism plug-ins for authenticating to ATSs.
 The client auth_token package installs mechanisms for the support of Kerberos5
 and Username/Password authentication. To configure additional authentication mechanism
 plug-ins, place their configuration file in the folder for CASA Authentication Token module
-configuration. The path to this folder under linux is /etc/CASA/authtoken.d/client.d/mechanisms.d/.
+configuration. The path to this folder under linux is /etc/CASA/authtoken/client/mechanisms/.
 The path to this folder under Windows is \Program Files\novell\CASA\Etc\Auth\Mechanisms\. The name of
 the plug-in configuration file is related to the authentication mechanism type in the following
 manner: AuthenticationMechanismTypeName.conf.
diff --git a/CASA-auth-token/non-java/client/linux/platform.c b/CASA-auth-token/non-java/client/linux/platform.c
index b18cd7c6..32482f8d 100644
--- a/CASA-auth-token/non-java/client/linux/platform.c
+++ b/CASA-auth-token/non-java/client/linux/platform.c
@@ -100,10 +100,10 @@ static
 pthread_mutex_t   g_hNormalizedHostNameCacheMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // Client configuration file folder
-char  clientConfigFolder[] = "/etc/CASA/authtoken.d/client.d";
+char  clientConfigFolder[] = "/etc/CASA/authtoken/client";
 
 // Authentication mechanism configuration file folder
-char  mechConfigFolder[] = "/etc/CASA/authtoken.d/client.d/mechanisms.d";
+char  mechConfigFolder[] = "/etc/CASA/authtoken/client/mechanisms";
 
 // Module Synchronization mutex
 pthread_mutex_t   g_hModuleMutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes
index ebd84752..7d67cf88 100644
--- a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes
+++ b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 19 09:20:24 MDT 2006 - jluciani@novell.com
+
+- Created client-devel RPM.
+
+- Made changes to conform to updates made to the Java components
+  with regard to the layout of files.
+
 -------------------------------------------------------------------
 Tue Oct 10 08:46:22 MDT 2006 - jluciani@novell.com
 
diff --git a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in
index aa8feb47..394dbbe6 100644
--- a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in
+++ b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in
@@ -52,6 +52,7 @@ modules provided to integrate with PAM or the Apache Web Server.
 Authors:
 --------
     Juan Carlos Luciani - jluciani@novell.com
+
  
 %package -n CASA_auth_token_client
 Summary:        Novell CASA Authentication Token Libraries for Client Applications
@@ -78,6 +79,7 @@ Authors:
     Juan Carlos Luciani - jluciani@novell.com
     Todd Throne
     Jim Norman
+
  
 %package -n CASA_auth_token_pam_support
 Summary:        Novell CASA Authentication Token PAM Support Components
@@ -102,6 +104,7 @@ PAM module for token verification.
 Authors:
 --------
     Juan Carlos Luciani - jluciani@novell.com
+
  
 %package -n CASA_auth_token_apache2_2_support
 Summary:        Novell CASA Authentication Token Apache2_2 Support Components
@@ -131,10 +134,11 @@ Authors:
 --------
     Juan Carlos Luciani - jluciani@novell.com
 
+
 %package -n CASA_auth_token-devel
-Summary:        Novell CASA Authentication Token Development Files
+Summary:        Novell CASA Authentication Token Server Development Files
 Group:          Development/Libraries/C and C++
-Requires:       CASA-devel CASA_auth_token_native CASA_auth_token_client CASA_auth_token_jaas_support CASA_auth_token_pam_support CASA_auth_token_apache2_2_support CASA_auth_token_svc
+Requires:       CASA-devel CASA_auth_token_native CASA_auth_token_jaas_support CASA_auth_token_pam_support CASA_auth_token_apache2_2_support CASA_auth_token_svc
 
 %description -n CASA_auth_token-devel
 CASA_auth_token is an authentication token infrastructure with support
@@ -148,10 +152,40 @@ basis. Because of this feature, we say that CASA_auth_token projects an
 "Authenticated Identity".
 
 The CASA_auth_token-devel package contains the files necessary for the
-development of client and server applications that utilize the CASA
+development of server applications that utilize the CASA (Common
+Authentication Service Adapter) authentication token infrastructure for
+authentication.
+
+Authors:
+--------
+    Juan Carlos Luciani - jluciani@novell.com
+
+
+%package -n CASA_auth_token_client-devel
+Summary:        Novell CASA Authentication Token Client Development Files
+Group:          Development/Libraries/C and C++
+Requires:       CASA-devel CASA_auth_token_client
+
+%description -n CASA_auth_token_client-devel
+CASA_auth_token is an authentication token infrastructure with support
+for multiple authentication mechanisms with an emphasis on providing a
+scalable single sign-on solution.
+
+A key feature of CASA_auth_token is that its authentication tokens
+contain identity information about the entity being authenticated. This
+information contained in the tokens is configured on a per-service
+basis. Because of this feature, we say that CASA_auth_token projects an
+"Authenticated Identity".
+
+The CASA_auth_token-client-devel package contains the files necessary
+for the development of client applications that utilize the CASA
 (Common Authentication Service Adapter) authentication token
 infrastructure for authentication.
 
+Authors:
+--------
+    Juan Carlos Luciani - jluciani@novell.com
+
  
 %prep
 %setup -q
@@ -193,11 +227,11 @@ install -d -m 755 %{buildroot}/var/lib/CASA
 install -d -m 755 %{buildroot}/var/lib/CASA/authtoken
 install -d -m 755 %{buildroot}/var/lib/CASA/authtoken/validate
 install -d -m 755 %{buildroot}/etc/CASA
-install -d -m 755 %{buildroot}/etc/CASA/authtoken.d
-install -d -m 755 %{buildroot}/etc/CASA/authtoken.d/validate.d
-install -d -m 755 %{buildroot}/etc/CASA/authtoken.d/modules.d
-install -d -m 755 %{buildroot}/etc/CASA/authtoken.d/client.d
-install -d -m 755 %{buildroot}/etc/CASA/authtoken.d/client.d/mechanisms.d
+install -d -m 755 %{buildroot}/etc/CASA/authtoken
+install -d -m 755 %{buildroot}/etc/CASA/authtoken/validate
+install -d -m 755 %{buildroot}/etc/CASA/authtoken/modules
+install -d -m 755 %{buildroot}/etc/CASA/authtoken/client
+install -d -m 755 %{buildroot}/etc/CASA/authtoken/client/mechanisms
 
 ## CASA_auth_token_native ##
 # Libs
@@ -206,43 +240,37 @@ install -m 755 %{_lib}/%{cfg}/casa_iden_token.so %{buildroot}%{prefix}/%{_lib}/C
 install -m 755 %{_lib}/%{cfg}/libcasa_c_ipc.so %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.%{bldno}
 install -m 755 %{_lib}/%{cfg}/libcasa_s_ipc.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.%{bldno}
 
-# Lib Symbolic Links
-ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
-ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+# Symbolic Links
 ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
 ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.1
-ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
-ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.1
-ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
-ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.1
 
 # Bins
 install -m 755 bin/%{cfg}/CasaAuthtokenValidateD %{buildroot}%{prefix}/bin/casa_atvd
 
 # Others
-install -m 644 %{_lib}/%{cfg}/CasaIdentityToken.conf %{buildroot}/etc/CASA/authtoken.d/modules.d/CasaIdentityToken.conf
+install -m 644 %{_lib}/%{cfg}/CasaIdentityToken.conf %{buildroot}/etc/CASA/authtoken/modules/CasaIdentityToken.conf
 install -m 755 server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD %{buildroot}/etc/init.d/casa_atvd
-install -m 750 server/AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken.d/validate.d/
+install -m 750 server/AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/validate/
 ln -sf casa_atvd %{buildroot}%{prefix}/sbin/rccasa_atvd
 
+
 ## CASA_auth_token_client ##
 # Libs
 install -m 755 %{_lib}/%{cfg}/libcasa_c_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so.%{bldno}
 install -m 755 %{_lib}/%{cfg}/krb5mech.so %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.%{bldno}
 install -m 755 %{_lib}/%{cfg}/pwmech.so %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/pwmech.so.%{bldno}
 
-# Lib Symbolic Links
-ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so
-ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so.1
+# Symbolic Links
 ln -sf krb5mech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/krb5mech.so
 ln -sf krb5mech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.1
 ln -sf pwmech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/pwmech.so
 ln -sf pwmech.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/pwmech.so.1
 
 # Others
-install -m 644 client/client.conf %{buildroot}/etc/CASA/authtoken.d/client.d/client.conf
-install -m 644 %{_lib}/%{cfg}/Krb5Authenticate.conf %{buildroot}/etc/CASA/authtoken.d/client.d/mechanisms.d/Krb5Authenticate.conf
-install -m 644 %{_lib}/%{cfg}/PwdAuthenticate.conf %{buildroot}/etc/CASA/authtoken.d/client.d/mechanisms.d/PwdAuthenticate.conf
+install -m 644 client/client.conf %{buildroot}/etc/CASA/authtoken/client/client.conf
+install -m 644 %{_lib}/%{cfg}/Krb5Authenticate.conf %{buildroot}/etc/CASA/authtoken/client/mechanisms/Krb5Authenticate.conf
+install -m 644 %{_lib}/%{cfg}/PwdAuthenticate.conf %{buildroot}/etc/CASA/authtoken/client/mechanisms/PwdAuthenticate.conf
+
 
 ## CASA_auth_token_pam_support ##
 # Libs
@@ -253,17 +281,34 @@ install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}/%{_lib}/security/p
 # Libs
 install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
 
-# Lib Symbolic Links
-ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
-ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
 
 ## CASA_auth_token-devel ##
 # Header Files
-install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_c_ipc.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_s_ipc.h %{buildroot}%{prefix}/include
 
+# Symbolic Links for CASA_auth_token_native files
+ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
+ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
+ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.1
+ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
+ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.1
+
+# Symbolic Links for CASA_auth_token_apache2_2_support files
+ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
+ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
+
+
+## CASA_auth_token_client-devel ##
+# Header Files
+install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include
+
+# Symbolic Links for CASA_auth_token_client files
+ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so
+ln -sf libcasa_c_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_authtoken.so.1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -286,7 +331,7 @@ fi
 %post
 /sbin/ldconfig
 
-# Install casa_atvd init script
+# Install casa_atvd init script, set it to start by default.
 %{fillup_and_insserv casa_atvd}
 
 
@@ -318,24 +363,18 @@ rm -rf /var/lib/CASA/authtoken/validate
 %dir /var/lib/CASA/authtoken
 %dir %attr(-, casaatvd, casaauth) /var/lib/CASA/authtoken/validate
 %dir /etc/CASA
-%dir /etc/CASA/authtoken.d
-%dir /etc/CASA/authtoken.d/validate.d
-%dir /etc/CASA/authtoken.d/modules.d
+%dir /etc/CASA/authtoken
+%dir /etc/CASA/authtoken/validate
+%dir /etc/CASA/authtoken/modules
 %{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
-%{prefix}/%{_lib}/libcasa_s_authtoken.so
-%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.1
 %{prefix}/%{_lib}/libcasa_c_ipc.so.%{bldno}
-%{prefix}/%{_lib}/libcasa_c_ipc.so
-%{prefix}/%{_lib}/libcasa_c_ipc.so.1
 %{prefix}/%{_lib}/libcasa_s_ipc.so.%{bldno}
-%{prefix}/%{_lib}/libcasa_s_ipc.so
-%{prefix}/%{_lib}/libcasa_s_ipc.so.1
 %{prefix}/bin/casa_atvd
-%config /etc/CASA/authtoken.d/validate.d/envvars
-%config /etc/CASA/authtoken.d/modules.d/CasaIdentityToken.conf
+%config /etc/CASA/authtoken/validate/envvars
+%config /etc/CASA/authtoken/modules/CasaIdentityToken.conf
 /etc/init.d/casa_atvd
 /usr/sbin/rccasa_atvd
 
@@ -358,21 +397,19 @@ rm -rf /var/lib/CASA/authtoken/validate
 %dir %{prefix}/%{_lib}/CASA
 %dir %{prefix}/%{_lib}/CASA/authtoken
 %dir /etc/CASA
-%dir /etc/CASA/authtoken.d
-%dir /etc/CASA/authtoken.d/client.d
-%dir /etc/CASA/authtoken.d/client.d/mechanisms.d
+%dir /etc/CASA/authtoken
+%dir /etc/CASA/authtoken/client
+%dir /etc/CASA/authtoken/client/mechanisms
 %{prefix}/%{_lib}/libcasa_c_authtoken.so.%{bldno}
-%{prefix}/%{_lib}/libcasa_c_authtoken.so
-%{prefix}/%{_lib}/libcasa_c_authtoken.so.1
 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so
 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.1
 %{prefix}/%{_lib}/CASA/authtoken/pwmech.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/pwmech.so
 %{prefix}/%{_lib}/CASA/authtoken/pwmech.so.1
-%config /etc/CASA/authtoken.d/client.d/client.conf
-%config /etc/CASA/authtoken.d/client.d/mechanisms.d/Krb5Authenticate.conf
-%config /etc/CASA/authtoken.d/client.d/mechanisms.d/PwdAuthenticate.conf
+%config /etc/CASA/authtoken/client/client.conf
+%config /etc/CASA/authtoken/client/mechanisms/Krb5Authenticate.conf
+%config /etc/CASA/authtoken/client/mechanisms/PwdAuthenticate.conf
 
 
 ## CASA_auth_token_pam_support ##
@@ -410,8 +447,6 @@ rm -rf /var/lib/CASA/authtoken/validate
 %files -n CASA_auth_token_apache2_2_support
 %defattr(-,root,root)
 %{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
-%{prefix}/%{_lib}/mod_authn_casa.so
-%{prefix}/%{_lib}/mod_authn_casa.so.1
 
 
 ## CASA_auth_token-devel ##
@@ -429,9 +464,37 @@ rm -rf /var/lib/CASA/authtoken/validate
 
 %files -n CASA_auth_token-devel
 %defattr(-,root,root)
-%{prefix}/include/casa_c_authtoken.h
 %{prefix}/include/casa_s_authtoken.h
 %{prefix}/include/casa_c_ipc.h
 %{prefix}/include/casa_s_ipc.h
+%{prefix}/%{_lib}/libcasa_s_authtoken.so
+%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+%{prefix}/%{_lib}/libcasa_c_ipc.so
+%{prefix}/%{_lib}/libcasa_c_ipc.so.1
+%{prefix}/%{_lib}/libcasa_s_ipc.so
+%{prefix}/%{_lib}/libcasa_s_ipc.so.1
+%{prefix}/%{_lib}/mod_authn_casa.so
+%{prefix}/%{_lib}/mod_authn_casa.so.1
+
+
+## CASA_auth_token_client-devel ##
+%pre -n CASA_auth_token_client-devel
+# Nothing to do in this pre script
+
+%post -n CASA_auth_token_client-devel
+# Nothing to do in this post script
+
+%preun -n CASA_auth_token_client-devel
+# Nothing to do in this preun script
+
+%postun -n CASA_auth_token_client-devel
+# Nothing to do in this postun script
+
+%files -n CASA_auth_token_client-devel
+%defattr(-,root,root)
+%{prefix}/include/casa_c_authtoken.h
+%{prefix}/%{_lib}/libcasa_c_authtoken.so
+%{prefix}/%{_lib}/libcasa_c_authtoken.so.1
+
 
 %changelog -n CASA_auth_token_native
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/README b/CASA-auth-token/non-java/server/AuthTokenValidate/README
index 814a3ecc..3f247a06 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/README
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/README
@@ -52,7 +52,7 @@ is configured for CASA Authentication. The default identity token type is CasaId
 libcasa_s_authtoken supports different identity token types through an API that allows for the
 configuration of different Identity Token Provider plug-ins. An Identity Token Provider plug-in
 is configured by placing a configuration file for the plug-ins in the
-/etc/CASA/authtoken.d/modules.d folder. The name of the plug-in configuration file is related
+/etc/CASA/authtoken/modules folder. The name of the plug-in configuration file is related
 to the identity token type in the following manner: IdentityTokenTypeName.conf.
 
 Identity Token Provider plug-in configuration files must must contain a directive indicating the
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD b/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
index e50cd165..eb783715 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
@@ -15,8 +15,10 @@
 
 ### BEGIN INIT INFO
 # Provides: casa_atvd
-# Required-Start: $local_fs
-# Required-Stop: $local_fs $network
+# Required-Start: $local_fs $remote_fs
+# X-UnitedLinux-Should-Start: $syslog $time
+# Required-Stop: $local_fs $remote_fs
+# X-UnitedLinux-Should-Stop: $syslog $time
 # Default-Start: 1 2 3 5
 # Default-Stop:
 # Short-Description: Casa Authtoken Validate Daemon
@@ -61,7 +63,7 @@ DAEMON_USER=casaatvd
 StartDAEMON()
 {
   # Source the environments file for our daemon
-  . /etc/CASA/authtoken.d/validate.d/envvars
+  . /etc/CASA/authtoken/validate/envvars
   
   # Update the limit parameters
   #
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/server.cpp b/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/server.cpp
index 9b466d91..34df8b37 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/server.cpp
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/Svc/linux/server.cpp
@@ -92,7 +92,7 @@ bool  terminating = false;
 JavaVM   *g_jvm = NULL;
 JNIEnv   *g_env = NULL;
 
-char  classpath[] = "-Djava.class.path=/usr/share/java/CASA/authtoken/CasaAuthToken.jar:/usr/share/java/CASA/authtoken/external/axis.jar:/usr/share/java/CASA/authtoken/external/axis-ant.jar:/usr/share/java/CASA/authtoken/external/commons-discovery-0.2.jar:/usr/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar:/usr/share/java/CASA/authtoken/external/jaxrpc.jar:/usr/share/java/CASA/authtoken/external/log4j-1.2.8.jar:/usr/share/java/CASA/authtoken/external/saaj.jar:/usr/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar:/usr/share/java/CASA/authtoken/external/wss4j-1.5.0.jar:/usr/share/java/CASA/authtoken/external/xalan.jar:/usr/share/java/CASA/authtoken/external/xercesImpl.jar:/usr/share/java/CASA/authtoken/external/xml-apis.jar:/usr/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar:/usr/share/java/CASA/authtoken/external:/etc/CASA/authtoken.d";
+char  classpath[] = "-Djava.class.path=/usr/share/java/CASA/authtoken/CasaAuthToken.jar:/usr/share/java/CASA/authtoken/external/axis.jar:/usr/share/java/CASA/authtoken/external/axis-ant.jar:/usr/share/java/CASA/authtoken/external/commons-discovery-0.2.jar:/usr/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar:/usr/share/java/CASA/authtoken/external/jaxrpc.jar:/usr/share/java/CASA/authtoken/external/log4j-1.2.8.jar:/usr/share/java/CASA/authtoken/external/saaj.jar:/usr/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar:/usr/share/java/CASA/authtoken/external/wss4j-1.5.0.jar:/usr/share/java/CASA/authtoken/external/xalan.jar:/usr/share/java/CASA/authtoken/external/xercesImpl.jar:/usr/share/java/CASA/authtoken/external/xml-apis.jar:/usr/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar:/usr/share/java/CASA/authtoken/external:/etc/CASA/authtoken/keys/client";
 // Java AuthenticationToken Class and method name
 //char  authTokenClassName[] = "jtest";
 //char  authTokenClassValidateMethodName[] = "test4";
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README
index 81214d40..6fdccf88 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README
@@ -36,7 +36,7 @@ Authentication.
 CONFIGURATION
 
 The path to the casa_identoken plug-in is configured by placing the file
-CasaIdentityToken.conf in the /etc/CASA/authtoken.d/modules.d folder.
+CasaIdentityToken.conf in the /etc/CASA/authtoken/modules folder.
 
 PROGRAMMING NOTES
 
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c b/CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c
index ab5c67a0..b4888c3c 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c
@@ -81,7 +81,7 @@ GetIdenTokenProviderInterface(
    DbgTrace(2, "-GetIdenTokenProviderInterface- Start\n", 0);
 
    // Get the configuration for the module
-   retStatus = GetConfigInterface("/etc/CASA/authtoken.d/modules.d",
+   retStatus = GetConfigInterface("/etc/CASA/authtoken/modules",
                                   pIdenTokenTypeName,
                                   &pModuleConfigIf);
    if (CASA_SUCCESS(retStatus)