diff --git a/CASA-auth-token/TODO b/CASA-auth-token/TODO
index 4bc8d36e..1dcceeec 100644
--- a/CASA-auth-token/TODO
+++ b/CASA-auth-token/TODO
@@ -13,5 +13,5 @@ details outstanding items at the project level.
 
 OUTSTANDING ITEMS
 
-- Plug-in auth_token into the CASA make system.
+- 
 
diff --git a/CASA-auth-token/native/AUTHORS b/CASA-auth-token/non-java/AUTHORS
similarity index 100%
rename from CASA-auth-token/native/AUTHORS
rename to CASA-auth-token/non-java/AUTHORS
diff --git a/CASA-auth-token/native/COPYING b/CASA-auth-token/non-java/COPYING
similarity index 100%
rename from CASA-auth-token/native/COPYING
rename to CASA-auth-token/non-java/COPYING
diff --git a/CASA-auth-token/native/ChangeLog b/CASA-auth-token/non-java/ChangeLog
similarity index 100%
rename from CASA-auth-token/native/ChangeLog
rename to CASA-auth-token/non-java/ChangeLog
diff --git a/CASA-auth-token/native/Makefile.am b/CASA-auth-token/non-java/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/Makefile.am
rename to CASA-auth-token/non-java/Makefile.am
diff --git a/CASA-auth-token/native/NEWS b/CASA-auth-token/non-java/NEWS
similarity index 100%
rename from CASA-auth-token/native/NEWS
rename to CASA-auth-token/non-java/NEWS
diff --git a/CASA-auth-token/native/README b/CASA-auth-token/non-java/README
similarity index 100%
rename from CASA-auth-token/native/README
rename to CASA-auth-token/non-java/README
diff --git a/CASA-auth-token/native/TODO b/CASA-auth-token/non-java/TODO
similarity index 100%
rename from CASA-auth-token/native/TODO
rename to CASA-auth-token/non-java/TODO
diff --git a/CASA-auth-token/native/auth.sln b/CASA-auth-token/non-java/auth.sln
similarity index 100%
rename from CASA-auth-token/native/auth.sln
rename to CASA-auth-token/non-java/auth.sln
diff --git a/CASA-auth-token/native/autogen.sh b/CASA-auth-token/non-java/autogen.sh
similarity index 100%
rename from CASA-auth-token/native/autogen.sh
rename to CASA-auth-token/non-java/autogen.sh
diff --git a/CASA-auth-token/native/client/cache.c b/CASA-auth-token/non-java/client/cache.c
similarity index 100%
rename from CASA-auth-token/native/client/cache.c
rename to CASA-auth-token/non-java/client/cache.c
diff --git a/CASA-auth-token/native/configure.in b/CASA-auth-token/non-java/configure.in
similarity index 100%
rename from CASA-auth-token/native/configure.in
rename to CASA-auth-token/non-java/configure.in
diff --git a/CASA-auth-token/native/include/Makefile.am b/CASA-auth-token/non-java/include/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/include/Makefile.am
rename to CASA-auth-token/non-java/include/Makefile.am
diff --git a/CASA-auth-token/native/include/casa_c_authtoken.h b/CASA-auth-token/non-java/include/casa_c_authtoken.h
similarity index 100%
rename from CASA-auth-token/native/include/casa_c_authtoken.h
rename to CASA-auth-token/non-java/include/casa_c_authtoken.h
diff --git a/CASA-auth-token/native/include/casa_s_authtoken.h b/CASA-auth-token/non-java/include/casa_s_authtoken.h
similarity index 100%
rename from CASA-auth-token/native/include/casa_s_authtoken.h
rename to CASA-auth-token/non-java/include/casa_s_authtoken.h
diff --git a/CASA-auth-token/native/include/list_entry.h b/CASA-auth-token/non-java/include/list_entry.h
similarity index 100%
rename from CASA-auth-token/native/include/list_entry.h
rename to CASA-auth-token/non-java/include/list_entry.h
diff --git a/CASA-auth-token/native/include/proto.h b/CASA-auth-token/non-java/include/proto.h
similarity index 100%
rename from CASA-auth-token/native/include/proto.h
rename to CASA-auth-token/non-java/include/proto.h
diff --git a/CASA-auth-token/native/package/Makefile.am b/CASA-auth-token/non-java/package/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/package/Makefile.am
rename to CASA-auth-token/non-java/package/Makefile.am
diff --git a/CASA-auth-token/native/package/linux/CASA_auth_token_native.changes b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes
similarity index 100%
rename from CASA-auth-token/native/package/linux/CASA_auth_token_native.changes
rename to CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes
diff --git a/CASA-auth-token/native/package/linux/CASA_auth_token_native.spec.in b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in
similarity index 100%
rename from CASA-auth-token/native/package/linux/CASA_auth_token_native.spec.in
rename to CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in
diff --git a/CASA-auth-token/native/package/linux/Makefile.am b/CASA-auth-token/non-java/package/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/package/linux/Makefile.am
rename to CASA-auth-token/non-java/package/linux/Makefile.am
diff --git a/CASA-auth-token/native/server/ApacheSupport/2.2/Makefile.am b/CASA-auth-token/non-java/server/ApacheSupport/2.2/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/2.2/Makefile.am
rename to CASA-auth-token/non-java/server/ApacheSupport/2.2/Makefile.am
diff --git a/CASA-auth-token/native/server/ApacheSupport/2.2/README b/CASA-auth-token/non-java/server/ApacheSupport/2.2/README
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/2.2/README
rename to CASA-auth-token/non-java/server/ApacheSupport/2.2/README
diff --git a/CASA-auth-token/native/server/ApacheSupport/2.2/TODO b/CASA-auth-token/non-java/server/ApacheSupport/2.2/TODO
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/2.2/TODO
rename to CASA-auth-token/non-java/server/ApacheSupport/2.2/TODO
diff --git a/CASA-auth-token/native/server/ApacheSupport/2.2/linux/Makefile.am b/CASA-auth-token/non-java/server/ApacheSupport/2.2/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/2.2/linux/Makefile.am
rename to CASA-auth-token/non-java/server/ApacheSupport/2.2/linux/Makefile.am
diff --git a/CASA-auth-token/native/server/ApacheSupport/2.2/mod_authn_casa.c b/CASA-auth-token/non-java/server/ApacheSupport/2.2/mod_authn_casa.c
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/2.2/mod_authn_casa.c
rename to CASA-auth-token/non-java/server/ApacheSupport/2.2/mod_authn_casa.c
diff --git a/CASA-auth-token/native/server/ApacheSupport/Makefile.am b/CASA-auth-token/non-java/server/ApacheSupport/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/ApacheSupport/Makefile.am
rename to CASA-auth-token/non-java/server/ApacheSupport/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/Makefile.am b/CASA-auth-token/non-java/server/AuthTokenValidate/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/Makefile.am
rename to CASA-auth-token/non-java/server/AuthTokenValidate/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/README b/CASA-auth-token/non-java/server/AuthTokenValidate/README
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/README
rename to CASA-auth-token/non-java/server/AuthTokenValidate/README
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/TODO b/CASA-auth-token/non-java/server/AuthTokenValidate/TODO
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/TODO
rename to CASA-auth-token/non-java/server/AuthTokenValidate/TODO
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/authtoken.c b/CASA-auth-token/non-java/server/AuthTokenValidate/authtoken.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/authtoken.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/authtoken.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/config.c b/CASA-auth-token/non-java/server/AuthTokenValidate/config.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/config.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/config.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/config_if.h b/CASA-auth-token/non-java/server/AuthTokenValidate/config_if.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/config_if.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/config_if.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/Makefile.am b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/Makefile.am
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/README b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/README
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/README
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/TODO b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/TODO
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/TODO
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/TODO
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/internal.h b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/internal.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/internal.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/internal.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/util.c b/CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/util.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/idenTokenProviders/casa/util.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/idenTokenProviders/casa/util.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/iden_token_provider_if.h b/CASA-auth-token/non-java/server/AuthTokenValidate/iden_token_provider_if.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/iden_token_provider_if.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/iden_token_provider_if.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/identoken.c b/CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/identoken.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/identoken.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/internal.h b/CASA-auth-token/non-java/server/AuthTokenValidate/internal.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/internal.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/internal.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/linux/Makefile.am b/CASA-auth-token/non-java/server/AuthTokenValidate/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/linux/Makefile.am
rename to CASA-auth-token/non-java/server/AuthTokenValidate/linux/Makefile.am
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/linux/platform.c b/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/linux/platform.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/linux/platform.h b/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.h
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/linux/platform.h
rename to CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.h
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/principal.c b/CASA-auth-token/non-java/server/AuthTokenValidate/principal.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/principal.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/principal.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/util.c b/CASA-auth-token/non-java/server/AuthTokenValidate/util.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/util.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/util.c
diff --git a/CASA-auth-token/native/server/AuthTokenValidate/validate.c b/CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
similarity index 100%
rename from CASA-auth-token/native/server/AuthTokenValidate/validate.c
rename to CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
diff --git a/CASA-auth-token/native/server/Makefile.am b/CASA-auth-token/non-java/server/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/Makefile.am
rename to CASA-auth-token/non-java/server/Makefile.am
diff --git a/CASA-auth-token/native/server/PamSupport/Makefile.am b/CASA-auth-token/non-java/server/PamSupport/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/Makefile.am
rename to CASA-auth-token/non-java/server/PamSupport/Makefile.am
diff --git a/CASA-auth-token/native/server/PamSupport/README b/CASA-auth-token/non-java/server/PamSupport/README
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/README
rename to CASA-auth-token/non-java/server/PamSupport/README
diff --git a/CASA-auth-token/native/server/PamSupport/TODO b/CASA-auth-token/non-java/server/PamSupport/TODO
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/TODO
rename to CASA-auth-token/non-java/server/PamSupport/TODO
diff --git a/CASA-auth-token/native/server/PamSupport/linux/Makefile.am b/CASA-auth-token/non-java/server/PamSupport/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/linux/Makefile.am
rename to CASA-auth-token/non-java/server/PamSupport/linux/Makefile.am
diff --git a/CASA-auth-token/native/server/PamSupport/pam_authtoken.c b/CASA-auth-token/non-java/server/PamSupport/pam_authtoken.c
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/pam_authtoken.c
rename to CASA-auth-token/non-java/server/PamSupport/pam_authtoken.c
diff --git a/CASA-auth-token/native/server/PamSupport/test/README b/CASA-auth-token/non-java/server/PamSupport/test/README
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/test/README
rename to CASA-auth-token/non-java/server/PamSupport/test/README
diff --git a/CASA-auth-token/native/server/PamSupport/test/make.sh b/CASA-auth-token/non-java/server/PamSupport/test/make.sh
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/test/make.sh
rename to CASA-auth-token/non-java/server/PamSupport/test/make.sh
diff --git a/CASA-auth-token/native/server/PamSupport/test/test.c b/CASA-auth-token/non-java/server/PamSupport/test/test.c
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/test/test.c
rename to CASA-auth-token/non-java/server/PamSupport/test/test.c
diff --git a/CASA-auth-token/native/server/PamSupport/test/testservice b/CASA-auth-token/non-java/server/PamSupport/test/testservice
similarity index 100%
rename from CASA-auth-token/native/server/PamSupport/test/testservice
rename to CASA-auth-token/non-java/server/PamSupport/test/testservice