diff --git a/CASA-auth-token/client/Makefile.am b/CASA-auth-token/client/Makefile.am
index eae264e5..043136c8 100644
--- a/CASA-auth-token/client/Makefile.am
+++ b/CASA-auth-token/client/Makefile.am
@@ -20,7 +20,7 @@
 #
 #######################################################################
 
-SUBDIRS = lib package
+SUBDIRS = library package
 
 DIST_SUBDIRS = include lib package
 
diff --git a/CASA-auth-token/client/configure.in b/CASA-auth-token/client/configure.in
index e7df3599..6b5604ee 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
-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
+library/Makefile
+library/linux/Makefile
+library/windows/Makefile
+library/mechanisms/Makefile
+library/mechanisms/pwd/Makefile
+library/mechanisms/pwd/linux/Makefile
+library/mechanisms/pwd/windows/Makefile
+library/mechanisms/krb5/Makefile
+library/mechanisms/krb5/linux/Makefile
+library/mechanisms/krb5/windows/Makefile
 ])
 
diff --git a/CASA-auth-token/client/lib/Makefile.am b/CASA-auth-token/client/library/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/Makefile.am
rename to CASA-auth-token/client/library/Makefile.am
diff --git a/CASA-auth-token/client/lib/README b/CASA-auth-token/client/library/README
similarity index 100%
rename from CASA-auth-token/client/lib/README
rename to CASA-auth-token/client/library/README
diff --git a/CASA-auth-token/client/lib/TODO b/CASA-auth-token/client/library/TODO
similarity index 100%
rename from CASA-auth-token/client/lib/TODO
rename to CASA-auth-token/client/library/TODO
diff --git a/CASA-auth-token/client/lib/authmech.c b/CASA-auth-token/client/library/authmech.c
similarity index 100%
rename from CASA-auth-token/client/lib/authmech.c
rename to CASA-auth-token/client/library/authmech.c
diff --git a/CASA-auth-token/client/lib/authmsg.c b/CASA-auth-token/client/library/authmsg.c
similarity index 100%
rename from CASA-auth-token/client/lib/authmsg.c
rename to CASA-auth-token/client/library/authmsg.c
diff --git a/CASA-auth-token/client/lib/authpolicy.c b/CASA-auth-token/client/library/authpolicy.c
similarity index 100%
rename from CASA-auth-token/client/lib/authpolicy.c
rename to CASA-auth-token/client/library/authpolicy.c
diff --git a/CASA-auth-token/client/lib/cache.c b/CASA-auth-token/client/library/cache.c
similarity index 100%
rename from CASA-auth-token/client/lib/cache.c
rename to CASA-auth-token/client/library/cache.c
diff --git a/CASA-auth-token/client/lib/client.conf b/CASA-auth-token/client/library/client.conf
similarity index 100%
rename from CASA-auth-token/client/lib/client.conf
rename to CASA-auth-token/client/library/client.conf
diff --git a/CASA-auth-token/client/lib/config.c b/CASA-auth-token/client/library/config.c
similarity index 100%
rename from CASA-auth-token/client/lib/config.c
rename to CASA-auth-token/client/library/config.c
diff --git a/CASA-auth-token/client/lib/config_if.h b/CASA-auth-token/client/library/config_if.h
similarity index 100%
rename from CASA-auth-token/client/lib/config_if.h
rename to CASA-auth-token/client/library/config_if.h
diff --git a/CASA-auth-token/client/lib/engine.c b/CASA-auth-token/client/library/engine.c
similarity index 100%
rename from CASA-auth-token/client/lib/engine.c
rename to CASA-auth-token/client/library/engine.c
diff --git a/CASA-auth-token/client/lib/getpolicymsg.c b/CASA-auth-token/client/library/getpolicymsg.c
similarity index 100%
rename from CASA-auth-token/client/lib/getpolicymsg.c
rename to CASA-auth-token/client/library/getpolicymsg.c
diff --git a/CASA-auth-token/client/lib/gettokenmsg.c b/CASA-auth-token/client/library/gettokenmsg.c
similarity index 100%
rename from CASA-auth-token/client/lib/gettokenmsg.c
rename to CASA-auth-token/client/library/gettokenmsg.c
diff --git a/CASA-auth-token/client/lib/internal.h b/CASA-auth-token/client/library/internal.h
similarity index 100%
rename from CASA-auth-token/client/lib/internal.h
rename to CASA-auth-token/client/library/internal.h
diff --git a/CASA-auth-token/client/lib/invalidcert.c b/CASA-auth-token/client/library/invalidcert.c
similarity index 100%
rename from CASA-auth-token/client/lib/invalidcert.c
rename to CASA-auth-token/client/library/invalidcert.c
diff --git a/CASA-auth-token/client/lib/linux/Makefile.am b/CASA-auth-token/client/library/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/linux/Makefile.am
rename to CASA-auth-token/client/library/linux/Makefile.am
diff --git a/CASA-auth-token/client/lib/linux/osslsupp.c b/CASA-auth-token/client/library/linux/osslsupp.c
similarity index 100%
rename from CASA-auth-token/client/lib/linux/osslsupp.c
rename to CASA-auth-token/client/library/linux/osslsupp.c
diff --git a/CASA-auth-token/client/lib/linux/platform.c b/CASA-auth-token/client/library/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/linux/platform.c
rename to CASA-auth-token/client/library/linux/platform.c
diff --git a/CASA-auth-token/client/lib/linux/platform.h b/CASA-auth-token/client/library/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/linux/platform.h
rename to CASA-auth-token/client/library/linux/platform.h
diff --git a/CASA-auth-token/client/lib/linux/rpc.c b/CASA-auth-token/client/library/linux/rpc.c
similarity index 100%
rename from CASA-auth-token/client/lib/linux/rpc.c
rename to CASA-auth-token/client/library/linux/rpc.c
diff --git a/CASA-auth-token/client/lib/mech_if.h b/CASA-auth-token/client/library/mech_if.h
similarity index 100%
rename from CASA-auth-token/client/lib/mech_if.h
rename to CASA-auth-token/client/library/mech_if.h
diff --git a/CASA-auth-token/client/lib/mechanisms/Makefile.am b/CASA-auth-token/client/library/mechanisms/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/Makefile.am b/CASA-auth-token/client/library/mechanisms/krb5/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/krb5/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/README b/CASA-auth-token/client/library/mechanisms/krb5/README
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/README
rename to CASA-auth-token/client/library/mechanisms/krb5/README
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/TODO b/CASA-auth-token/client/library/mechanisms/krb5/TODO
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/TODO
rename to CASA-auth-token/client/library/mechanisms/krb5/TODO
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/interface.c b/CASA-auth-token/client/library/mechanisms/krb5/interface.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/interface.c
rename to CASA-auth-token/client/library/mechanisms/krb5/interface.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/internal.h b/CASA-auth-token/client/library/mechanisms/krb5/internal.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/internal.h
rename to CASA-auth-token/client/library/mechanisms/krb5/internal.h
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate.conf b/CASA-auth-token/client/library/mechanisms/krb5/linux/Krb5Authenticate.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate.conf
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/Krb5Authenticate.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf b/CASA-auth-token/client/library/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/Krb5Authenticate_lib64.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/Makefile.am b/CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/get.c b/CASA-auth-token/client/library/mechanisms/krb5/linux/get.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/get.c
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/get.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.c b/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.c
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/platform.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.h b/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/linux/platform.h
rename to CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/util.c b/CASA-auth-token/client/library/mechanisms/krb5/util.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/util.c
rename to CASA-auth-token/client/library/mechanisms/krb5/util.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/Krb5Authenticate.conf b/CASA-auth-token/client/library/mechanisms/krb5/windows/Krb5Authenticate.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/Krb5Authenticate.conf
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/Krb5Authenticate.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am b/CASA-auth-token/client/library/mechanisms/krb5/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/dllsup.c b/CASA-auth-token/client/library/mechanisms/krb5/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/dllsup.c
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/dllsup.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/get.c b/CASA-auth-token/client/library/mechanisms/krb5/windows/get.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/get.c
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/get.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5.vcproj b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5.vcproj
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5mech.def b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5mech.def
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/krb5mech.def
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/krb5mech.def
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.c b/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.c
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/platform.c
diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.h b/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/krb5/windows/platform.h
rename to CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/Makefile.am b/CASA-auth-token/client/library/mechanisms/pwd/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/pwd/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/README b/CASA-auth-token/client/library/mechanisms/pwd/README
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/README
rename to CASA-auth-token/client/library/mechanisms/pwd/README
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/TODO b/CASA-auth-token/client/library/mechanisms/pwd/TODO
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/TODO
rename to CASA-auth-token/client/library/mechanisms/pwd/TODO
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/get.c b/CASA-auth-token/client/library/mechanisms/pwd/get.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/get.c
rename to CASA-auth-token/client/library/mechanisms/pwd/get.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/interface.c b/CASA-auth-token/client/library/mechanisms/pwd/interface.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/interface.c
rename to CASA-auth-token/client/library/mechanisms/pwd/interface.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/internal.h b/CASA-auth-token/client/library/mechanisms/pwd/internal.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/internal.h
rename to CASA-auth-token/client/library/mechanisms/pwd/internal.h
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/linux/Makefile.am b/CASA-auth-token/client/library/mechanisms/pwd/linux/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/linux/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/pwd/linux/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate.conf b/CASA-auth-token/client/library/mechanisms/pwd/linux/PwdAuthenticate.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate.conf
rename to CASA-auth-token/client/library/mechanisms/pwd/linux/PwdAuthenticate.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf b/CASA-auth-token/client/library/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
rename to CASA-auth-token/client/library/mechanisms/pwd/linux/PwdAuthenticate_lib64.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.c b/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.c
rename to CASA-auth-token/client/library/mechanisms/pwd/linux/platform.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.h b/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/linux/platform.h
rename to CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/util.c b/CASA-auth-token/client/library/mechanisms/pwd/util.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/util.c
rename to CASA-auth-token/client/library/mechanisms/pwd/util.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am b/CASA-auth-token/client/library/mechanisms/pwd/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/Makefile.am
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/PwdAuthenticate.conf b/CASA-auth-token/client/library/mechanisms/pwd/windows/PwdAuthenticate.conf
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/PwdAuthenticate.conf
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/PwdAuthenticate.conf
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/dllsup.c b/CASA-auth-token/client/library/mechanisms/pwd/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/dllsup.c
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/dllsup.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.c b/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.c
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/platform.c
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.h b/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/platform.h
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwmech.def b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwmech.def
similarity index 100%
rename from CASA-auth-token/client/lib/mechanisms/pwd/windows/pwmech.def
rename to CASA-auth-token/client/library/mechanisms/pwd/windows/pwmech.def
diff --git a/CASA-auth-token/client/lib/test/CASA_Auth.cpp b/CASA-auth-token/client/library/test/CASA_Auth.cpp
similarity index 100%
rename from CASA-auth-token/client/lib/test/CASA_Auth.cpp
rename to CASA-auth-token/client/library/test/CASA_Auth.cpp
diff --git a/CASA-auth-token/client/lib/test/linux/main.cpp b/CASA-auth-token/client/library/test/linux/main.cpp
similarity index 100%
rename from CASA-auth-token/client/lib/test/linux/main.cpp
rename to CASA-auth-token/client/library/test/linux/main.cpp
diff --git a/CASA-auth-token/client/lib/test/linux/make.sh b/CASA-auth-token/client/library/test/linux/make.sh
similarity index 100%
rename from CASA-auth-token/client/lib/test/linux/make.sh
rename to CASA-auth-token/client/library/test/linux/make.sh
diff --git a/CASA-auth-token/client/lib/test/linux/platform.h b/CASA-auth-token/client/library/test/linux/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/test/linux/platform.h
rename to CASA-auth-token/client/library/test/linux/platform.h
diff --git a/CASA-auth-token/client/lib/test/windows/main.cpp b/CASA-auth-token/client/library/test/windows/main.cpp
similarity index 100%
rename from CASA-auth-token/client/lib/test/windows/main.cpp
rename to CASA-auth-token/client/library/test/windows/main.cpp
diff --git a/CASA-auth-token/client/lib/test/windows/platform.h b/CASA-auth-token/client/library/test/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/test/windows/platform.h
rename to CASA-auth-token/client/library/test/windows/platform.h
diff --git a/CASA-auth-token/client/lib/test/windows/test.vcproj b/CASA-auth-token/client/library/test/windows/test.vcproj
similarity index 100%
rename from CASA-auth-token/client/lib/test/windows/test.vcproj
rename to CASA-auth-token/client/library/test/windows/test.vcproj
diff --git a/CASA-auth-token/client/lib/util.c b/CASA-auth-token/client/library/util.c
similarity index 100%
rename from CASA-auth-token/client/lib/util.c
rename to CASA-auth-token/client/library/util.c
diff --git a/CASA-auth-token/client/lib/windows/Makefile.am b/CASA-auth-token/client/library/windows/Makefile.am
similarity index 100%
rename from CASA-auth-token/client/lib/windows/Makefile.am
rename to CASA-auth-token/client/library/windows/Makefile.am
diff --git a/CASA-auth-token/client/lib/windows/authtoken.def b/CASA-auth-token/client/library/windows/authtoken.def
similarity index 100%
rename from CASA-auth-token/client/lib/windows/authtoken.def
rename to CASA-auth-token/client/library/windows/authtoken.def
diff --git a/CASA-auth-token/client/lib/windows/client.vcproj b/CASA-auth-token/client/library/windows/client.vcproj
similarity index 100%
rename from CASA-auth-token/client/lib/windows/client.vcproj
rename to CASA-auth-token/client/library/windows/client.vcproj
diff --git a/CASA-auth-token/client/lib/windows/dllsup.c b/CASA-auth-token/client/library/windows/dllsup.c
similarity index 100%
rename from CASA-auth-token/client/lib/windows/dllsup.c
rename to CASA-auth-token/client/library/windows/dllsup.c
diff --git a/CASA-auth-token/client/lib/windows/platform.c b/CASA-auth-token/client/library/windows/platform.c
similarity index 100%
rename from CASA-auth-token/client/lib/windows/platform.c
rename to CASA-auth-token/client/library/windows/platform.c
diff --git a/CASA-auth-token/client/lib/windows/platform.h b/CASA-auth-token/client/library/windows/platform.h
similarity index 100%
rename from CASA-auth-token/client/lib/windows/platform.h
rename to CASA-auth-token/client/library/windows/platform.h
diff --git a/CASA-auth-token/client/lib/windows/rpc.c b/CASA-auth-token/client/library/windows/rpc.c
similarity index 100%
rename from CASA-auth-token/client/lib/windows/rpc.c
rename to CASA-auth-token/client/library/windows/rpc.c