diff --git a/CASA-auth-token/client/Makefile.am b/CASA-auth-token/client/Makefile.am
index c673cb71..eae264e5 100644
--- a/CASA-auth-token/client/Makefile.am
+++ b/CASA-auth-token/client/Makefile.am
@@ -20,9 +20,9 @@
 #
 #######################################################################
 
-SUBDIRS = core package
+SUBDIRS = lib package
 
-DIST_SUBDIRS = include core package
+DIST_SUBDIRS = include lib package
 
 EXTRA_DIST = autogen.sh
 
diff --git a/CASA-auth-token/client/auth.sln b/CASA-auth-token/client/authclient.sln
similarity index 100%
rename from CASA-auth-token/client/auth.sln
rename to CASA-auth-token/client/authclient.sln
diff --git a/CASA-auth-token/client/configure.in b/CASA-auth-token/client/configure.in
index 5b8202fa..e7df3599 100644
--- a/CASA-auth-token/client/configure.in
+++ b/CASA-auth-token/client/configure.in
@@ -271,15 +271,15 @@ package/windows/authtokenclient_msm/Makefile
 package/windows/authtokenclient_msi/Makefile
 package/linux/CASA_auth_token_client.spec
 include/Makefile
-core/Makefile
-core/linux/Makefile
-core/windows/Makefile
-core/mechanisms/Makefile
-core/mechanisms/pwd/Makefile
-core/mechanisms/pwd/linux/Makefile
-core/mechanisms/pwd/windows/Makefile
-core/mechanisms/krb5/Makefile
-core/mechanisms/krb5/linux/Makefile
-core/mechanisms/krb5/windows/Makefile
+lib/Makefile
+lib/linux/Makefile
+lib/windows/Makefile
+lib/mechanisms/Makefile
+lib/mechanisms/pwd/Makefile
+lib/mechanisms/pwd/linux/Makefile
+lib/mechanisms/pwd/windows/Makefile
+lib/mechanisms/krb5/Makefile
+lib/mechanisms/krb5/linux/Makefile
+lib/mechanisms/krb5/windows/Makefile
 ])
 
diff --git a/CASA-auth-token/client/csharp/Novell.Casa.Authtoken/AssemblyInfo.cs b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs
similarity index 100%
rename from CASA-auth-token/client/csharp/Novell.Casa.Authtoken/AssemblyInfo.cs
rename to CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AssemblyInfo.cs
diff --git a/CASA-auth-token/client/csharp/Novell.Casa.Authtoken/AuthToken.snk b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AuthToken.snk
similarity index 100%
rename from CASA-auth-token/client/csharp/Novell.Casa.Authtoken/AuthToken.snk
rename to CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/AuthToken.snk
diff --git a/CASA-auth-token/client/csharp/Novell.Casa.Authtoken/Authtoken.cs b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Authtoken.cs
similarity index 100%
rename from CASA-auth-token/client/csharp/Novell.Casa.Authtoken/Authtoken.cs
rename to CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Authtoken.cs
diff --git a/CASA-auth-token/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
similarity index 100%
rename from CASA-auth-token/client/csharp/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
rename to CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/Novell.Casa.Client.csproj
diff --git a/CASA-auth-token/client/csharp/Novell.Casa.Authtoken/WinLuid.cs b/CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/WinLuid.cs
similarity index 100%
rename from CASA-auth-token/client/csharp/Novell.Casa.Authtoken/WinLuid.cs
rename to CASA-auth-token/client/csharp-api/Novell.Casa.Authtoken/WinLuid.cs
diff --git a/CASA-auth-token/client/csharp/README b/CASA-auth-token/client/csharp-api/README
similarity index 100%
rename from CASA-auth-token/client/csharp/README
rename to CASA-auth-token/client/csharp-api/README
diff --git a/CASA-auth-token/client/csharp/TODO b/CASA-auth-token/client/csharp-api/TODO
similarity index 100%
rename from CASA-auth-token/client/csharp/TODO
rename to CASA-auth-token/client/csharp-api/TODO
diff --git a/CASA-auth-token/client/csharp/test/App.ico b/CASA-auth-token/client/csharp-api/test/App.ico
similarity index 100%
rename from CASA-auth-token/client/csharp/test/App.ico
rename to CASA-auth-token/client/csharp-api/test/App.ico
diff --git a/CASA-auth-token/client/csharp/test/AssemblyInfo.cs b/CASA-auth-token/client/csharp-api/test/AssemblyInfo.cs
similarity index 100%
rename from CASA-auth-token/client/csharp/test/AssemblyInfo.cs
rename to CASA-auth-token/client/csharp-api/test/AssemblyInfo.cs
diff --git a/CASA-auth-token/client/csharp/test/Class1.cs b/CASA-auth-token/client/csharp-api/test/Class1.cs
similarity index 100%
rename from CASA-auth-token/client/csharp/test/Class1.cs
rename to CASA-auth-token/client/csharp-api/test/Class1.cs
diff --git a/CASA-auth-token/client/csharp/test/TestClientAuth.csproj b/CASA-auth-token/client/csharp-api/test/TestClientAuth.csproj
similarity index 100%
rename from CASA-auth-token/client/csharp/test/TestClientAuth.csproj
rename to CASA-auth-token/client/csharp-api/test/TestClientAuth.csproj
diff --git a/CASA-auth-token/client/core/Makefile.am b/CASA-auth-token/client/lib/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/Makefile.am
rename to CASA-auth-token/client/lib/Makefile.am
diff --git a/CASA-auth-token/client/core/README b/CASA-auth-token/client/lib/README
similarity index 100%
rename from CASA-auth-token/client/core/README
rename to CASA-auth-token/client/lib/README
diff --git a/CASA-auth-token/client/core/TODO b/CASA-auth-token/client/lib/TODO
similarity index 100%
rename from CASA-auth-token/client/core/TODO
rename to CASA-auth-token/client/lib/TODO
diff --git a/CASA-auth-token/client/core/authmech.c b/CASA-auth-token/client/lib/authmech.c
similarity index 100%
rename from CASA-auth-token/client/core/authmech.c
rename to CASA-auth-token/client/lib/authmech.c
diff --git a/CASA-auth-token/client/core/authmsg.c b/CASA-auth-token/client/lib/authmsg.c
similarity index 100%
rename from CASA-auth-token/client/core/authmsg.c
rename to CASA-auth-token/client/lib/authmsg.c
diff --git a/CASA-auth-token/client/core/authpolicy.c b/CASA-auth-token/client/lib/authpolicy.c
similarity index 100%
rename from CASA-auth-token/client/core/authpolicy.c
rename to CASA-auth-token/client/lib/authpolicy.c
diff --git a/CASA-auth-token/client/core/cache.c b/CASA-auth-token/client/lib/cache.c
similarity index 100%
rename from CASA-auth-token/client/core/cache.c
rename to CASA-auth-token/client/lib/cache.c
diff --git a/CASA-auth-token/client/core/client.conf b/CASA-auth-token/client/lib/client.conf
similarity index 100%
rename from CASA-auth-token/client/core/client.conf
rename to CASA-auth-token/client/lib/client.conf
diff --git a/CASA-auth-token/client/core/config.c b/CASA-auth-token/client/lib/config.c
similarity index 100%
rename from CASA-auth-token/client/core/config.c
rename to CASA-auth-token/client/lib/config.c
diff --git a/CASA-auth-token/client/core/config_if.h b/CASA-auth-token/client/lib/config_if.h
similarity index 100%
rename from CASA-auth-token/client/core/config_if.h
rename to CASA-auth-token/client/lib/config_if.h
diff --git a/CASA-auth-token/client/core/engine.c b/CASA-auth-token/client/lib/engine.c
similarity index 100%
rename from CASA-auth-token/client/core/engine.c
rename to CASA-auth-token/client/lib/engine.c
diff --git a/CASA-auth-token/client/core/getpolicymsg.c b/CASA-auth-token/client/lib/getpolicymsg.c
similarity index 100%
rename from CASA-auth-token/client/core/getpolicymsg.c
rename to CASA-auth-token/client/lib/getpolicymsg.c
diff --git a/CASA-auth-token/client/core/gettokenmsg.c b/CASA-auth-token/client/lib/gettokenmsg.c
similarity index 100%
rename from CASA-auth-token/client/core/gettokenmsg.c
rename to CASA-auth-token/client/lib/gettokenmsg.c
diff --git a/CASA-auth-token/client/core/internal.h b/CASA-auth-token/client/lib/internal.h
similarity index 100%
rename from CASA-auth-token/client/core/internal.h
rename to CASA-auth-token/client/lib/internal.h
diff --git a/CASA-auth-token/client/core/invalidcert.c b/CASA-auth-token/client/lib/invalidcert.c
similarity index 100%
rename from CASA-auth-token/client/core/invalidcert.c
rename to CASA-auth-token/client/lib/invalidcert.c
diff --git a/CASA-auth-token/client/core/linux/Makefile.am b/CASA-auth-token/client/lib/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/linux/Makefile.am
rename to CASA-auth-token/client/lib/linux/Makefile.am
diff --git a/CASA-auth-token/client/core/linux/platform.c b/CASA-auth-token/client/lib/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/linux/platform.c
rename to CASA-auth-token/client/lib/linux/platform.c
diff --git a/CASA-auth-token/client/core/linux/platform.h b/CASA-auth-token/client/lib/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/linux/platform.h
rename to CASA-auth-token/client/lib/linux/platform.h
diff --git a/CASA-auth-token/client/core/linux/rpc.c b/CASA-auth-token/client/lib/linux/rpc.c
similarity index 100%
rename from CASA-auth-token/client/core/linux/rpc.c
rename to CASA-auth-token/client/lib/linux/rpc.c
diff --git a/CASA-auth-token/client/core/mech_if.h b/CASA-auth-token/client/lib/mech_if.h
similarity index 100%
rename from CASA-auth-token/client/core/mech_if.h
rename to CASA-auth-token/client/lib/mech_if.h
diff --git a/CASA-auth-token/client/core/mechanisms/Makefile.am b/CASA-auth-token/client/lib/mechanisms/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/Makefile.am b/CASA-auth-token/client/lib/mechanisms/krb5/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/krb5/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/README b/CASA-auth-token/client/lib/mechanisms/krb5/README
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/README
rename to CASA-auth-token/client/lib/mechanisms/krb5/README
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/TODO b/CASA-auth-token/client/lib/mechanisms/krb5/TODO
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/TODO
rename to CASA-auth-token/client/lib/mechanisms/krb5/TODO
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/interface.c b/CASA-auth-token/client/lib/mechanisms/krb5/interface.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/interface.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/interface.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/internal.h b/CASA-auth-token/client/lib/mechanisms/krb5/internal.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/internal.h
rename to CASA-auth-token/client/lib/mechanisms/krb5/internal.h
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/Krb5Authenticate.conf b/CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/Krb5Authenticate.conf
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate.conf
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf b/CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/Makefile.am b/CASA-auth-token/client/lib/mechanisms/krb5/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/get.c b/CASA-auth-token/client/lib/mechanisms/krb5/linux/get.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/get.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/get.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/platform.c b/CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/platform.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/linux/platform.h b/CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/linux/platform.h
rename to CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.h
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/util.c b/CASA-auth-token/client/lib/mechanisms/krb5/util.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/util.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/util.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/Krb5Authenticate.conf b/CASA-auth-token/client/lib/mechanisms/krb5/windows/Krb5Authenticate.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/Krb5Authenticate.conf
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/Krb5Authenticate.conf
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/Makefile.am b/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/dllsup.c b/CASA-auth-token/client/lib/mechanisms/krb5/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/dllsup.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/dllsup.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/get.c b/CASA-auth-token/client/lib/mechanisms/krb5/windows/get.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/get.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/get.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/krb5.vcproj b/CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5.vcproj
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/krb5.vcproj
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5.vcproj
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/krb5mech.def b/CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5mech.def
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/krb5mech.def
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5mech.def
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/platform.c b/CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/platform.c
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.c
diff --git a/CASA-auth-token/client/core/mechanisms/krb5/windows/platform.h b/CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/krb5/windows/platform.h
rename to CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.h
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/Makefile.am b/CASA-auth-token/client/lib/mechanisms/pwd/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/pwd/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/README b/CASA-auth-token/client/lib/mechanisms/pwd/README
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/README
rename to CASA-auth-token/client/lib/mechanisms/pwd/README
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/TODO b/CASA-auth-token/client/lib/mechanisms/pwd/TODO
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/TODO
rename to CASA-auth-token/client/lib/mechanisms/pwd/TODO
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/get.c b/CASA-auth-token/client/lib/mechanisms/pwd/get.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/get.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/get.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/interface.c b/CASA-auth-token/client/lib/mechanisms/pwd/interface.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/interface.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/interface.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/internal.h b/CASA-auth-token/client/lib/mechanisms/pwd/internal.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/internal.h
rename to CASA-auth-token/client/lib/mechanisms/pwd/internal.h
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/linux/Makefile.am b/CASA-auth-token/client/lib/mechanisms/pwd/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/linux/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/pwd/linux/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/linux/PwdAuthenticate.conf b/CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/linux/PwdAuthenticate.conf
rename to CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate.conf
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf b/CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
rename to CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/linux/platform.c b/CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/linux/platform.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/linux/platform.h b/CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/linux/platform.h
rename to CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.h
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/util.c b/CASA-auth-token/client/lib/mechanisms/pwd/util.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/util.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/util.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/Makefile.am b/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/Makefile.am
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/PwdAuthenticate.conf b/CASA-auth-token/client/lib/mechanisms/pwd/windows/PwdAuthenticate.conf
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/PwdAuthenticate.conf
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/PwdAuthenticate.conf
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/dllsup.c b/CASA-auth-token/client/lib/mechanisms/pwd/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/dllsup.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/dllsup.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/platform.c b/CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/platform.c
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.c
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/platform.h b/CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/platform.h
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.h
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/pwd.vcproj
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
diff --git a/CASA-auth-token/client/core/mechanisms/pwd/windows/pwmech.def b/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwmech.def
similarity index 100%
rename from CASA-auth-token/client/core/mechanisms/pwd/windows/pwmech.def
rename to CASA-auth-token/client/lib/mechanisms/pwd/windows/pwmech.def
diff --git a/CASA-auth-token/client/core/test/CASA_Auth.cpp b/CASA-auth-token/client/lib/test/CASA_Auth.cpp
similarity index 100%
rename from CASA-auth-token/client/core/test/CASA_Auth.cpp
rename to CASA-auth-token/client/lib/test/CASA_Auth.cpp
diff --git a/CASA-auth-token/client/core/test/linux/main.cpp b/CASA-auth-token/client/lib/test/linux/main.cpp
similarity index 100%
rename from CASA-auth-token/client/core/test/linux/main.cpp
rename to CASA-auth-token/client/lib/test/linux/main.cpp
diff --git a/CASA-auth-token/client/core/test/linux/make.sh b/CASA-auth-token/client/lib/test/linux/make.sh
similarity index 100%
rename from CASA-auth-token/client/core/test/linux/make.sh
rename to CASA-auth-token/client/lib/test/linux/make.sh
diff --git a/CASA-auth-token/client/core/test/linux/platform.h b/CASA-auth-token/client/lib/test/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/test/linux/platform.h
rename to CASA-auth-token/client/lib/test/linux/platform.h
diff --git a/CASA-auth-token/client/core/test/windows/main.cpp b/CASA-auth-token/client/lib/test/windows/main.cpp
similarity index 100%
rename from CASA-auth-token/client/core/test/windows/main.cpp
rename to CASA-auth-token/client/lib/test/windows/main.cpp
diff --git a/CASA-auth-token/client/core/test/windows/platform.h b/CASA-auth-token/client/lib/test/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/test/windows/platform.h
rename to CASA-auth-token/client/lib/test/windows/platform.h
diff --git a/CASA-auth-token/client/core/test/windows/test.vcproj b/CASA-auth-token/client/lib/test/windows/test.vcproj
similarity index 100%
rename from CASA-auth-token/client/core/test/windows/test.vcproj
rename to CASA-auth-token/client/lib/test/windows/test.vcproj
diff --git a/CASA-auth-token/client/core/util.c b/CASA-auth-token/client/lib/util.c
similarity index 100%
rename from CASA-auth-token/client/core/util.c
rename to CASA-auth-token/client/lib/util.c
diff --git a/CASA-auth-token/client/core/windows/Makefile.am b/CASA-auth-token/client/lib/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/core/windows/Makefile.am
rename to CASA-auth-token/client/lib/windows/Makefile.am
diff --git a/CASA-auth-token/client/core/windows/authtoken.def b/CASA-auth-token/client/lib/windows/authtoken.def
similarity index 100%
rename from CASA-auth-token/client/core/windows/authtoken.def
rename to CASA-auth-token/client/lib/windows/authtoken.def
diff --git a/CASA-auth-token/client/core/windows/client.vcproj b/CASA-auth-token/client/lib/windows/client.vcproj
similarity index 100%
rename from CASA-auth-token/client/core/windows/client.vcproj
rename to CASA-auth-token/client/lib/windows/client.vcproj
diff --git a/CASA-auth-token/client/core/windows/dllsup.c b/CASA-auth-token/client/lib/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/core/windows/dllsup.c
rename to CASA-auth-token/client/lib/windows/dllsup.c
diff --git a/CASA-auth-token/client/core/windows/platform.c b/CASA-auth-token/client/lib/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/core/windows/platform.c
rename to CASA-auth-token/client/lib/windows/platform.c
diff --git a/CASA-auth-token/client/core/windows/platform.h b/CASA-auth-token/client/lib/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/core/windows/platform.h
rename to CASA-auth-token/client/lib/windows/platform.h
diff --git a/CASA-auth-token/client/core/windows/rpc.c b/CASA-auth-token/client/lib/windows/rpc.c
similarity index 100%
rename from CASA-auth-token/client/core/windows/rpc.c
rename to CASA-auth-token/client/lib/windows/rpc.c
diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
index 8629e98d..8b196066 100644
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
+++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 13 11:24:21 MST 2006 - jluciani@novell.com
+
+- Separated the non-java project into client and server projects in
+  order to better support distributions that target desktops.
+  From now on, this changes file will only contain information
+  that applies to the client project. 
+
 -------------------------------------------------------------------
 Thu Nov  9 17:16:36 MST 2006 - jluciani@novell.com
 
diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
index c0b03464..7c6da51b 100644
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
+++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
@@ -127,7 +127,7 @@ 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/client/client.conf
+install -m 644 lib/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
 
diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_native.changes b/CASA-auth-token/client/package/linux/CASA_auth_token_native.changes
deleted file mode 100644
index 8629e98d..00000000
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_native.changes
+++ /dev/null
@@ -1,83 +0,0 @@
--------------------------------------------------------------------
-Thu Nov  9 17:16:36 MST 2006 - jluciani@novell.com
-
-- Finished the changes to enable client/ATS communications
-  over SSL. 
-
--------------------------------------------------------------------
-Tue Nov  7 16:01:11 MST 2006 - jluciani@novell.com
-
-- Made changes to enable client/ats communication over SSL. (Not quite
-  done with this yet).
-
-- Updated the make system to allow Windows builds to be made from
-  the command line using Cygwin. 
-
--------------------------------------------------------------------
-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
-
-- Brought up to date the README and TODO files. 
-
--------------------------------------------------------------------
-Mon Oct  9 09:28:37 MDT 2006 - jluciani@novell.com
-
-- Cleaned up compiler warnings that were present in some of the
-  components. 
-
--------------------------------------------------------------------
-Fri Oct  6 14:22:54 MDT 2006 - schoi@novell.com
-
-- Add the CASA build check as dependency in spec file 
-
--------------------------------------------------------------------
-Thu Oct  5 15:21:39 MDT 2006 - jluciani@novell.com
-
-- Ported the client to Linux and created the CASA_auth_token_client package. 
-
--------------------------------------------------------------------
-Mon Oct  2 11:47:16 MDT 2006 - jluciani@novell.com
-
-- Made spec file modifications suggested by SuSE. The changes entailed
-  leveraging RPM macros instead of using my own scripts to make the
-  RPM more solid. 
-
--------------------------------------------------------------------
-Thu Sep 14 17:41:40 MDT 2006 - jluciani@novell.com
-
-- Added rc script for Validate AuthToken Service. 
-
--------------------------------------------------------------------
-Thu Sep 14 09:48:54 MDT 2006 - jluciani@novell.com
-
-- Created the Validate AuthToken Service and made all of the necessary changes
-  to allow it to be consumed by the AuthTokenValidate library.
-
-- Also made necessary spec file changes to support our configuration. 
-
--------------------------------------------------------------------
-Tue Sep  5 08:37:35 MDT 2006 - jluciani@novell.com
-
-- Created client/server IPC libraries that will be utilized by libcasa_s_authtoken
-  to communicate with the Java Validate AuthToken Service (yet to be created) over
-  DOMAIN sockets. The service will utilize the libraries via JNI to be able to
-  process requests sent using DOMAIN sockets.
-
--------------------------------------------------------------------
-Tue Aug 15 10:09:32 MDT 2006 - schoi@novell.com
-- Fixed CASA_auth_token_devel build requirement for CASA_auth_token_svc 
-
--------------------------------------------------------------------
-Mon Aug 7 10:28:32 MDT 2006 - schoi@novell.com
-- This file has been created for CASA_auth_token_native project for the first
-  time.
-
--------------------------------------------------------------------
-
diff --git a/CASA-auth-token/client/package/linux/Makefile.am b/CASA-auth-token/client/package/linux/Makefile.am
index 1cace376..be18a43f 100644
--- a/CASA-auth-token/client/package/linux/Makefile.am
+++ b/CASA-auth-token/client/package/linux/Makefile.am
@@ -18,12 +18,17 @@
 #
 #
 #######################################################################
-#how do you get the version??
+
+SUBDIRS =
+DIST_SUBDIRS =
+
+EXTRA_DIST = CASA_auth_token_client.changes CASA_auth_token_client.spec.in
+
 RPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).$(target_cpu).rpm
 #SRPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 SRPM_FILE = $(PACKAGE)-$(VERSION)*.src.rpm
 
-SPEC_FILE = CASA_auth_token_native.spec
+SPEC_FILE = CASA_auth_token_client.spec
 
 .PHONY: package package-clean package-install package-uninstall casa