diff --git a/auth_token/Makefile.am b/CASA-auth-token/Makefile.am similarity index 100% rename from auth_token/Makefile.am rename to CASA-auth-token/Makefile.am diff --git a/auth_token/README b/CASA-auth-token/README similarity index 100% rename from auth_token/README rename to CASA-auth-token/README diff --git a/auth_token/TODO b/CASA-auth-token/TODO similarity index 100% rename from auth_token/TODO rename to CASA-auth-token/TODO diff --git a/auth_token/auth.sln b/CASA-auth-token/auth.sln similarity index 100% rename from auth_token/auth.sln rename to CASA-auth-token/auth.sln diff --git a/auth_token/client/README b/CASA-auth-token/client/README similarity index 100% rename from auth_token/client/README rename to CASA-auth-token/client/README diff --git a/auth_token/client/TODO b/CASA-auth-token/client/TODO similarity index 100% rename from auth_token/client/TODO rename to CASA-auth-token/client/TODO diff --git a/auth_token/client/authmech.c b/CASA-auth-token/client/authmech.c similarity index 100% rename from auth_token/client/authmech.c rename to CASA-auth-token/client/authmech.c diff --git a/auth_token/client/authmsg.c b/CASA-auth-token/client/authmsg.c similarity index 100% rename from auth_token/client/authmsg.c rename to CASA-auth-token/client/authmsg.c diff --git a/auth_token/client/authpolicy.c b/CASA-auth-token/client/authpolicy.c similarity index 100% rename from auth_token/client/authpolicy.c rename to CASA-auth-token/client/authpolicy.c diff --git a/auth_token/client/authtokenclient_msi/authtokenclient_msi.vdproj b/CASA-auth-token/client/authtokenclient_msi/authtokenclient_msi.vdproj similarity index 100% rename from auth_token/client/authtokenclient_msi/authtokenclient_msi.vdproj rename to CASA-auth-token/client/authtokenclient_msi/authtokenclient_msi.vdproj diff --git a/auth_token/client/authtokenclient_msm/authtokenclient_msm.vdproj b/CASA-auth-token/client/authtokenclient_msm/authtokenclient_msm.vdproj similarity index 100% rename from auth_token/client/authtokenclient_msm/authtokenclient_msm.vdproj rename to CASA-auth-token/client/authtokenclient_msm/authtokenclient_msm.vdproj diff --git a/auth_token/client/client.vcproj b/CASA-auth-token/client/client.vcproj similarity index 100% rename from auth_token/client/client.vcproj rename to CASA-auth-token/client/client.vcproj diff --git a/auth_token/client/config.c b/CASA-auth-token/client/config.c similarity index 100% rename from auth_token/client/config.c rename to CASA-auth-token/client/config.c diff --git a/auth_token/client/config_if.h b/CASA-auth-token/client/config_if.h similarity index 100% rename from auth_token/client/config_if.h rename to CASA-auth-token/client/config_if.h diff --git a/auth_token/client/engine.c b/CASA-auth-token/client/engine.c similarity index 100% rename from auth_token/client/engine.c rename to CASA-auth-token/client/engine.c diff --git a/auth_token/client/getpolicymsg.c b/CASA-auth-token/client/getpolicymsg.c similarity index 100% rename from auth_token/client/getpolicymsg.c rename to CASA-auth-token/client/getpolicymsg.c diff --git a/auth_token/client/gettokenmsg.c b/CASA-auth-token/client/gettokenmsg.c similarity index 100% rename from auth_token/client/gettokenmsg.c rename to CASA-auth-token/client/gettokenmsg.c diff --git a/auth_token/client/internal.h b/CASA-auth-token/client/internal.h similarity index 100% rename from auth_token/client/internal.h rename to CASA-auth-token/client/internal.h diff --git a/auth_token/client/mech_if.h b/CASA-auth-token/client/mech_if.h similarity index 100% rename from auth_token/client/mech_if.h rename to CASA-auth-token/client/mech_if.h diff --git a/auth_token/client/mechanisms/krb5/Krb5Authenticate.conf b/CASA-auth-token/client/mechanisms/krb5/Krb5Authenticate.conf similarity index 100% rename from auth_token/client/mechanisms/krb5/Krb5Authenticate.conf rename to CASA-auth-token/client/mechanisms/krb5/Krb5Authenticate.conf diff --git a/auth_token/client/mechanisms/krb5/README b/CASA-auth-token/client/mechanisms/krb5/README similarity index 100% rename from auth_token/client/mechanisms/krb5/README rename to CASA-auth-token/client/mechanisms/krb5/README diff --git a/auth_token/client/mechanisms/krb5/TODO b/CASA-auth-token/client/mechanisms/krb5/TODO similarity index 100% rename from auth_token/client/mechanisms/krb5/TODO rename to CASA-auth-token/client/mechanisms/krb5/TODO diff --git a/auth_token/client/mechanisms/krb5/interface.c b/CASA-auth-token/client/mechanisms/krb5/interface.c similarity index 100% rename from auth_token/client/mechanisms/krb5/interface.c rename to CASA-auth-token/client/mechanisms/krb5/interface.c diff --git a/auth_token/client/mechanisms/krb5/internal.h b/CASA-auth-token/client/mechanisms/krb5/internal.h similarity index 100% rename from auth_token/client/mechanisms/krb5/internal.h rename to CASA-auth-token/client/mechanisms/krb5/internal.h diff --git a/auth_token/client/mechanisms/krb5/krb5.vcproj b/CASA-auth-token/client/mechanisms/krb5/krb5.vcproj similarity index 100% rename from auth_token/client/mechanisms/krb5/krb5.vcproj rename to CASA-auth-token/client/mechanisms/krb5/krb5.vcproj diff --git a/auth_token/client/mechanisms/krb5/util.c b/CASA-auth-token/client/mechanisms/krb5/util.c similarity index 100% rename from auth_token/client/mechanisms/krb5/util.c rename to CASA-auth-token/client/mechanisms/krb5/util.c diff --git a/auth_token/client/mechanisms/krb5/windows/dllsup.c b/CASA-auth-token/client/mechanisms/krb5/windows/dllsup.c similarity index 100% rename from auth_token/client/mechanisms/krb5/windows/dllsup.c rename to CASA-auth-token/client/mechanisms/krb5/windows/dllsup.c diff --git a/auth_token/client/mechanisms/krb5/windows/get.c b/CASA-auth-token/client/mechanisms/krb5/windows/get.c similarity index 100% rename from auth_token/client/mechanisms/krb5/windows/get.c rename to CASA-auth-token/client/mechanisms/krb5/windows/get.c diff --git a/auth_token/client/mechanisms/krb5/windows/krb5mech.def b/CASA-auth-token/client/mechanisms/krb5/windows/krb5mech.def similarity index 100% rename from auth_token/client/mechanisms/krb5/windows/krb5mech.def rename to CASA-auth-token/client/mechanisms/krb5/windows/krb5mech.def diff --git a/auth_token/client/mechanisms/krb5/windows/platform.c b/CASA-auth-token/client/mechanisms/krb5/windows/platform.c similarity index 100% rename from auth_token/client/mechanisms/krb5/windows/platform.c rename to CASA-auth-token/client/mechanisms/krb5/windows/platform.c diff --git a/auth_token/client/mechanisms/krb5/windows/platform.h b/CASA-auth-token/client/mechanisms/krb5/windows/platform.h similarity index 100% rename from auth_token/client/mechanisms/krb5/windows/platform.h rename to CASA-auth-token/client/mechanisms/krb5/windows/platform.h diff --git a/auth_token/client/mechanisms/pwd/PwdAuthenticate.conf b/CASA-auth-token/client/mechanisms/pwd/PwdAuthenticate.conf similarity index 100% rename from auth_token/client/mechanisms/pwd/PwdAuthenticate.conf rename to CASA-auth-token/client/mechanisms/pwd/PwdAuthenticate.conf diff --git a/auth_token/client/mechanisms/pwd/README b/CASA-auth-token/client/mechanisms/pwd/README similarity index 100% rename from auth_token/client/mechanisms/pwd/README rename to CASA-auth-token/client/mechanisms/pwd/README diff --git a/auth_token/client/mechanisms/pwd/TODO b/CASA-auth-token/client/mechanisms/pwd/TODO similarity index 100% rename from auth_token/client/mechanisms/pwd/TODO rename to CASA-auth-token/client/mechanisms/pwd/TODO diff --git a/auth_token/client/mechanisms/pwd/get.c b/CASA-auth-token/client/mechanisms/pwd/get.c similarity index 100% rename from auth_token/client/mechanisms/pwd/get.c rename to CASA-auth-token/client/mechanisms/pwd/get.c diff --git a/auth_token/client/mechanisms/pwd/interface.c b/CASA-auth-token/client/mechanisms/pwd/interface.c similarity index 100% rename from auth_token/client/mechanisms/pwd/interface.c rename to CASA-auth-token/client/mechanisms/pwd/interface.c diff --git a/auth_token/client/mechanisms/pwd/internal.h b/CASA-auth-token/client/mechanisms/pwd/internal.h similarity index 100% rename from auth_token/client/mechanisms/pwd/internal.h rename to CASA-auth-token/client/mechanisms/pwd/internal.h diff --git a/auth_token/client/mechanisms/pwd/pwd.vcproj b/CASA-auth-token/client/mechanisms/pwd/pwd.vcproj similarity index 100% rename from auth_token/client/mechanisms/pwd/pwd.vcproj rename to CASA-auth-token/client/mechanisms/pwd/pwd.vcproj diff --git a/auth_token/client/mechanisms/pwd/util.c b/CASA-auth-token/client/mechanisms/pwd/util.c similarity index 100% rename from auth_token/client/mechanisms/pwd/util.c rename to CASA-auth-token/client/mechanisms/pwd/util.c diff --git a/auth_token/client/mechanisms/pwd/windows/dllsup.c b/CASA-auth-token/client/mechanisms/pwd/windows/dllsup.c similarity index 100% rename from auth_token/client/mechanisms/pwd/windows/dllsup.c rename to CASA-auth-token/client/mechanisms/pwd/windows/dllsup.c diff --git a/auth_token/client/mechanisms/pwd/windows/platform.c b/CASA-auth-token/client/mechanisms/pwd/windows/platform.c similarity index 100% rename from auth_token/client/mechanisms/pwd/windows/platform.c rename to CASA-auth-token/client/mechanisms/pwd/windows/platform.c diff --git a/auth_token/client/mechanisms/pwd/windows/platform.h b/CASA-auth-token/client/mechanisms/pwd/windows/platform.h similarity index 100% rename from auth_token/client/mechanisms/pwd/windows/platform.h rename to CASA-auth-token/client/mechanisms/pwd/windows/platform.h diff --git a/auth_token/client/mechanisms/pwd/windows/pwmech.def b/CASA-auth-token/client/mechanisms/pwd/windows/pwmech.def similarity index 100% rename from auth_token/client/mechanisms/pwd/windows/pwmech.def rename to CASA-auth-token/client/mechanisms/pwd/windows/pwmech.def diff --git a/auth_token/client/test/CASA_Auth.cpp b/CASA-auth-token/client/test/CASA_Auth.cpp similarity index 100% rename from auth_token/client/test/CASA_Auth.cpp rename to CASA-auth-token/client/test/CASA_Auth.cpp diff --git a/auth_token/client/test/test.vcproj b/CASA-auth-token/client/test/test.vcproj similarity index 100% rename from auth_token/client/test/test.vcproj rename to CASA-auth-token/client/test/test.vcproj diff --git a/auth_token/client/util.c b/CASA-auth-token/client/util.c similarity index 100% rename from auth_token/client/util.c rename to CASA-auth-token/client/util.c diff --git a/auth_token/client/windows/authtoken.def b/CASA-auth-token/client/windows/authtoken.def similarity index 100% rename from auth_token/client/windows/authtoken.def rename to CASA-auth-token/client/windows/authtoken.def diff --git a/auth_token/client/windows/cache.c b/CASA-auth-token/client/windows/cache.c similarity index 100% rename from auth_token/client/windows/cache.c rename to CASA-auth-token/client/windows/cache.c diff --git a/auth_token/client/windows/dllsup.c b/CASA-auth-token/client/windows/dllsup.c similarity index 100% rename from auth_token/client/windows/dllsup.c rename to CASA-auth-token/client/windows/dllsup.c diff --git a/auth_token/client/windows/platform.c b/CASA-auth-token/client/windows/platform.c similarity index 100% rename from auth_token/client/windows/platform.c rename to CASA-auth-token/client/windows/platform.c diff --git a/auth_token/client/windows/platform.h b/CASA-auth-token/client/windows/platform.h similarity index 100% rename from auth_token/client/windows/platform.h rename to CASA-auth-token/client/windows/platform.h diff --git a/auth_token/client/windows/rpc.c b/CASA-auth-token/client/windows/rpc.c similarity index 100% rename from auth_token/client/windows/rpc.c rename to CASA-auth-token/client/windows/rpc.c diff --git a/auth_token/include/list_entry.h b/CASA-auth-token/include/list_entry.h similarity index 100% rename from auth_token/include/list_entry.h rename to CASA-auth-token/include/list_entry.h diff --git a/auth_token/include/proto.h b/CASA-auth-token/include/proto.h similarity index 100% rename from auth_token/include/proto.h rename to CASA-auth-token/include/proto.h diff --git a/auth_token/server/ApacheSupport/2.2/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/Makefile.am similarity index 100% rename from auth_token/server/ApacheSupport/2.2/Makefile.am rename to CASA-auth-token/server/ApacheSupport/2.2/Makefile.am diff --git a/auth_token/server/ApacheSupport/2.2/README b/CASA-auth-token/server/ApacheSupport/2.2/README similarity index 100% rename from auth_token/server/ApacheSupport/2.2/README rename to CASA-auth-token/server/ApacheSupport/2.2/README diff --git a/auth_token/server/ApacheSupport/2.2/TODO b/CASA-auth-token/server/ApacheSupport/2.2/TODO similarity index 100% rename from auth_token/server/ApacheSupport/2.2/TODO rename to CASA-auth-token/server/ApacheSupport/2.2/TODO diff --git a/auth_token/server/ApacheSupport/2.2/linux/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am similarity index 100% rename from auth_token/server/ApacheSupport/2.2/linux/Makefile.am rename to CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am diff --git a/auth_token/server/ApacheSupport/2.2/mod_authn_casa.c b/CASA-auth-token/server/ApacheSupport/2.2/mod_authn_casa.c similarity index 100% rename from auth_token/server/ApacheSupport/2.2/mod_authn_casa.c rename to CASA-auth-token/server/ApacheSupport/2.2/mod_authn_casa.c diff --git a/auth_token/server/ApacheSupport/Makefile.am b/CASA-auth-token/server/ApacheSupport/Makefile.am similarity index 100% rename from auth_token/server/ApacheSupport/Makefile.am rename to CASA-auth-token/server/ApacheSupport/Makefile.am diff --git a/auth_token/server/AuthTokenSvc/.project b/CASA-auth-token/server/AuthTokenSvc/.project similarity index 100% rename from auth_token/server/AuthTokenSvc/.project rename to CASA-auth-token/server/AuthTokenSvc/.project diff --git a/auth_token/server/AuthTokenSvc/Makefile.am b/CASA-auth-token/server/AuthTokenSvc/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenSvc/Makefile.am rename to CASA-auth-token/server/AuthTokenSvc/Makefile.am diff --git a/auth_token/server/AuthTokenSvc/README b/CASA-auth-token/server/AuthTokenSvc/README similarity index 100% rename from auth_token/server/AuthTokenSvc/README rename to CASA-auth-token/server/AuthTokenSvc/README diff --git a/auth_token/server/AuthTokenSvc/TODO b/CASA-auth-token/server/AuthTokenSvc/TODO similarity index 100% rename from auth_token/server/AuthTokenSvc/TODO rename to CASA-auth-token/server/AuthTokenSvc/TODO diff --git a/auth_token/server/AuthTokenSvc/authtoken.settings b/CASA-auth-token/server/AuthTokenSvc/authtoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/authtoken.settings rename to CASA-auth-token/server/AuthTokenSvc/authtoken.settings diff --git a/auth_token/server/AuthTokenSvc/identoken.settings b/CASA-auth-token/server/AuthTokenSvc/identoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/identoken.settings rename to CASA-auth-token/server/AuthTokenSvc/identoken.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth.policy b/CASA-auth-token/server/AuthTokenSvc/sampleConf/auth.policy similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/auth.policy rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/auth.policy diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/authtoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/authtoken.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy b/CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml b/CASA-auth-token/server/AuthTokenSvc/sampleConf/iaRealms.xml similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/iaRealms.xml diff --git a/auth_token/server/AuthTokenSvc/sampleConf/identoken.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/identoken.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/identoken.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/identoken.settings diff --git a/auth_token/server/AuthTokenSvc/sampleConf/svc.settings b/CASA-auth-token/server/AuthTokenSvc/sampleConf/svc.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/sampleConf/svc.settings rename to CASA-auth-token/server/AuthTokenSvc/sampleConf/svc.settings diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechConfig.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthMechanism.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthReqMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthRespMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthToken.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Authenticate.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Base64Coder.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/GetAuthToken.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/IdentityToken.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/ProtoDefs.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Rpc.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/RpcMethod.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SessionToken.java diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java similarity index 100% rename from auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java rename to CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/SvcConfig.java diff --git a/auth_token/server/AuthTokenSvc/svc.settings b/CASA-auth-token/server/AuthTokenSvc/svc.settings similarity index 100% rename from auth_token/server/AuthTokenSvc/svc.settings rename to CASA-auth-token/server/AuthTokenSvc/svc.settings diff --git a/auth_token/server/AuthTokenSvc/web.xml b/CASA-auth-token/server/AuthTokenSvc/web.xml similarity index 100% rename from auth_token/server/AuthTokenSvc/web.xml rename to CASA-auth-token/server/AuthTokenSvc/web.xml diff --git a/auth_token/server/AuthTokenValidate/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenValidate/Makefile.am rename to CASA-auth-token/server/AuthTokenValidate/Makefile.am diff --git a/auth_token/server/AuthTokenValidate/README b/CASA-auth-token/server/AuthTokenValidate/README similarity index 100% rename from auth_token/server/AuthTokenValidate/README rename to CASA-auth-token/server/AuthTokenValidate/README diff --git a/auth_token/server/AuthTokenValidate/TODO b/CASA-auth-token/server/AuthTokenValidate/TODO similarity index 100% rename from auth_token/server/AuthTokenValidate/TODO rename to CASA-auth-token/server/AuthTokenValidate/TODO diff --git a/auth_token/server/AuthTokenValidate/authtoken.c b/CASA-auth-token/server/AuthTokenValidate/authtoken.c similarity index 100% rename from auth_token/server/AuthTokenValidate/authtoken.c rename to CASA-auth-token/server/AuthTokenValidate/authtoken.c diff --git a/auth_token/server/AuthTokenValidate/config.c b/CASA-auth-token/server/AuthTokenValidate/config.c similarity index 100% rename from auth_token/server/AuthTokenValidate/config.c rename to CASA-auth-token/server/AuthTokenValidate/config.c diff --git a/auth_token/server/AuthTokenValidate/config_if.h b/CASA-auth-token/server/AuthTokenValidate/config_if.h similarity index 100% rename from auth_token/server/AuthTokenValidate/config_if.h rename to CASA-auth-token/server/AuthTokenValidate/config_if.h diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/Makefile.am rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/Makefile.am diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/README b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/README similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/README rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/README diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/TODO b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/TODO similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/TODO rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/TODO diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/identoken.c diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/identokenprovider.c diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/internal.h b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/internal.h similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/internal.h rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/internal.h diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.c diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/platform.h diff --git a/auth_token/server/AuthTokenValidate/idenTokenProviders/casa/util.c b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/util.c similarity index 100% rename from auth_token/server/AuthTokenValidate/idenTokenProviders/casa/util.c rename to CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/util.c diff --git a/auth_token/server/AuthTokenValidate/iden_token_provider_if.h b/CASA-auth-token/server/AuthTokenValidate/iden_token_provider_if.h similarity index 100% rename from auth_token/server/AuthTokenValidate/iden_token_provider_if.h rename to CASA-auth-token/server/AuthTokenValidate/iden_token_provider_if.h diff --git a/auth_token/server/AuthTokenValidate/identoken.c b/CASA-auth-token/server/AuthTokenValidate/identoken.c similarity index 100% rename from auth_token/server/AuthTokenValidate/identoken.c rename to CASA-auth-token/server/AuthTokenValidate/identoken.c diff --git a/auth_token/server/AuthTokenValidate/internal.h b/CASA-auth-token/server/AuthTokenValidate/internal.h similarity index 100% rename from auth_token/server/AuthTokenValidate/internal.h rename to CASA-auth-token/server/AuthTokenValidate/internal.h diff --git a/auth_token/server/AuthTokenValidate/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am similarity index 100% rename from auth_token/server/AuthTokenValidate/linux/Makefile.am rename to CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am diff --git a/auth_token/server/AuthTokenValidate/linux/platform.c b/CASA-auth-token/server/AuthTokenValidate/linux/platform.c similarity index 100% rename from auth_token/server/AuthTokenValidate/linux/platform.c rename to CASA-auth-token/server/AuthTokenValidate/linux/platform.c diff --git a/auth_token/server/AuthTokenValidate/linux/platform.h b/CASA-auth-token/server/AuthTokenValidate/linux/platform.h similarity index 100% rename from auth_token/server/AuthTokenValidate/linux/platform.h rename to CASA-auth-token/server/AuthTokenValidate/linux/platform.h diff --git a/auth_token/server/AuthTokenValidate/principal.c b/CASA-auth-token/server/AuthTokenValidate/principal.c similarity index 100% rename from auth_token/server/AuthTokenValidate/principal.c rename to CASA-auth-token/server/AuthTokenValidate/principal.c diff --git a/auth_token/server/AuthTokenValidate/util.c b/CASA-auth-token/server/AuthTokenValidate/util.c similarity index 100% rename from auth_token/server/AuthTokenValidate/util.c rename to CASA-auth-token/server/AuthTokenValidate/util.c diff --git a/auth_token/server/AuthTokenValidate/validate.c b/CASA-auth-token/server/AuthTokenValidate/validate.c similarity index 100% rename from auth_token/server/AuthTokenValidate/validate.c rename to CASA-auth-token/server/AuthTokenValidate/validate.c diff --git a/auth_token/server/JaasSupport/.classpath b/CASA-auth-token/server/JaasSupport/.classpath similarity index 100% rename from auth_token/server/JaasSupport/.classpath rename to CASA-auth-token/server/JaasSupport/.classpath diff --git a/auth_token/server/JaasSupport/.project b/CASA-auth-token/server/JaasSupport/.project similarity index 100% rename from auth_token/server/JaasSupport/.project rename to CASA-auth-token/server/JaasSupport/.project diff --git a/auth_token/server/JaasSupport/Makefile.am b/CASA-auth-token/server/JaasSupport/Makefile.am similarity index 100% rename from auth_token/server/JaasSupport/Makefile.am rename to CASA-auth-token/server/JaasSupport/Makefile.am diff --git a/auth_token/server/JaasSupport/README b/CASA-auth-token/server/JaasSupport/README similarity index 100% rename from auth_token/server/JaasSupport/README rename to CASA-auth-token/server/JaasSupport/README diff --git a/auth_token/server/JaasSupport/TODO b/CASA-auth-token/server/JaasSupport/TODO similarity index 100% rename from auth_token/server/JaasSupport/TODO rename to CASA-auth-token/server/JaasSupport/TODO diff --git a/auth_token/server/JaasSupport/make_and_run_test.sh b/CASA-auth-token/server/JaasSupport/make_and_run_test.sh similarity index 100% rename from auth_token/server/JaasSupport/make_and_run_test.sh rename to CASA-auth-token/server/JaasSupport/make_and_run_test.sh diff --git a/auth_token/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java b/CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java similarity index 100% rename from auth_token/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java rename to CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/CasaLoginModule.java diff --git a/auth_token/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java b/CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java similarity index 100% rename from auth_token/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java rename to CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/CasaPrincipal.java diff --git a/auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf b/CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf similarity index 100% rename from auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf rename to CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.conf diff --git a/auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java b/CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java similarity index 100% rename from auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java rename to CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleApp.java diff --git a/auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java b/CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java similarity index 100% rename from auth_token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java rename to CASA-auth-token/server/JaasSupport/src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java diff --git a/auth_token/server/Makefile.am b/CASA-auth-token/server/Makefile.am similarity index 100% rename from auth_token/server/Makefile.am rename to CASA-auth-token/server/Makefile.am diff --git a/auth_token/server/PamSupport/Makefile.am b/CASA-auth-token/server/PamSupport/Makefile.am similarity index 100% rename from auth_token/server/PamSupport/Makefile.am rename to CASA-auth-token/server/PamSupport/Makefile.am diff --git a/auth_token/server/PamSupport/README b/CASA-auth-token/server/PamSupport/README similarity index 100% rename from auth_token/server/PamSupport/README rename to CASA-auth-token/server/PamSupport/README diff --git a/auth_token/server/PamSupport/TODO b/CASA-auth-token/server/PamSupport/TODO similarity index 100% rename from auth_token/server/PamSupport/TODO rename to CASA-auth-token/server/PamSupport/TODO diff --git a/auth_token/server/PamSupport/linux/Makefile.am b/CASA-auth-token/server/PamSupport/linux/Makefile.am similarity index 100% rename from auth_token/server/PamSupport/linux/Makefile.am rename to CASA-auth-token/server/PamSupport/linux/Makefile.am diff --git a/auth_token/server/PamSupport/pam_authtoken.c b/CASA-auth-token/server/PamSupport/pam_authtoken.c similarity index 100% rename from auth_token/server/PamSupport/pam_authtoken.c rename to CASA-auth-token/server/PamSupport/pam_authtoken.c diff --git a/auth_token/server/PamSupport/test/README b/CASA-auth-token/server/PamSupport/test/README similarity index 100% rename from auth_token/server/PamSupport/test/README rename to CASA-auth-token/server/PamSupport/test/README diff --git a/auth_token/server/PamSupport/test/make.sh b/CASA-auth-token/server/PamSupport/test/make.sh similarity index 100% rename from auth_token/server/PamSupport/test/make.sh rename to CASA-auth-token/server/PamSupport/test/make.sh diff --git a/auth_token/server/PamSupport/test/test.c b/CASA-auth-token/server/PamSupport/test/test.c similarity index 100% rename from auth_token/server/PamSupport/test/test.c rename to CASA-auth-token/server/PamSupport/test/test.c diff --git a/auth_token/server/PamSupport/test/testservice b/CASA-auth-token/server/PamSupport/test/testservice similarity index 100% rename from auth_token/server/PamSupport/test/testservice rename to CASA-auth-token/server/PamSupport/test/testservice diff --git a/c_kwallet/AUTHORS b/CASA-kwallet/AUTHORS similarity index 100% rename from c_kwallet/AUTHORS rename to CASA-kwallet/AUTHORS diff --git a/c_kwallet/COPYING b/CASA-kwallet/COPYING similarity index 100% rename from c_kwallet/COPYING rename to CASA-kwallet/COPYING diff --git a/c_kwallet/ChangeLog b/CASA-kwallet/ChangeLog similarity index 100% rename from c_kwallet/ChangeLog rename to CASA-kwallet/ChangeLog diff --git a/c_kwallet/Makefile.am b/CASA-kwallet/Makefile.am similarity index 100% rename from c_kwallet/Makefile.am rename to CASA-kwallet/Makefile.am diff --git a/c_kwallet/NEWS b/CASA-kwallet/NEWS similarity index 100% rename from c_kwallet/NEWS rename to CASA-kwallet/NEWS diff --git a/c_kwallet/README b/CASA-kwallet/README similarity index 100% rename from c_kwallet/README rename to CASA-kwallet/README diff --git a/c_kwallet/autogen.sh b/CASA-kwallet/autogen.sh similarity index 100% rename from c_kwallet/autogen.sh rename to CASA-kwallet/autogen.sh diff --git a/c_kwallet/casa_dcop.h b/CASA-kwallet/casa_dcop.h similarity index 100% rename from c_kwallet/casa_dcop.h rename to CASA-kwallet/casa_dcop.h diff --git a/c_kwallet/casakwallet.cpp b/CASA-kwallet/casakwallet.cpp similarity index 100% rename from c_kwallet/casakwallet.cpp rename to CASA-kwallet/casakwallet.cpp diff --git a/c_kwallet/casakwallet.h b/CASA-kwallet/casakwallet.h similarity index 100% rename from c_kwallet/casakwallet.h rename to CASA-kwallet/casakwallet.h diff --git a/c_kwallet/configure.in b/CASA-kwallet/configure.in similarity index 100% rename from c_kwallet/configure.in rename to CASA-kwallet/configure.in diff --git a/c_adlib/ad_kw/native/link.lux b/CASA-kwallet/link.lux similarity index 100% rename from c_adlib/ad_kw/native/link.lux rename to CASA-kwallet/link.lux diff --git a/c_kwallet/objs.lux b/CASA-kwallet/objs.lux similarity index 100% rename from c_kwallet/objs.lux rename to CASA-kwallet/objs.lux diff --git a/c_kwallet/package/CASA-kwallet.changes b/CASA-kwallet/package/CASA-kwallet.changes similarity index 100% rename from c_kwallet/package/CASA-kwallet.changes rename to CASA-kwallet/package/CASA-kwallet.changes diff --git a/c_kwallet/package/CASA-kwallet.spec.in b/CASA-kwallet/package/CASA-kwallet.spec.in similarity index 100% rename from c_kwallet/package/CASA-kwallet.spec.in rename to CASA-kwallet/package/CASA-kwallet.spec.in diff --git a/c_kwallet/package/Makefile.am b/CASA-kwallet/package/Makefile.am similarity index 100% rename from c_kwallet/package/Makefile.am rename to CASA-kwallet/package/Makefile.am diff --git a/c_adlib/AD_Facade.cs b/adlib/AD_Facade.cs similarity index 100% rename from c_adlib/AD_Facade.cs rename to adlib/AD_Facade.cs diff --git a/c_adlib/AssemblyInfo.cs b/adlib/AssemblyInfo.cs similarity index 100% rename from c_adlib/AssemblyInfo.cs rename to adlib/AssemblyInfo.cs diff --git a/c_adlib/Common.cs b/adlib/Common.cs similarity index 100% rename from c_adlib/Common.cs rename to adlib/Common.cs diff --git a/c_adlib/FFEngine.cs b/adlib/FFEngine.cs similarity index 100% rename from c_adlib/FFEngine.cs rename to adlib/FFEngine.cs diff --git a/c_adlib/GKEngine.cs b/adlib/GKEngine.cs similarity index 100% rename from c_adlib/GKEngine.cs rename to adlib/GKEngine.cs diff --git a/c_adlib/IDataEngine.cs b/adlib/IDataEngine.cs similarity index 100% rename from c_adlib/IDataEngine.cs rename to adlib/IDataEngine.cs diff --git a/c_adlib/KWalletEngine.cs b/adlib/KWalletEngine.cs similarity index 100% rename from c_adlib/KWalletEngine.cs rename to adlib/KWalletEngine.cs diff --git a/c_adlib/Makefile.am b/adlib/Makefile.am similarity index 100% rename from c_adlib/Makefile.am rename to adlib/Makefile.am diff --git a/c_adlib/Novell.CASA.A-D.csproj b/adlib/Novell.CASA.A-D.csproj similarity index 100% rename from c_adlib/Novell.CASA.A-D.csproj rename to adlib/Novell.CASA.A-D.csproj diff --git a/c_adlib/Novell.CASA.A-D.csproj.user b/adlib/Novell.CASA.A-D.csproj.user similarity index 100% rename from c_adlib/Novell.CASA.A-D.csproj.user rename to adlib/Novell.CASA.A-D.csproj.user diff --git a/c_adlib/ad_ff/AssemblyInfo.cs b/adlib/ad_ff/AssemblyInfo.cs similarity index 100% rename from c_adlib/ad_ff/AssemblyInfo.cs rename to adlib/ad_ff/AssemblyInfo.cs diff --git a/c_adlib/ad_ff/FireFox.cs b/adlib/ad_ff/FireFox.cs similarity index 100% rename from c_adlib/ad_ff/FireFox.cs rename to adlib/ad_ff/FireFox.cs diff --git a/c_adlib/ad_ff/Makefile.am b/adlib/ad_ff/Makefile.am similarity index 100% rename from c_adlib/ad_ff/Makefile.am rename to adlib/ad_ff/Makefile.am diff --git a/c_adlib/ad_ff/firefox.vcproj b/adlib/ad_ff/firefox.vcproj similarity index 100% rename from c_adlib/ad_ff/firefox.vcproj rename to adlib/ad_ff/firefox.vcproj diff --git a/c_adlib/ad_ff/native/Common.cpp b/adlib/ad_ff/native/Common.cpp similarity index 100% rename from c_adlib/ad_ff/native/Common.cpp rename to adlib/ad_ff/native/Common.cpp diff --git a/c_adlib/ad_ff/native/Common.h b/adlib/ad_ff/native/Common.h similarity index 100% rename from c_adlib/ad_ff/native/Common.h rename to adlib/ad_ff/native/Common.h diff --git a/c_adlib/ad_ff/native/CryptManager.cpp b/adlib/ad_ff/native/CryptManager.cpp similarity index 100% rename from c_adlib/ad_ff/native/CryptManager.cpp rename to adlib/ad_ff/native/CryptManager.cpp diff --git a/c_adlib/ad_ff/native/CryptManager.h b/adlib/ad_ff/native/CryptManager.h similarity index 100% rename from c_adlib/ad_ff/native/CryptManager.h rename to adlib/ad_ff/native/CryptManager.h diff --git a/c_adlib/ad_ff/native/DataManager.cpp b/adlib/ad_ff/native/DataManager.cpp similarity index 100% rename from c_adlib/ad_ff/native/DataManager.cpp rename to adlib/ad_ff/native/DataManager.cpp diff --git a/c_adlib/ad_ff/native/DataManager.h b/adlib/ad_ff/native/DataManager.h similarity index 100% rename from c_adlib/ad_ff/native/DataManager.h rename to adlib/ad_ff/native/DataManager.h diff --git a/c_adlib/ad_ff/native/FirefoxPasswordManager.cpp b/adlib/ad_ff/native/FirefoxPasswordManager.cpp similarity index 100% rename from c_adlib/ad_ff/native/FirefoxPasswordManager.cpp rename to adlib/ad_ff/native/FirefoxPasswordManager.cpp diff --git a/c_adlib/ad_ff/native/FirefoxPasswordManager.h b/adlib/ad_ff/native/FirefoxPasswordManager.h similarity index 100% rename from c_adlib/ad_ff/native/FirefoxPasswordManager.h rename to adlib/ad_ff/native/FirefoxPasswordManager.h diff --git a/c_adlib/ad_ff/native/Makefile.am b/adlib/ad_ff/native/Makefile.am similarity index 100% rename from c_adlib/ad_ff/native/Makefile.am rename to adlib/ad_ff/native/Makefile.am diff --git a/c_adlib/ad_ff/native/ProfileManager.cpp b/adlib/ad_ff/native/ProfileManager.cpp similarity index 100% rename from c_adlib/ad_ff/native/ProfileManager.cpp rename to adlib/ad_ff/native/ProfileManager.cpp diff --git a/c_adlib/ad_ff/native/ProfileManager.h b/adlib/ad_ff/native/ProfileManager.h similarity index 100% rename from c_adlib/ad_ff/native/ProfileManager.h rename to adlib/ad_ff/native/ProfileManager.h diff --git a/c_adlib/ad_ff/native/SignonManager.cpp b/adlib/ad_ff/native/SignonManager.cpp similarity index 100% rename from c_adlib/ad_ff/native/SignonManager.cpp rename to adlib/ad_ff/native/SignonManager.cpp diff --git a/c_adlib/ad_ff/native/SignonManager.h b/adlib/ad_ff/native/SignonManager.h similarity index 100% rename from c_adlib/ad_ff/native/SignonManager.h rename to adlib/ad_ff/native/SignonManager.h diff --git a/c_adlib/ad_ff/native/link.lux b/adlib/ad_ff/native/link.lux similarity index 100% rename from c_adlib/ad_ff/native/link.lux rename to adlib/ad_ff/native/link.lux diff --git a/c_adlib/ad_ff/native/objs.lux b/adlib/ad_ff/native/objs.lux similarity index 100% rename from c_adlib/ad_ff/native/objs.lux rename to adlib/ad_ff/native/objs.lux diff --git a/c_adlib/ad_ff/objs.lux b/adlib/ad_ff/objs.lux similarity index 100% rename from c_adlib/ad_ff/objs.lux rename to adlib/ad_ff/objs.lux diff --git a/c_adlib/ad_ff/src.lux b/adlib/ad_ff/src.lux similarity index 100% rename from c_adlib/ad_ff/src.lux rename to adlib/ad_ff/src.lux diff --git a/c_adlib/ad_gk/AssemblyInfo.cs b/adlib/ad_gk/AssemblyInfo.cs similarity index 100% rename from c_adlib/ad_gk/AssemblyInfo.cs rename to adlib/ad_gk/AssemblyInfo.cs diff --git a/c_adlib/ad_gk/GnomeKeyring.cs b/adlib/ad_gk/GnomeKeyring.cs similarity index 100% rename from c_adlib/ad_gk/GnomeKeyring.cs rename to adlib/ad_gk/GnomeKeyring.cs diff --git a/c_adlib/ad_gk/Makefile.am b/adlib/ad_gk/Makefile.am similarity index 100% rename from c_adlib/ad_gk/Makefile.am rename to adlib/ad_gk/Makefile.am diff --git a/c_adlib/ad_gk/native/Makefile.am b/adlib/ad_gk/native/Makefile.am similarity index 100% rename from c_adlib/ad_gk/native/Makefile.am rename to adlib/ad_gk/native/Makefile.am diff --git a/c_adlib/ad_gk/native/ad_gk.c b/adlib/ad_gk/native/ad_gk.c similarity index 100% rename from c_adlib/ad_gk/native/ad_gk.c rename to adlib/ad_gk/native/ad_gk.c diff --git a/c_adlib/ad_gk/native/ad_gk.h b/adlib/ad_gk/native/ad_gk.h similarity index 100% rename from c_adlib/ad_gk/native/ad_gk.h rename to adlib/ad_gk/native/ad_gk.h diff --git a/c_adlib/ad_gk/native/casa-gnome-keyring.h b/adlib/ad_gk/native/casa-gnome-keyring.h similarity index 100% rename from c_adlib/ad_gk/native/casa-gnome-keyring.h rename to adlib/ad_gk/native/casa-gnome-keyring.h diff --git a/c_adlib/ad_gk/native/link.lux b/adlib/ad_gk/native/link.lux similarity index 100% rename from c_adlib/ad_gk/native/link.lux rename to adlib/ad_gk/native/link.lux diff --git a/c_adlib/ad_gk/native/objs.lux b/adlib/ad_gk/native/objs.lux similarity index 100% rename from c_adlib/ad_gk/native/objs.lux rename to adlib/ad_gk/native/objs.lux diff --git a/c_adlib/ad_gk/objs.lux b/adlib/ad_gk/objs.lux similarity index 100% rename from c_adlib/ad_gk/objs.lux rename to adlib/ad_gk/objs.lux diff --git a/c_adlib/ad_gk/src.lux b/adlib/ad_gk/src.lux similarity index 100% rename from c_adlib/ad_gk/src.lux rename to adlib/ad_gk/src.lux diff --git a/c_adlib/ad_kw/AssemblyInfo.cs b/adlib/ad_kw/AssemblyInfo.cs similarity index 100% rename from c_adlib/ad_kw/AssemblyInfo.cs rename to adlib/ad_kw/AssemblyInfo.cs diff --git a/c_adlib/ad_kw/KWalletEnum.cs b/adlib/ad_kw/KWalletEnum.cs similarity index 100% rename from c_adlib/ad_kw/KWalletEnum.cs rename to adlib/ad_kw/KWalletEnum.cs diff --git a/c_adlib/ad_kw/KWalletNative.cs b/adlib/ad_kw/KWalletNative.cs similarity index 100% rename from c_adlib/ad_kw/KWalletNative.cs rename to adlib/ad_kw/KWalletNative.cs diff --git a/c_adlib/ad_kw/Makefile.am b/adlib/ad_kw/Makefile.am similarity index 100% rename from c_adlib/ad_kw/Makefile.am rename to adlib/ad_kw/Makefile.am diff --git a/c_adlib/ad_kw/native/Makefile.am b/adlib/ad_kw/native/Makefile.am similarity index 100% rename from c_adlib/ad_kw/native/Makefile.am rename to adlib/ad_kw/native/Makefile.am diff --git a/c_adlib/ad_kw/native/casa_dcop.h b/adlib/ad_kw/native/casa_dcop.h similarity index 100% rename from c_adlib/ad_kw/native/casa_dcop.h rename to adlib/ad_kw/native/casa_dcop.h diff --git a/c_adlib/ad_kw/native/kwallets_rw.cpp b/adlib/ad_kw/native/kwallets_rw.cpp similarity index 100% rename from c_adlib/ad_kw/native/kwallets_rw.cpp rename to adlib/ad_kw/native/kwallets_rw.cpp diff --git a/c_adlib/ad_kw/native/kwallets_rw.h b/adlib/ad_kw/native/kwallets_rw.h similarity index 100% rename from c_adlib/ad_kw/native/kwallets_rw.h rename to adlib/ad_kw/native/kwallets_rw.h diff --git a/c_kwallet/link.lux b/adlib/ad_kw/native/link.lux similarity index 100% rename from c_kwallet/link.lux rename to adlib/ad_kw/native/link.lux diff --git a/c_adlib/ad_kw/native/objs.lux b/adlib/ad_kw/native/objs.lux similarity index 100% rename from c_adlib/ad_kw/native/objs.lux rename to adlib/ad_kw/native/objs.lux diff --git a/c_adlib/ad_kw/objs.lux b/adlib/ad_kw/objs.lux similarity index 100% rename from c_adlib/ad_kw/objs.lux rename to adlib/ad_kw/objs.lux diff --git a/c_adlib/ad_kw/src.lux b/adlib/ad_kw/src.lux similarity index 100% rename from c_adlib/ad_kw/src.lux rename to adlib/ad_kw/src.lux diff --git a/c_adlib/miCASAEngine.cs b/adlib/miCASAEngine.cs similarity index 100% rename from c_adlib/miCASAEngine.cs rename to adlib/miCASAEngine.cs diff --git a/c_adlib/objs.lux b/adlib/objs.lux similarity index 100% rename from c_adlib/objs.lux rename to adlib/objs.lux diff --git a/c_adlib/objs.w32 b/adlib/objs.w32 similarity index 100% rename from c_adlib/objs.w32 rename to adlib/objs.w32 diff --git a/c_adlib/src.lux b/adlib/src.lux similarity index 100% rename from c_adlib/src.lux rename to adlib/src.lux diff --git a/c_adlib/src.w32 b/adlib/src.w32 similarity index 100% rename from c_adlib/src.w32 rename to adlib/src.w32 diff --git a/c_common/Makefile.am b/common/Makefile.am similarity index 100% rename from c_common/Makefile.am rename to common/Makefile.am diff --git a/c_common/linux/Makefile.am b/common/linux/Makefile.am similarity index 100% rename from c_common/linux/Makefile.am rename to common/linux/Makefile.am diff --git a/c_common/sscs_ll.c b/common/sscs_ll.c similarity index 100% rename from c_common/sscs_ll.c rename to common/sscs_ll.c diff --git a/c_common/windows/Makefile.am b/common/windows/Makefile.am similarity index 100% rename from c_common/windows/Makefile.am rename to common/windows/Makefile.am diff --git a/c_gui/AssemblyInfo.cs b/gui/AssemblyInfo.cs similarity index 100% rename from c_gui/AssemblyInfo.cs rename to gui/AssemblyInfo.cs diff --git a/c_gui/CASAManager.csproj b/gui/CASAManager.csproj similarity index 100% rename from c_gui/CASAManager.csproj rename to gui/CASAManager.csproj diff --git a/c_gui/CASAManager.csproj.user b/gui/CASAManager.csproj.user similarity index 100% rename from c_gui/CASAManager.csproj.user rename to gui/CASAManager.csproj.user diff --git a/c_gui/CASAManager.desktop b/gui/CASAManager.desktop similarity index 100% rename from c_gui/CASAManager.desktop rename to gui/CASAManager.desktop diff --git a/c_gui/CASAManager.exe.config b/gui/CASAManager.exe.config similarity index 100% rename from c_gui/CASAManager.exe.config rename to gui/CASAManager.exe.config diff --git a/c_gui/CASAManager.sh b/gui/CASAManager.sh similarity index 100% rename from c_gui/CASAManager.sh rename to gui/CASAManager.sh diff --git a/c_gui/CasaMain.cs b/gui/CasaMain.cs similarity index 100% rename from c_gui/CasaMain.cs rename to gui/CasaMain.cs diff --git a/c_gui/CasaTray.cs b/gui/CasaTray.cs similarity index 100% rename from c_gui/CasaTray.cs rename to gui/CasaTray.cs diff --git a/c_gui/Common.cs b/gui/Common.cs similarity index 100% rename from c_gui/Common.cs rename to gui/Common.cs diff --git a/c_gui/CommonGUI.cs b/gui/CommonGUI.cs similarity index 100% rename from c_gui/CommonGUI.cs rename to gui/CommonGUI.cs diff --git a/c_gui/Firefox.cs b/gui/Firefox.cs similarity index 100% rename from c_gui/Firefox.cs rename to gui/Firefox.cs diff --git a/c_gui/GnomeKeyring.cs b/gui/GnomeKeyring.cs similarity index 100% rename from c_gui/GnomeKeyring.cs rename to gui/GnomeKeyring.cs diff --git a/c_gui/KdeWallet.cs b/gui/KdeWallet.cs similarity index 100% rename from c_gui/KdeWallet.cs rename to gui/KdeWallet.cs diff --git a/c_gui/Logger.cs b/gui/Logger.cs similarity index 100% rename from c_gui/Logger.cs rename to gui/Logger.cs diff --git a/c_gui/Makefile.am b/gui/Makefile.am similarity index 100% rename from c_gui/Makefile.am rename to gui/Makefile.am diff --git a/c_gui/MiCasa.cs b/gui/MiCasa.cs similarity index 100% rename from c_gui/MiCasa.cs rename to gui/MiCasa.cs diff --git a/c_gui/Mozilla.cs b/gui/Mozilla.cs similarity index 100% rename from c_gui/Mozilla.cs rename to gui/Mozilla.cs diff --git a/c_gui/Store.cs b/gui/Store.cs similarity index 100% rename from c_gui/Store.cs rename to gui/Store.cs diff --git a/c_gui/StoreDataInterface.cs b/gui/StoreDataInterface.cs similarity index 100% rename from c_gui/StoreDataInterface.cs rename to gui/StoreDataInterface.cs diff --git a/c_gui/StorePolicyInterface.cs b/gui/StorePolicyInterface.cs similarity index 100% rename from c_gui/StorePolicyInterface.cs rename to gui/StorePolicyInterface.cs diff --git a/c_gui/TrayLib.cs b/gui/TrayLib.cs similarity index 100% rename from c_gui/TrayLib.cs rename to gui/TrayLib.cs diff --git a/c_gui/help/en/AddNewSecrets.htm b/gui/help/en/AddNewSecrets.htm similarity index 100% rename from c_gui/help/en/AddNewSecrets.htm rename to gui/help/en/AddNewSecrets.htm diff --git a/c_gui/help/en/AddingNewSecrets.png b/gui/help/en/AddingNewSecrets.png similarity index 100% rename from c_gui/help/en/AddingNewSecrets.png rename to gui/help/en/AddingNewSecrets.png diff --git a/c_gui/help/en/CASADesktopPassword.htm b/gui/help/en/CASADesktopPassword.htm similarity index 100% rename from c_gui/help/en/CASADesktopPassword.htm rename to gui/help/en/CASADesktopPassword.htm diff --git a/c_gui/help/en/CASAMasterPasswordAuthentication.htm b/gui/help/en/CASAMasterPasswordAuthentication.htm similarity index 100% rename from c_gui/help/en/CASAMasterPasswordAuthentication.htm rename to gui/help/en/CASAMasterPasswordAuthentication.htm diff --git a/c_gui/help/en/Contents.htm b/gui/help/en/Contents.htm similarity index 100% rename from c_gui/help/en/Contents.htm rename to gui/help/en/Contents.htm diff --git a/c_gui/help/en/DestroyingSecrets.htm b/gui/help/en/DestroyingSecrets.htm similarity index 100% rename from c_gui/help/en/DestroyingSecrets.htm rename to gui/help/en/DestroyingSecrets.htm diff --git a/c_gui/help/en/DestroyingSecrets.png b/gui/help/en/DestroyingSecrets.png similarity index 100% rename from c_gui/help/en/DestroyingSecrets.png rename to gui/help/en/DestroyingSecrets.png diff --git a/c_gui/help/en/EditingSecrets.html b/gui/help/en/EditingSecrets.html similarity index 100% rename from c_gui/help/en/EditingSecrets.html rename to gui/help/en/EditingSecrets.html diff --git a/c_gui/help/en/EditingSecrets.png b/gui/help/en/EditingSecrets.png similarity index 100% rename from c_gui/help/en/EditingSecrets.png rename to gui/help/en/EditingSecrets.png diff --git a/c_gui/help/en/LinkingSecrets.htm b/gui/help/en/LinkingSecrets.htm similarity index 100% rename from c_gui/help/en/LinkingSecrets.htm rename to gui/help/en/LinkingSecrets.htm diff --git a/c_gui/help/en/LinkingSecrets.png b/gui/help/en/LinkingSecrets.png similarity index 100% rename from c_gui/help/en/LinkingSecrets.png rename to gui/help/en/LinkingSecrets.png diff --git a/c_gui/help/en/PersistentStorage.png b/gui/help/en/PersistentStorage.png similarity index 100% rename from c_gui/help/en/PersistentStorage.png rename to gui/help/en/PersistentStorage.png diff --git a/c_gui/help/en/Persistent_Storage.htm b/gui/help/en/Persistent_Storage.htm similarity index 100% rename from c_gui/help/en/Persistent_Storage.htm rename to gui/help/en/Persistent_Storage.htm diff --git a/c_gui/help/en/Preferences.htm b/gui/help/en/Preferences.htm similarity index 100% rename from c_gui/help/en/Preferences.htm rename to gui/help/en/Preferences.htm diff --git a/c_gui/help/en/Preferences.png b/gui/help/en/Preferences.png similarity index 100% rename from c_gui/help/en/Preferences.png rename to gui/help/en/Preferences.png diff --git a/c_gui/help/en/RefreshCredentialStores.png b/gui/help/en/RefreshCredentialStores.png similarity index 100% rename from c_gui/help/en/RefreshCredentialStores.png rename to gui/help/en/RefreshCredentialStores.png diff --git a/c_gui/help/en/SettingMasterPassword.png b/gui/help/en/SettingMasterPassword.png similarity index 100% rename from c_gui/help/en/SettingMasterPassword.png rename to gui/help/en/SettingMasterPassword.png diff --git a/c_gui/help/en/UnlockSecrets.htm b/gui/help/en/UnlockSecrets.htm similarity index 100% rename from c_gui/help/en/UnlockSecrets.htm rename to gui/help/en/UnlockSecrets.htm diff --git a/c_gui/help/en/ViewSecrets.htm b/gui/help/en/ViewSecrets.htm similarity index 100% rename from c_gui/help/en/ViewSecrets.htm rename to gui/help/en/ViewSecrets.htm diff --git a/c_gui/help/en/ViewingSecrets.png b/gui/help/en/ViewingSecrets.png similarity index 100% rename from c_gui/help/en/ViewingSecrets.png rename to gui/help/en/ViewingSecrets.png diff --git a/c_gui/help/en/h1_help_zcc.gif b/gui/help/en/h1_help_zcc.gif similarity index 100% rename from c_gui/help/en/h1_help_zcc.gif rename to gui/help/en/h1_help_zcc.gif diff --git a/c_gui/help/en/help_zcc_bg.gif b/gui/help/en/help_zcc_bg.gif similarity index 100% rename from c_gui/help/en/help_zcc_bg.gif rename to gui/help/en/help_zcc_bg.gif diff --git a/c_gui/help/en/hf_style.css b/gui/help/en/hf_style.css similarity index 100% rename from c_gui/help/en/hf_style.css rename to gui/help/en/hf_style.css diff --git a/c_gui/help/en/legal_notices_en.html b/gui/help/en/legal_notices_en.html similarity index 100% rename from c_gui/help/en/legal_notices_en.html rename to gui/help/en/legal_notices_en.html diff --git a/c_gui/images/CASA.bmp b/gui/images/CASA.bmp similarity index 100% rename from c_gui/images/CASA.bmp rename to gui/images/CASA.bmp diff --git a/c_gui/images/CASA_16.png b/gui/images/CASA_16.png similarity index 100% rename from c_gui/images/CASA_16.png rename to gui/images/CASA_16.png diff --git a/c_gui/images/CASA_22.png b/gui/images/CASA_22.png similarity index 100% rename from c_gui/images/CASA_22.png rename to gui/images/CASA_22.png diff --git a/c_gui/images/CASA_32.png b/gui/images/CASA_32.png similarity index 100% rename from c_gui/images/CASA_32.png rename to gui/images/CASA_32.png diff --git a/c_gui/images/CASA_48.png b/gui/images/CASA_48.png similarity index 100% rename from c_gui/images/CASA_48.png rename to gui/images/CASA_48.png diff --git a/c_gui/images/CASAicons.ico b/gui/images/CASAicons.ico similarity index 100% rename from c_gui/images/CASAicons.ico rename to gui/images/CASAicons.ico diff --git a/c_gui/images/CASAiconsLocked.ico b/gui/images/CASAiconsLocked.ico similarity index 100% rename from c_gui/images/CASAiconsLocked.ico rename to gui/images/CASAiconsLocked.ico diff --git a/c_gui/images/casa-logo-left.png b/gui/images/casa-logo-left.png similarity index 100% rename from c_gui/images/casa-logo-left.png rename to gui/images/casa-logo-left.png diff --git a/c_gui/images/casa-logo-right.png b/gui/images/casa-logo-right.png similarity index 100% rename from c_gui/images/casa-logo-right.png rename to gui/images/casa-logo-right.png diff --git a/c_gui/images/casa-logo.png b/gui/images/casa-logo.png similarity index 100% rename from c_gui/images/casa-logo.png rename to gui/images/casa-logo.png diff --git a/c_gui/images/casa.glade b/gui/images/casa.glade similarity index 100% rename from c_gui/images/casa.glade rename to gui/images/casa.glade diff --git a/c_gui/images/casa.gladep b/gui/images/casa.gladep similarity index 100% rename from c_gui/images/casa.gladep rename to gui/images/casa.gladep diff --git a/c_gui/images/firefox-logo.png b/gui/images/firefox-logo.png similarity index 100% rename from c_gui/images/firefox-logo.png rename to gui/images/firefox-logo.png diff --git a/c_gui/images/keyring-logo.png b/gui/images/keyring-logo.png similarity index 100% rename from c_gui/images/keyring-logo.png rename to gui/images/keyring-logo.png diff --git a/c_gui/images/kwallet-logo.png b/gui/images/kwallet-logo.png similarity index 100% rename from c_gui/images/kwallet-logo.png rename to gui/images/kwallet-logo.png diff --git a/c_gui/images/micasa-logo.png b/gui/images/micasa-logo.png similarity index 100% rename from c_gui/images/micasa-logo.png rename to gui/images/micasa-logo.png diff --git a/c_gui/images/mozilla-logo.png b/gui/images/mozilla-logo.png similarity index 100% rename from c_gui/images/mozilla-logo.png rename to gui/images/mozilla-logo.png diff --git a/c_gui/images/novell-logo.png b/gui/images/novell-logo.png similarity index 100% rename from c_gui/images/novell-logo.png rename to gui/images/novell-logo.png diff --git a/c_gui/objs.lux b/gui/objs.lux similarity index 100% rename from c_gui/objs.lux rename to gui/objs.lux diff --git a/c_gui/src.lux b/gui/src.lux similarity index 100% rename from c_gui/src.lux rename to gui/src.lux diff --git a/c_jwrapper/Makefile.am b/jwrapper/Makefile.am similarity index 100% rename from c_jwrapper/Makefile.am rename to jwrapper/Makefile.am diff --git a/c_jwrapper/c_jwrapper.ipr b/jwrapper/c_jwrapper.ipr similarity index 100% rename from c_jwrapper/c_jwrapper.ipr rename to jwrapper/c_jwrapper.ipr diff --git a/c_jwrapper/c_jwrapper.iws b/jwrapper/c_jwrapper.iws similarity index 100% rename from c_jwrapper/c_jwrapper.iws rename to jwrapper/c_jwrapper.iws diff --git a/c_jwrapper/jnsscs/Makefile.am b/jwrapper/jnsscs/Makefile.am similarity index 100% rename from c_jwrapper/jnsscs/Makefile.am rename to jwrapper/jnsscs/Makefile.am diff --git a/c_jwrapper/jnsscs/jmicasa.c b/jwrapper/jnsscs/jmicasa.c similarity index 100% rename from c_jwrapper/jnsscs/jmicasa.c rename to jwrapper/jnsscs/jmicasa.c diff --git a/c_jwrapper/jnsscs/jnsscs.ncb b/jwrapper/jnsscs/jnsscs.ncb similarity index 100% rename from c_jwrapper/jnsscs/jnsscs.ncb rename to jwrapper/jnsscs/jnsscs.ncb diff --git a/c_jwrapper/jnsscs/jnsscs.sln b/jwrapper/jnsscs/jnsscs.sln similarity index 100% rename from c_jwrapper/jnsscs/jnsscs.sln rename to jwrapper/jnsscs/jnsscs.sln diff --git a/c_jwrapper/jnsscs/jnsscs.suo b/jwrapper/jnsscs/jnsscs.suo similarity index 100% rename from c_jwrapper/jnsscs/jnsscs.suo rename to jwrapper/jnsscs/jnsscs.suo diff --git a/c_jwrapper/jnsscs/jnsscs.vcproj b/jwrapper/jnsscs/jnsscs.vcproj similarity index 100% rename from c_jwrapper/jnsscs/jnsscs.vcproj rename to jwrapper/jnsscs/jnsscs.vcproj diff --git a/c_jwrapper/jnsscs/link.w32 b/jwrapper/jnsscs/link.w32 similarity index 100% rename from c_jwrapper/jnsscs/link.w32 rename to jwrapper/jnsscs/link.w32 diff --git a/c_jwrapper/jnsscs/link_mdd.w32 b/jwrapper/jnsscs/link_mdd.w32 similarity index 100% rename from c_jwrapper/jnsscs/link_mdd.w32 rename to jwrapper/jnsscs/link_mdd.w32 diff --git a/c_jwrapper/jnsscs/linux/Makefile.am b/jwrapper/jnsscs/linux/Makefile.am similarity index 100% rename from c_jwrapper/jnsscs/linux/Makefile.am rename to jwrapper/jnsscs/linux/Makefile.am diff --git a/c_jwrapper/jnsscs/linux/jmicasa_lux.exp b/jwrapper/jnsscs/linux/jmicasa_lux.exp similarity index 100% rename from c_jwrapper/jnsscs/linux/jmicasa_lux.exp rename to jwrapper/jnsscs/linux/jmicasa_lux.exp diff --git a/c_jwrapper/jnsscs/linux/link.lux b/jwrapper/jnsscs/linux/link.lux similarity index 100% rename from c_jwrapper/jnsscs/linux/link.lux rename to jwrapper/jnsscs/linux/link.lux diff --git a/c_jwrapper/jnsscs/linux/objs.lux b/jwrapper/jnsscs/linux/objs.lux similarity index 100% rename from c_jwrapper/jnsscs/linux/objs.lux rename to jwrapper/jnsscs/linux/objs.lux diff --git a/c_jwrapper/jnsscs/objs.w32 b/jwrapper/jnsscs/objs.w32 similarity index 100% rename from c_jwrapper/jnsscs/objs.w32 rename to jwrapper/jnsscs/objs.w32 diff --git a/c_jwrapper/jnsscs/windows/Makefile.am b/jwrapper/jnsscs/windows/Makefile.am similarity index 100% rename from c_jwrapper/jnsscs/windows/Makefile.am rename to jwrapper/jnsscs/windows/Makefile.am diff --git a/c_jwrapper/src/Makefile.am b/jwrapper/src/Makefile.am similarity index 100% rename from c_jwrapper/src/Makefile.am rename to jwrapper/src/Makefile.am diff --git a/c_jwrapper/src/com/novell/casa/MiCasa.java b/jwrapper/src/com/novell/casa/MiCasa.java similarity index 100% rename from c_jwrapper/src/com/novell/casa/MiCasa.java rename to jwrapper/src/com/novell/casa/MiCasa.java diff --git a/c_jwrapper/src/com/novell/casa/MiCasaException.java b/jwrapper/src/com/novell/casa/MiCasaException.java similarity index 100% rename from c_jwrapper/src/com/novell/casa/MiCasaException.java rename to jwrapper/src/com/novell/casa/MiCasaException.java diff --git a/c_jwrapper/src/com/novell/casa/MiCasaTest.java b/jwrapper/src/com/novell/casa/MiCasaTest.java similarity index 100% rename from c_jwrapper/src/com/novell/casa/MiCasaTest.java rename to jwrapper/src/com/novell/casa/MiCasaTest.java diff --git a/c_jwrapper/src/com/novell/casa/NetCredential.java b/jwrapper/src/com/novell/casa/NetCredential.java similarity index 100% rename from c_jwrapper/src/com/novell/casa/NetCredential.java rename to jwrapper/src/com/novell/casa/NetCredential.java diff --git a/c_micasacache/Makefile.am b/micasacache/Makefile.am similarity index 100% rename from c_micasacache/Makefile.am rename to micasacache/Makefile.am diff --git a/c_micasacache/c_micasacache.vcproj b/micasacache/c_micasacache.vcproj similarity index 100% rename from c_micasacache/c_micasacache.vcproj rename to micasacache/c_micasacache.vcproj diff --git a/c_micasacache/link.w32 b/micasacache/link.w32 similarity index 100% rename from c_micasacache/link.w32 rename to micasacache/link.w32 diff --git a/c_micasacache/link_mdd.w32 b/micasacache/link_mdd.w32 similarity index 100% rename from c_micasacache/link_mdd.w32 rename to micasacache/link_mdd.w32 diff --git a/c_micasacache/linux/Makefile.am b/micasacache/linux/Makefile.am similarity index 100% rename from c_micasacache/linux/Makefile.am rename to micasacache/linux/Makefile.am diff --git a/c_micasacache/linux/link.lux b/micasacache/linux/link.lux similarity index 100% rename from c_micasacache/linux/link.lux rename to micasacache/linux/link.lux diff --git a/c_micasacache/linux/objs.lux b/micasacache/linux/objs.lux similarity index 100% rename from c_micasacache/linux/objs.lux rename to micasacache/linux/objs.lux diff --git a/c_micasacache/micasacache.def b/micasacache/micasacache.def similarity index 100% rename from c_micasacache/micasacache.def rename to micasacache/micasacache.def diff --git a/c_micasacache/objs.w32 b/micasacache/objs.w32 similarity index 100% rename from c_micasacache/objs.w32 rename to micasacache/objs.w32 diff --git a/c_micasacache/sscs_ipc.c b/micasacache/sscs_ipc.c similarity index 100% rename from c_micasacache/sscs_ipc.c rename to micasacache/sscs_ipc.c diff --git a/c_micasacache/sscs_unx_cache.c b/micasacache/sscs_unx_cache.c similarity index 100% rename from c_micasacache/sscs_unx_cache.c rename to micasacache/sscs_unx_cache.c diff --git a/c_micasacache/sscs_unx_ipc_client.c b/micasacache/sscs_unx_ipc_client.c similarity index 100% rename from c_micasacache/sscs_unx_ipc_client.c rename to micasacache/sscs_unx_ipc_client.c diff --git a/c_micasacache/sscscache.rc b/micasacache/sscscache.rc similarity index 100% rename from c_micasacache/sscscache.rc rename to micasacache/sscscache.rc diff --git a/c_micasacache/windows/Makefile.am b/micasacache/windows/Makefile.am similarity index 100% rename from c_micasacache/windows/Makefile.am rename to micasacache/windows/Makefile.am diff --git a/c_micasad/AssemblyInfo.cs b/micasad/AssemblyInfo.cs similarity index 100% rename from c_micasad/AssemblyInfo.cs rename to micasad/AssemblyInfo.cs diff --git a/c_micasad/Makefile.am b/micasad/Makefile.am similarity index 100% rename from c_micasad/Makefile.am rename to micasad/Makefile.am diff --git a/c_micasad/cache/IKeychain.cs b/micasad/cache/IKeychain.cs similarity index 100% rename from c_micasad/cache/IKeychain.cs rename to micasad/cache/IKeychain.cs diff --git a/c_micasad/cache/ISecret.cs b/micasad/cache/ISecret.cs similarity index 100% rename from c_micasad/cache/ISecret.cs rename to micasad/cache/ISecret.cs diff --git a/c_micasad/cache/KeyChain.cs b/micasad/cache/KeyChain.cs similarity index 100% rename from c_micasad/cache/KeyChain.cs rename to micasad/cache/KeyChain.cs diff --git a/c_micasad/cache/KeyValue.cs b/micasad/cache/KeyValue.cs similarity index 100% rename from c_micasad/cache/KeyValue.cs rename to micasad/cache/KeyValue.cs diff --git a/c_micasad/cache/Secret.cs b/micasad/cache/Secret.cs similarity index 100% rename from c_micasad/cache/Secret.cs rename to micasad/cache/Secret.cs diff --git a/c_micasad/cache/SecretStore.cs b/micasad/cache/SecretStore.cs similarity index 100% rename from c_micasad/cache/SecretStore.cs rename to micasad/cache/SecretStore.cs diff --git a/c_micasad/common/CSSSException.cs b/micasad/common/CSSSException.cs similarity index 100% rename from c_micasad/common/CSSSException.cs rename to micasad/common/CSSSException.cs diff --git a/c_micasad/common/CSSSLogger.cs b/micasad/common/CSSSLogger.cs similarity index 100% rename from c_micasad/common/CSSSLogger.cs rename to micasad/common/CSSSLogger.cs diff --git a/c_micasad/common/Constants.cs b/micasad/common/Constants.cs similarity index 100% rename from c_micasad/common/Constants.cs rename to micasad/common/Constants.cs diff --git a/c_micasad/common/RequestParser.cs b/micasad/common/RequestParser.cs similarity index 100% rename from c_micasad/common/RequestParser.cs rename to micasad/common/RequestParser.cs diff --git a/c_micasad/common/SessionManager.cs b/micasad/common/SessionManager.cs similarity index 100% rename from c_micasad/common/SessionManager.cs rename to micasad/common/SessionManager.cs diff --git a/c_micasad/common/UnixUser.cs b/micasad/common/UnixUser.cs similarity index 100% rename from c_micasad/common/UnixUser.cs rename to micasad/common/UnixUser.cs diff --git a/c_micasad/common/UnixUserIdentifier.cs b/micasad/common/UnixUserIdentifier.cs similarity index 100% rename from c_micasad/common/UnixUserIdentifier.cs rename to micasad/common/UnixUserIdentifier.cs diff --git a/c_micasad/common/User.cs b/micasad/common/User.cs similarity index 100% rename from c_micasad/common/User.cs rename to micasad/common/User.cs diff --git a/c_micasad/common/UserIdentifier.cs b/micasad/common/UserIdentifier.cs similarity index 100% rename from c_micasad/common/UserIdentifier.cs rename to micasad/common/UserIdentifier.cs diff --git a/c_micasad/common/WinUser.cs b/micasad/common/WinUser.cs similarity index 100% rename from c_micasad/common/WinUser.cs rename to micasad/common/WinUser.cs diff --git a/c_micasad/common/WinUserIdentifier.cs b/micasad/common/WinUserIdentifier.cs similarity index 100% rename from c_micasad/common/WinUserIdentifier.cs rename to micasad/common/WinUserIdentifier.cs diff --git a/c_micasad/communication/CommunicationFactory.cs b/micasad/communication/CommunicationFactory.cs similarity index 100% rename from c_micasad/communication/CommunicationFactory.cs rename to micasad/communication/CommunicationFactory.cs diff --git a/c_micasad/communication/ICommunication.cs b/micasad/communication/ICommunication.cs similarity index 100% rename from c_micasad/communication/ICommunication.cs rename to micasad/communication/ICommunication.cs diff --git a/c_micasad/communication/IPCChannel.cs b/micasad/communication/IPCChannel.cs similarity index 100% rename from c_micasad/communication/IPCChannel.cs rename to micasad/communication/IPCChannel.cs diff --git a/c_micasad/communication/UnixCommunication.cs b/micasad/communication/UnixCommunication.cs similarity index 100% rename from c_micasad/communication/UnixCommunication.cs rename to micasad/communication/UnixCommunication.cs diff --git a/c_micasad/communication/UnixIPCChannel.cs b/micasad/communication/UnixIPCChannel.cs similarity index 100% rename from c_micasad/communication/UnixIPCChannel.cs rename to micasad/communication/UnixIPCChannel.cs diff --git a/c_micasad/communication/WinCommunication.cs b/micasad/communication/WinCommunication.cs similarity index 100% rename from c_micasad/communication/WinCommunication.cs rename to micasad/communication/WinCommunication.cs diff --git a/c_micasad/communication/WinIPCChannel.cs b/micasad/communication/WinIPCChannel.cs similarity index 100% rename from c_micasad/communication/WinIPCChannel.cs rename to micasad/communication/WinIPCChannel.cs diff --git a/c_micasad/communication/win/PipeManager.cs b/micasad/communication/win/PipeManager.cs similarity index 100% rename from c_micasad/communication/win/PipeManager.cs rename to micasad/communication/win/PipeManager.cs diff --git a/c_micasad/communication/win/ServerNamedPipe.cs b/micasad/communication/win/ServerNamedPipe.cs similarity index 100% rename from c_micasad/communication/win/ServerNamedPipe.cs rename to micasad/communication/win/ServerNamedPipe.cs diff --git a/c_micasad/init/AppHandler.cs b/micasad/init/AppHandler.cs similarity index 100% rename from c_micasad/init/AppHandler.cs rename to micasad/init/AppHandler.cs diff --git a/c_micasad/init/CredMgr.cs b/micasad/init/CredMgr.cs similarity index 100% rename from c_micasad/init/CredMgr.cs rename to micasad/init/CredMgr.cs diff --git a/c_micasad/init/Main.cs b/micasad/init/Main.cs similarity index 100% rename from c_micasad/init/Main.cs rename to micasad/init/Main.cs diff --git a/c_micasad/init/ProjectInstaller.cs b/micasad/init/ProjectInstaller.cs similarity index 100% rename from c_micasad/init/ProjectInstaller.cs rename to micasad/init/ProjectInstaller.cs diff --git a/c_micasad/init/ProjectInstaller.resx b/micasad/init/ProjectInstaller.resx similarity index 100% rename from c_micasad/init/ProjectInstaller.resx rename to micasad/init/ProjectInstaller.resx diff --git a/c_micasad/init/WinSecretStoreClientService.cs b/micasad/init/WinSecretStoreClientService.cs similarity index 100% rename from c_micasad/init/WinSecretStoreClientService.cs rename to micasad/init/WinSecretStoreClientService.cs diff --git a/c_micasad/init/WinSecretStoreClientService.resx b/micasad/init/WinSecretStoreClientService.resx similarity index 100% rename from c_micasad/init/WinSecretStoreClientService.resx rename to micasad/init/WinSecretStoreClientService.resx diff --git a/c_micasad/lib/AssemblyInfo.cs b/micasad/lib/AssemblyInfo.cs similarity index 100% rename from c_micasad/lib/AssemblyInfo.cs rename to micasad/lib/AssemblyInfo.cs diff --git a/c_micasad/lib/Makefile.am b/micasad/lib/Makefile.am similarity index 100% rename from c_micasad/lib/Makefile.am rename to micasad/lib/Makefile.am diff --git a/c_micasad/lib/Novell.CASA.Common.csproj b/micasad/lib/Novell.CASA.Common.csproj similarity index 100% rename from c_micasad/lib/Novell.CASA.Common.csproj rename to micasad/lib/Novell.CASA.Common.csproj diff --git a/c_micasad/lib/Novell.CASA.Common.csproj.user b/micasad/lib/Novell.CASA.Common.csproj.user similarity index 100% rename from c_micasad/lib/Novell.CASA.Common.csproj.user rename to micasad/lib/Novell.CASA.Common.csproj.user diff --git a/c_micasad/lib/common/LinkedKeyInfo.cs b/micasad/lib/common/LinkedKeyInfo.cs similarity index 100% rename from c_micasad/lib/common/LinkedKeyInfo.cs rename to micasad/lib/common/LinkedKeyInfo.cs diff --git a/c_micasad/lib/common/Makefile.am b/micasad/lib/common/Makefile.am similarity index 100% rename from c_micasad/lib/common/Makefile.am rename to micasad/lib/common/Makefile.am diff --git a/c_micasad/lib/common/MiCASAStore.cs b/micasad/lib/common/MiCASAStore.cs similarity index 100% rename from c_micasad/lib/common/MiCASAStore.cs rename to micasad/lib/common/MiCASAStore.cs diff --git a/c_micasad/lib/common/Ping.cs b/micasad/lib/common/Ping.cs similarity index 100% rename from c_micasad/lib/common/Ping.cs rename to micasad/lib/common/Ping.cs diff --git a/c_micasad/lib/common/ResetMasterPassword.cs b/micasad/lib/common/ResetMasterPassword.cs similarity index 100% rename from c_micasad/lib/common/ResetMasterPassword.cs rename to micasad/lib/common/ResetMasterPassword.cs diff --git a/c_micasad/lib/common/Utils.cs b/micasad/lib/common/Utils.cs similarity index 100% rename from c_micasad/lib/common/Utils.cs rename to micasad/lib/common/Utils.cs diff --git a/c_micasad/lib/common/WrappedObject.cs b/micasad/lib/common/WrappedObject.cs similarity index 100% rename from c_micasad/lib/common/WrappedObject.cs rename to micasad/lib/common/WrappedObject.cs diff --git a/c_micasad/lib/communication/IClientChannel.cs b/micasad/lib/communication/IClientChannel.cs similarity index 100% rename from c_micasad/lib/communication/IClientChannel.cs rename to micasad/lib/communication/IClientChannel.cs diff --git a/c_micasad/lib/communication/IPCClientFactory.cs b/micasad/lib/communication/IPCClientFactory.cs similarity index 100% rename from c_micasad/lib/communication/IPCClientFactory.cs rename to micasad/lib/communication/IPCClientFactory.cs diff --git a/c_micasad/lib/communication/Makefile.am b/micasad/lib/communication/Makefile.am similarity index 100% rename from c_micasad/lib/communication/Makefile.am rename to micasad/lib/communication/Makefile.am diff --git a/c_micasad/lib/communication/MiCasaRequestReply.cs b/micasad/lib/communication/MiCasaRequestReply.cs similarity index 100% rename from c_micasad/lib/communication/MiCasaRequestReply.cs rename to micasad/lib/communication/MiCasaRequestReply.cs diff --git a/c_micasad/lib/communication/UnixIPCClientChannel.cs b/micasad/lib/communication/UnixIPCClientChannel.cs similarity index 100% rename from c_micasad/lib/communication/UnixIPCClientChannel.cs rename to micasad/lib/communication/UnixIPCClientChannel.cs diff --git a/c_micasad/lib/communication/WinIPCClientChannel.cs b/micasad/lib/communication/WinIPCClientChannel.cs similarity index 100% rename from c_micasad/lib/communication/WinIPCClientChannel.cs rename to micasad/lib/communication/WinIPCClientChannel.cs diff --git a/c_micasad/lib/objs.lux b/micasad/lib/objs.lux similarity index 100% rename from c_micasad/lib/objs.lux rename to micasad/lib/objs.lux diff --git a/c_micasad/lib/src.lux b/micasad/lib/src.lux similarity index 100% rename from c_micasad/lib/src.lux rename to micasad/lib/src.lux diff --git a/c_micasad/lss/CASACrypto.cs b/micasad/lss/CASACrypto.cs similarity index 100% rename from c_micasad/lss/CASACrypto.cs rename to micasad/lss/CASACrypto.cs diff --git a/c_micasad/lss/FastRandom.cs b/micasad/lss/FastRandom.cs similarity index 100% rename from c_micasad/lss/FastRandom.cs rename to micasad/lss/FastRandom.cs diff --git a/c_micasad/lss/LocalStorage.cs b/micasad/lss/LocalStorage.cs similarity index 100% rename from c_micasad/lss/LocalStorage.cs rename to micasad/lss/LocalStorage.cs diff --git a/c_micasad/lss/Rfc2898DeriveBytes.cs b/micasad/lss/Rfc2898DeriveBytes.cs similarity index 100% rename from c_micasad/lss/Rfc2898DeriveBytes.cs rename to micasad/lss/Rfc2898DeriveBytes.cs diff --git a/c_micasad/micasad.csproj b/micasad/micasad.csproj similarity index 100% rename from c_micasad/micasad.csproj rename to micasad/micasad.csproj diff --git a/c_micasad/micasad.csproj.user b/micasad/micasad.csproj.user similarity index 100% rename from c_micasad/micasad.csproj.user rename to micasad/micasad.csproj.user diff --git a/c_micasad/objs.lux b/micasad/objs.lux similarity index 100% rename from c_micasad/objs.lux rename to micasad/objs.lux diff --git a/c_micasad/objs.w32 b/micasad/objs.w32 similarity index 100% rename from c_micasad/objs.w32 rename to micasad/objs.w32 diff --git a/c_micasad/src.lux b/micasad/src.lux similarity index 100% rename from c_micasad/src.lux rename to micasad/src.lux diff --git a/c_micasad/src.w32 b/micasad/src.w32 similarity index 100% rename from c_micasad/src.w32 rename to micasad/src.w32 diff --git a/c_micasad/startup/Makefile.am b/micasad/startup/Makefile.am similarity index 100% rename from c_micasad/startup/Makefile.am rename to micasad/startup/Makefile.am diff --git a/c_micasad/startup/casacfgpam b/micasad/startup/casacfgpam similarity index 100% rename from c_micasad/startup/casacfgpam rename to micasad/startup/casacfgpam diff --git a/c_micasad/startup/casaucfgpam b/micasad/startup/casaucfgpam similarity index 100% rename from c_micasad/startup/casaucfgpam rename to micasad/startup/casaucfgpam diff --git a/c_micasad/startup/installcasa b/micasad/startup/installcasa similarity index 100% rename from c_micasad/startup/installcasa rename to micasad/startup/installcasa diff --git a/c_micasad/startup/iscasaconfiged b/micasad/startup/iscasaconfiged similarity index 100% rename from c_micasad/startup/iscasaconfiged rename to micasad/startup/iscasaconfiged diff --git a/c_micasad/startup/micasad b/micasad/startup/micasad similarity index 100% rename from c_micasad/startup/micasad rename to micasad/startup/micasad diff --git a/c_micasad/startup/micasad-init.c b/micasad/startup/micasad-init.c similarity index 100% rename from c_micasad/startup/micasad-init.c rename to micasad/startup/micasad-init.c diff --git a/c_micasad/startup/micasad.sh b/micasad/startup/micasad.sh similarity index 100% rename from c_micasad/startup/micasad.sh rename to micasad/startup/micasad.sh diff --git a/c_micasad/startup/uninstallcasa b/micasad/startup/uninstallcasa similarity index 100% rename from c_micasad/startup/uninstallcasa rename to micasad/startup/uninstallcasa diff --git a/c_micasad/test/ReadMe.txt b/micasad/test/ReadMe.txt similarity index 100% rename from c_micasad/test/ReadMe.txt rename to micasad/test/ReadMe.txt diff --git a/c_micasad/test/cache/TestKeyChain.cs b/micasad/test/cache/TestKeyChain.cs similarity index 100% rename from c_micasad/test/cache/TestKeyChain.cs rename to micasad/test/cache/TestKeyChain.cs diff --git a/c_micasad/test/cache/TestSecret.cs b/micasad/test/cache/TestSecret.cs similarity index 100% rename from c_micasad/test/cache/TestSecret.cs rename to micasad/test/cache/TestSecret.cs diff --git a/c_micasad/test/cache/TestSecretStore.cs b/micasad/test/cache/TestSecretStore.cs similarity index 100% rename from c_micasad/test/cache/TestSecretStore.cs rename to micasad/test/cache/TestSecretStore.cs diff --git a/c_micasad/test/common/TestRequestParser.cs b/micasad/test/common/TestRequestParser.cs similarity index 100% rename from c_micasad/test/common/TestRequestParser.cs rename to micasad/test/common/TestRequestParser.cs diff --git a/c_micasad/test/common/TestSessionManager.cs b/micasad/test/common/TestSessionManager.cs similarity index 100% rename from c_micasad/test/common/TestSessionManager.cs rename to micasad/test/common/TestSessionManager.cs diff --git a/c_micasad/test/communication/TestUnixCommunication.cs b/micasad/test/communication/TestUnixCommunication.cs similarity index 100% rename from c_micasad/test/communication/TestUnixCommunication.cs rename to micasad/test/communication/TestUnixCommunication.cs diff --git a/c_micasad/test/dependencies/nunit-console.exe b/micasad/test/dependencies/nunit-console.exe similarity index 100% rename from c_micasad/test/dependencies/nunit-console.exe rename to micasad/test/dependencies/nunit-console.exe diff --git a/c_micasad/test/dependencies/nunit.core.dll b/micasad/test/dependencies/nunit.core.dll similarity index 100% rename from c_micasad/test/dependencies/nunit.core.dll rename to micasad/test/dependencies/nunit.core.dll diff --git a/c_micasad/test/dependencies/nunit.extensions.dll b/micasad/test/dependencies/nunit.extensions.dll similarity index 100% rename from c_micasad/test/dependencies/nunit.extensions.dll rename to micasad/test/dependencies/nunit.extensions.dll diff --git a/c_micasad/test/dependencies/nunit.framework.dll b/micasad/test/dependencies/nunit.framework.dll similarity index 100% rename from c_micasad/test/dependencies/nunit.framework.dll rename to micasad/test/dependencies/nunit.framework.dll diff --git a/c_micasad/test/dependencies/nunit.mocks.dll b/micasad/test/dependencies/nunit.mocks.dll similarity index 100% rename from c_micasad/test/dependencies/nunit.mocks.dll rename to micasad/test/dependencies/nunit.mocks.dll diff --git a/c_micasad/test/dependencies/nunit.util.dll b/micasad/test/dependencies/nunit.util.dll similarity index 100% rename from c_micasad/test/dependencies/nunit.util.dll rename to micasad/test/dependencies/nunit.util.dll diff --git a/c_micasad/test/verbs/TestAddKeychains.cs b/micasad/test/verbs/TestAddKeychains.cs similarity index 100% rename from c_micasad/test/verbs/TestAddKeychains.cs rename to micasad/test/verbs/TestAddKeychains.cs diff --git a/c_micasad/test/verbs/TestCloseSecretStore.cs b/micasad/test/verbs/TestCloseSecretStore.cs similarity index 100% rename from c_micasad/test/verbs/TestCloseSecretStore.cs rename to micasad/test/verbs/TestCloseSecretStore.cs diff --git a/c_micasad/test/verbs/TestEnumerateKeyChainIDs.cs b/micasad/test/verbs/TestEnumerateKeyChainIDs.cs similarity index 100% rename from c_micasad/test/verbs/TestEnumerateKeyChainIDs.cs rename to micasad/test/verbs/TestEnumerateKeyChainIDs.cs diff --git a/c_micasad/test/verbs/TestEnumerateSecIDs.cs b/micasad/test/verbs/TestEnumerateSecIDs.cs similarity index 100% rename from c_micasad/test/verbs/TestEnumerateSecIDs.cs rename to micasad/test/verbs/TestEnumerateSecIDs.cs diff --git a/c_micasad/test/verbs/TestOpenSecretStore.cs b/micasad/test/verbs/TestOpenSecretStore.cs similarity index 100% rename from c_micasad/test/verbs/TestOpenSecretStore.cs rename to micasad/test/verbs/TestOpenSecretStore.cs diff --git a/c_micasad/test/verbs/TestReadSecret.cs b/micasad/test/verbs/TestReadSecret.cs similarity index 100% rename from c_micasad/test/verbs/TestReadSecret.cs rename to micasad/test/verbs/TestReadSecret.cs diff --git a/c_micasad/test/verbs/TestRemoveKeyChain.cs b/micasad/test/verbs/TestRemoveKeyChain.cs similarity index 100% rename from c_micasad/test/verbs/TestRemoveKeyChain.cs rename to micasad/test/verbs/TestRemoveKeyChain.cs diff --git a/c_micasad/test/verbs/TestWriteSecret.cs b/micasad/test/verbs/TestWriteSecret.cs similarity index 100% rename from c_micasad/test/verbs/TestWriteSecret.cs rename to micasad/test/verbs/TestWriteSecret.cs diff --git a/c_micasad/verbs/AddKeyChain.cs b/micasad/verbs/AddKeyChain.cs similarity index 100% rename from c_micasad/verbs/AddKeyChain.cs rename to micasad/verbs/AddKeyChain.cs diff --git a/c_micasad/verbs/CloseSecretStore.cs b/micasad/verbs/CloseSecretStore.cs similarity index 100% rename from c_micasad/verbs/CloseSecretStore.cs rename to micasad/verbs/CloseSecretStore.cs diff --git a/c_micasad/verbs/EnumerateKeyChainIds.cs b/micasad/verbs/EnumerateKeyChainIds.cs similarity index 100% rename from c_micasad/verbs/EnumerateKeyChainIds.cs rename to micasad/verbs/EnumerateKeyChainIds.cs diff --git a/c_micasad/verbs/EnumerateSecretIds.cs b/micasad/verbs/EnumerateSecretIds.cs similarity index 100% rename from c_micasad/verbs/EnumerateSecretIds.cs rename to micasad/verbs/EnumerateSecretIds.cs diff --git a/c_micasad/verbs/GetSecretStoreInfo.cs b/micasad/verbs/GetSecretStoreInfo.cs similarity index 100% rename from c_micasad/verbs/GetSecretStoreInfo.cs rename to micasad/verbs/GetSecretStoreInfo.cs diff --git a/c_micasad/verbs/ISSVerb.cs b/micasad/verbs/ISSVerb.cs similarity index 100% rename from c_micasad/verbs/ISSVerb.cs rename to micasad/verbs/ISSVerb.cs diff --git a/c_micasad/verbs/IsSecretPersistent.cs b/micasad/verbs/IsSecretPersistent.cs similarity index 100% rename from c_micasad/verbs/IsSecretPersistent.cs rename to micasad/verbs/IsSecretPersistent.cs diff --git a/c_micasad/verbs/ObjectSerialization.cs b/micasad/verbs/ObjectSerialization.cs similarity index 100% rename from c_micasad/verbs/ObjectSerialization.cs rename to micasad/verbs/ObjectSerialization.cs diff --git a/c_micasad/verbs/OpenSecretStore.cs b/micasad/verbs/OpenSecretStore.cs similarity index 100% rename from c_micasad/verbs/OpenSecretStore.cs rename to micasad/verbs/OpenSecretStore.cs diff --git a/c_micasad/verbs/ReadBinaryKey.cs b/micasad/verbs/ReadBinaryKey.cs similarity index 100% rename from c_micasad/verbs/ReadBinaryKey.cs rename to micasad/verbs/ReadBinaryKey.cs diff --git a/c_micasad/verbs/ReadKey.cs b/micasad/verbs/ReadKey.cs similarity index 100% rename from c_micasad/verbs/ReadKey.cs rename to micasad/verbs/ReadKey.cs diff --git a/c_micasad/verbs/ReadSecret.cs b/micasad/verbs/ReadSecret.cs similarity index 100% rename from c_micasad/verbs/ReadSecret.cs rename to micasad/verbs/ReadSecret.cs diff --git a/c_micasad/verbs/RemoveKeyChain.cs b/micasad/verbs/RemoveKeyChain.cs similarity index 100% rename from c_micasad/verbs/RemoveKeyChain.cs rename to micasad/verbs/RemoveKeyChain.cs diff --git a/c_micasad/verbs/RemoveSecret.cs b/micasad/verbs/RemoveSecret.cs similarity index 100% rename from c_micasad/verbs/RemoveSecret.cs rename to micasad/verbs/RemoveSecret.cs diff --git a/c_micasad/verbs/RemoveSecretStore.cs b/micasad/verbs/RemoveSecretStore.cs similarity index 100% rename from c_micasad/verbs/RemoveSecretStore.cs rename to micasad/verbs/RemoveSecretStore.cs diff --git a/c_micasad/verbs/SetMasterPasscode.cs b/micasad/verbs/SetMasterPasscode.cs similarity index 100% rename from c_micasad/verbs/SetMasterPasscode.cs rename to micasad/verbs/SetMasterPasscode.cs diff --git a/c_micasad/verbs/SetMasterPassword.cs b/micasad/verbs/SetMasterPassword.cs similarity index 100% rename from c_micasad/verbs/SetMasterPassword.cs rename to micasad/verbs/SetMasterPassword.cs diff --git a/c_micasad/verbs/WriteBinaryKey.cs b/micasad/verbs/WriteBinaryKey.cs similarity index 100% rename from c_micasad/verbs/WriteBinaryKey.cs rename to micasad/verbs/WriteBinaryKey.cs diff --git a/c_micasad/verbs/WriteKey.cs b/micasad/verbs/WriteKey.cs similarity index 100% rename from c_micasad/verbs/WriteKey.cs rename to micasad/verbs/WriteKey.cs diff --git a/c_micasad/verbs/WriteSecret.cs b/micasad/verbs/WriteSecret.cs similarity index 100% rename from c_micasad/verbs/WriteSecret.cs rename to micasad/verbs/WriteSecret.cs diff --git a/c_micasadk/Makefile.am b/micasadk/Makefile.am similarity index 100% rename from c_micasadk/Makefile.am rename to micasadk/Makefile.am diff --git a/c_micasadk/c_micasadk.vcproj b/micasadk/c_micasadk.vcproj similarity index 100% rename from c_micasadk/c_micasadk.vcproj rename to micasadk/c_micasadk.vcproj diff --git a/c_micasadk/link.w32 b/micasadk/link.w32 similarity index 100% rename from c_micasadk/link.w32 rename to micasadk/link.w32 diff --git a/c_micasadk/link_mdd.w32 b/micasadk/link_mdd.w32 similarity index 100% rename from c_micasadk/link_mdd.w32 rename to micasadk/link_mdd.w32 diff --git a/c_micasadk/linux/Makefile.am b/micasadk/linux/Makefile.am similarity index 100% rename from c_micasadk/linux/Makefile.am rename to micasadk/linux/Makefile.am diff --git a/c_micasadk/linux/link.lux b/micasadk/linux/link.lux similarity index 100% rename from c_micasadk/linux/link.lux rename to micasadk/linux/link.lux diff --git a/c_micasadk/linux/micasa_lux.exp b/micasadk/linux/micasa_lux.exp similarity index 100% rename from c_micasadk/linux/micasa_lux.exp rename to micasadk/linux/micasa_lux.exp diff --git a/c_micasadk/linux/objs.lux b/micasadk/linux/objs.lux similarity index 100% rename from c_micasadk/linux/objs.lux rename to micasadk/linux/objs.lux diff --git a/c_micasadk/micasa.def b/micasadk/micasa.def similarity index 100% rename from c_micasadk/micasa.def rename to micasadk/micasa.def diff --git a/c_micasadk/objs.w32 b/micasadk/objs.w32 similarity index 100% rename from c_micasadk/objs.w32 rename to micasadk/objs.w32 diff --git a/c_micasadk/sscs_ndk.c b/micasadk/sscs_ndk.c similarity index 100% rename from c_micasadk/sscs_ndk.c rename to micasadk/sscs_ndk.c diff --git a/c_micasadk/sscs_win_calls.c b/micasadk/sscs_win_calls.c similarity index 100% rename from c_micasadk/sscs_win_calls.c rename to micasadk/sscs_win_calls.c diff --git a/c_micasadk/sscsndk.rc b/micasadk/sscsndk.rc similarity index 100% rename from c_micasadk/sscsndk.rc rename to micasadk/sscsndk.rc diff --git a/c_micasadk/windows/Makefile.am b/micasadk/windows/Makefile.am similarity index 100% rename from c_micasadk/windows/Makefile.am rename to micasadk/windows/Makefile.am diff --git a/c_policy/AggregationPol.cs b/policy/AggregationPol.cs similarity index 100% rename from c_policy/AggregationPol.cs rename to policy/AggregationPol.cs diff --git a/c_policy/AssemblyInfo.cs b/policy/AssemblyInfo.cs similarity index 100% rename from c_policy/AssemblyInfo.cs rename to policy/AssemblyInfo.cs diff --git a/c_policy/Makefile.am b/policy/Makefile.am similarity index 100% rename from c_policy/Makefile.am rename to policy/Makefile.am diff --git a/c_policy/Novell.CASA.CASAPolicy.csproj b/policy/Novell.CASA.CASAPolicy.csproj similarity index 100% rename from c_policy/Novell.CASA.CASAPolicy.csproj rename to policy/Novell.CASA.CASAPolicy.csproj diff --git a/c_policy/Novell.CASA.CASAPolicy.csproj.user b/policy/Novell.CASA.CASAPolicy.csproj.user similarity index 100% rename from c_policy/Novell.CASA.CASAPolicy.csproj.user rename to policy/Novell.CASA.CASAPolicy.csproj.user diff --git a/c_policy/PersistencePol.cs b/policy/PersistencePol.cs similarity index 100% rename from c_policy/PersistencePol.cs rename to policy/PersistencePol.cs diff --git a/c_policy/Policy.cs b/policy/Policy.cs similarity index 100% rename from c_policy/Policy.cs rename to policy/Policy.cs diff --git a/c_policy/PolicyConstants.cs b/policy/PolicyConstants.cs similarity index 100% rename from c_policy/PolicyConstants.cs rename to policy/PolicyConstants.cs diff --git a/c_policy/PolicyImpl.cs b/policy/PolicyImpl.cs similarity index 100% rename from c_policy/PolicyImpl.cs rename to policy/PolicyImpl.cs diff --git a/c_policy/SynchPol.cs b/policy/SynchPol.cs similarity index 100% rename from c_policy/SynchPol.cs rename to policy/SynchPol.cs diff --git a/c_policy/Test.cs b/policy/Test.cs similarity index 100% rename from c_policy/Test.cs rename to policy/Test.cs diff --git a/c_policy/UIPol.cs b/policy/UIPol.cs similarity index 100% rename from c_policy/UIPol.cs rename to policy/UIPol.cs diff --git a/c_policy/objs.lux b/policy/objs.lux similarity index 100% rename from c_policy/objs.lux rename to policy/objs.lux diff --git a/c_policy/objs.w32 b/policy/objs.w32 similarity index 100% rename from c_policy/objs.w32 rename to policy/objs.w32 diff --git a/c_policy/src.lux b/policy/src.lux similarity index 100% rename from c_policy/src.lux rename to policy/src.lux diff --git a/c_policy/src.w32 b/policy/src.w32 similarity index 100% rename from c_policy/src.w32 rename to policy/src.w32 diff --git a/c_sharp/Makefile.am b/sharp/Makefile.am similarity index 100% rename from c_sharp/Makefile.am rename to sharp/Makefile.am diff --git a/c_sharp/NSSCSWrapper/AssemblyInfo.cs b/sharp/NSSCSWrapper/AssemblyInfo.cs similarity index 100% rename from c_sharp/NSSCSWrapper/AssemblyInfo.cs rename to sharp/NSSCSWrapper/AssemblyInfo.cs diff --git a/c_sharp/NSSCSWrapper/BasicCredential.cs b/sharp/NSSCSWrapper/BasicCredential.cs similarity index 100% rename from c_sharp/NSSCSWrapper/BasicCredential.cs rename to sharp/NSSCSWrapper/BasicCredential.cs diff --git a/c_sharp/NSSCSWrapper/Makefile.am b/sharp/NSSCSWrapper/Makefile.am similarity index 100% rename from c_sharp/NSSCSWrapper/Makefile.am rename to sharp/NSSCSWrapper/Makefile.am diff --git a/c_sharp/NSSCSWrapper/NativeCalls.cs b/sharp/NSSCSWrapper/NativeCalls.cs similarity index 100% rename from c_sharp/NSSCSWrapper/NativeCalls.cs rename to sharp/NSSCSWrapper/NativeCalls.cs diff --git a/c_sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj b/sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj similarity index 100% rename from c_sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj rename to sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj diff --git a/c_sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj.user b/sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj.user similarity index 100% rename from c_sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj.user rename to sharp/NSSCSWrapper/Novell.CASA.miCASAWrapper.csproj.user diff --git a/c_sharp/NSSCSWrapper/Novell.SecretStoreClient.sln b/sharp/NSSCSWrapper/Novell.SecretStoreClient.sln similarity index 100% rename from c_sharp/NSSCSWrapper/Novell.SecretStoreClient.sln rename to sharp/NSSCSWrapper/Novell.SecretStoreClient.sln diff --git a/c_sharp/NSSCSWrapper/Novell.SecretStoreClient.suo b/sharp/NSSCSWrapper/Novell.SecretStoreClient.suo similarity index 100% rename from c_sharp/NSSCSWrapper/Novell.SecretStoreClient.suo rename to sharp/NSSCSWrapper/Novell.SecretStoreClient.suo diff --git a/c_sharp/NSSCSWrapper/RemoteClient.cs b/sharp/NSSCSWrapper/RemoteClient.cs similarity index 100% rename from c_sharp/NSSCSWrapper/RemoteClient.cs rename to sharp/NSSCSWrapper/RemoteClient.cs diff --git a/c_sharp/NSSCSWrapper/RemoteServer.cs b/sharp/NSSCSWrapper/RemoteServer.cs similarity index 100% rename from c_sharp/NSSCSWrapper/RemoteServer.cs rename to sharp/NSSCSWrapper/RemoteServer.cs diff --git a/c_sharp/NSSCSWrapper/Secret.cs b/sharp/NSSCSWrapper/Secret.cs similarity index 100% rename from c_sharp/NSSCSWrapper/Secret.cs rename to sharp/NSSCSWrapper/Secret.cs diff --git a/c_sharp/NSSCSWrapper/SecretStore.cs b/sharp/NSSCSWrapper/SecretStore.cs similarity index 100% rename from c_sharp/NSSCSWrapper/SecretStore.cs rename to sharp/NSSCSWrapper/SecretStore.cs diff --git a/c_sharp/NSSCSWrapper/miCASA.cs b/sharp/NSSCSWrapper/miCASA.cs similarity index 100% rename from c_sharp/NSSCSWrapper/miCASA.cs rename to sharp/NSSCSWrapper/miCASA.cs diff --git a/c_sharp/NSSCSWrapper/miCasaException.cs b/sharp/NSSCSWrapper/miCasaException.cs similarity index 100% rename from c_sharp/NSSCSWrapper/miCasaException.cs rename to sharp/NSSCSWrapper/miCasaException.cs diff --git a/c_sharp/NSSCSWrapper/objs.lux b/sharp/NSSCSWrapper/objs.lux similarity index 100% rename from c_sharp/NSSCSWrapper/objs.lux rename to sharp/NSSCSWrapper/objs.lux diff --git a/c_sharp/NSSCSWrapper/objs.w32 b/sharp/NSSCSWrapper/objs.w32 similarity index 100% rename from c_sharp/NSSCSWrapper/objs.w32 rename to sharp/NSSCSWrapper/objs.w32 diff --git a/c_sharp/NSSCSWrapper/src.lux b/sharp/NSSCSWrapper/src.lux similarity index 100% rename from c_sharp/NSSCSWrapper/src.lux rename to sharp/NSSCSWrapper/src.lux diff --git a/c_sharp/NSSCSWrapper/src.w32 b/sharp/NSSCSWrapper/src.w32 similarity index 100% rename from c_sharp/NSSCSWrapper/src.w32 rename to sharp/NSSCSWrapper/src.w32 diff --git a/c_test/c_sample/CSample.ncb b/test/c_sample/CSample.ncb similarity index 100% rename from c_test/c_sample/CSample.ncb rename to test/c_sample/CSample.ncb diff --git a/c_test/c_sample/CSample.sln b/test/c_sample/CSample.sln similarity index 100% rename from c_test/c_sample/CSample.sln rename to test/c_sample/CSample.sln diff --git a/c_test/c_sample/CSample.suo b/test/c_sample/CSample.suo similarity index 100% rename from c_test/c_sample/CSample.suo rename to test/c_sample/CSample.suo diff --git a/c_test/c_sample/CSample.vcproj b/test/c_sample/CSample.vcproj similarity index 100% rename from c_test/c_sample/CSample.vcproj rename to test/c_sample/CSample.vcproj diff --git a/c_test/c_sample/cSample.c b/test/c_sample/cSample.c similarity index 100% rename from c_test/c_sample/cSample.c rename to test/c_sample/cSample.c diff --git a/c_test/c_sample/link.w32 b/test/c_sample/link.w32 similarity index 100% rename from c_test/c_sample/link.w32 rename to test/c_sample/link.w32 diff --git a/c_test/c_sample/link_mdd.w32 b/test/c_sample/link_mdd.w32 similarity index 100% rename from c_test/c_sample/link_mdd.w32 rename to test/c_sample/link_mdd.w32 diff --git a/c_test/c_sample/objs.lux b/test/c_sample/objs.lux similarity index 100% rename from c_test/c_sample/objs.lux rename to test/c_sample/objs.lux diff --git a/c_test/c_sample/objs.w32 b/test/c_sample/objs.w32 similarity index 100% rename from c_test/c_sample/objs.w32 rename to test/c_sample/objs.w32 diff --git a/c_test/c_sample/target b/test/c_sample/target similarity index 100% rename from c_test/c_sample/target rename to test/c_sample/target diff --git a/c_test/c_sharp_sample/App.ico b/test/c_sharp_sample/App.ico similarity index 100% rename from c_test/c_sharp_sample/App.ico rename to test/c_sharp_sample/App.ico diff --git a/c_test/c_sharp_sample/AssemblyInfo.cs b/test/c_sharp_sample/AssemblyInfo.cs similarity index 100% rename from c_test/c_sharp_sample/AssemblyInfo.cs rename to test/c_sharp_sample/AssemblyInfo.cs diff --git a/c_test/c_sharp_sample/cSharpSample.cs b/test/c_sharp_sample/cSharpSample.cs similarity index 100% rename from c_test/c_sharp_sample/cSharpSample.cs rename to test/c_sharp_sample/cSharpSample.cs diff --git a/c_test/c_sharp_sample/cSharpSample.csproj b/test/c_sharp_sample/cSharpSample.csproj similarity index 100% rename from c_test/c_sharp_sample/cSharpSample.csproj rename to test/c_sharp_sample/cSharpSample.csproj diff --git a/c_test/c_sharp_sample/cSharpSample.csproj.user b/test/c_sharp_sample/cSharpSample.csproj.user similarity index 100% rename from c_test/c_sharp_sample/cSharpSample.csproj.user rename to test/c_sharp_sample/cSharpSample.csproj.user diff --git a/c_test/c_sharp_sample/cSharpSample.sln b/test/c_sharp_sample/cSharpSample.sln similarity index 100% rename from c_test/c_sharp_sample/cSharpSample.sln rename to test/c_sharp_sample/cSharpSample.sln diff --git a/c_test/c_sharp_sample/cSharpSample.suo b/test/c_sharp_sample/cSharpSample.suo similarity index 100% rename from c_test/c_sharp_sample/cSharpSample.suo rename to test/c_sharp_sample/cSharpSample.suo diff --git a/c_test/c_sharp_sample/objs.lux b/test/c_sharp_sample/objs.lux similarity index 100% rename from c_test/c_sharp_sample/objs.lux rename to test/c_sharp_sample/objs.lux diff --git a/c_test/c_sharp_sample/objs.w32 b/test/c_sharp_sample/objs.w32 similarity index 100% rename from c_test/c_sharp_sample/objs.w32 rename to test/c_sharp_sample/objs.w32 diff --git a/c_test/c_sharp_sample/src.lux b/test/c_sharp_sample/src.lux similarity index 100% rename from c_test/c_sharp_sample/src.lux rename to test/c_sharp_sample/src.lux diff --git a/c_test/c_sharp_sample/src.w32 b/test/c_sharp_sample/src.w32 similarity index 100% rename from c_test/c_sharp_sample/src.w32 rename to test/c_sharp_sample/src.w32 diff --git a/c_test/dev_test/enumerate.c b/test/dev_test/enumerate.c similarity index 100% rename from c_test/dev_test/enumerate.c rename to test/dev_test/enumerate.c diff --git a/c_test/dev_test/makefile b/test/dev_test/makefile similarity index 100% rename from c_test/dev_test/makefile rename to test/dev_test/makefile diff --git a/c_test/dev_test/sample.c b/test/dev_test/sample.c similarity index 100% rename from c_test/dev_test/sample.c rename to test/dev_test/sample.c diff --git a/c_test/displayCache/DisplayMiCasa.ncb b/test/displayCache/DisplayMiCasa.ncb similarity index 100% rename from c_test/displayCache/DisplayMiCasa.ncb rename to test/displayCache/DisplayMiCasa.ncb diff --git a/c_test/displayCache/DisplayMiCasa.sln b/test/displayCache/DisplayMiCasa.sln similarity index 100% rename from c_test/displayCache/DisplayMiCasa.sln rename to test/displayCache/DisplayMiCasa.sln diff --git a/c_test/displayCache/DisplayMiCasa.suo b/test/displayCache/DisplayMiCasa.suo similarity index 100% rename from c_test/displayCache/DisplayMiCasa.suo rename to test/displayCache/DisplayMiCasa.suo diff --git a/c_test/displayCache/displaycache.c b/test/displayCache/displaycache.c similarity index 100% rename from c_test/displayCache/displaycache.c rename to test/displayCache/displaycache.c diff --git a/c_test/displayCache/displaycache.vcproj b/test/displayCache/displaycache.vcproj similarity index 100% rename from c_test/displayCache/displaycache.vcproj rename to test/displayCache/displaycache.vcproj diff --git a/c_test/displayCache/link.w32 b/test/displayCache/link.w32 similarity index 100% rename from c_test/displayCache/link.w32 rename to test/displayCache/link.w32 diff --git a/c_test/displayCache/link_mdd.w32 b/test/displayCache/link_mdd.w32 similarity index 100% rename from c_test/displayCache/link_mdd.w32 rename to test/displayCache/link_mdd.w32 diff --git a/c_test/displayCache/objs.lux b/test/displayCache/objs.lux similarity index 100% rename from c_test/displayCache/objs.lux rename to test/displayCache/objs.lux diff --git a/c_test/displayCache/objs.w32 b/test/displayCache/objs.w32 similarity index 100% rename from c_test/displayCache/objs.w32 rename to test/displayCache/objs.w32 diff --git a/c_test/displayCache/resource.h b/test/displayCache/resource.h similarity index 100% rename from c_test/displayCache/resource.h rename to test/displayCache/resource.h diff --git a/c_test/displayCache/sshtst.vcproj b/test/displayCache/sshtst.vcproj similarity index 100% rename from c_test/displayCache/sshtst.vcproj rename to test/displayCache/sshtst.vcproj diff --git a/c_test/displayCache/target b/test/displayCache/target similarity index 100% rename from c_test/displayCache/target rename to test/displayCache/target diff --git a/c_test/java_sample/java_sample.ipr b/test/java_sample/java_sample.ipr similarity index 100% rename from c_test/java_sample/java_sample.ipr rename to test/java_sample/java_sample.ipr diff --git a/c_test/java_sample/java_sample.iws b/test/java_sample/java_sample.iws similarity index 100% rename from c_test/java_sample/java_sample.iws rename to test/java_sample/java_sample.iws diff --git a/c_test/java_sample/src/JavaSample.java b/test/java_sample/src/JavaSample.java similarity index 100% rename from c_test/java_sample/src/JavaSample.java rename to test/java_sample/src/JavaSample.java diff --git a/c_test/sdk_sshtst/link.w32 b/test/sdk_sshtst/link.w32 similarity index 100% rename from c_test/sdk_sshtst/link.w32 rename to test/sdk_sshtst/link.w32 diff --git a/c_test/sdk_sshtst/link_mdd.w32 b/test/sdk_sshtst/link_mdd.w32 similarity index 100% rename from c_test/sdk_sshtst/link_mdd.w32 rename to test/sdk_sshtst/link_mdd.w32 diff --git a/c_test/sdk_sshtst/objs.lux b/test/sdk_sshtst/objs.lux similarity index 100% rename from c_test/sdk_sshtst/objs.lux rename to test/sdk_sshtst/objs.lux diff --git a/c_test/sdk_sshtst/objs.w32 b/test/sdk_sshtst/objs.w32 similarity index 100% rename from c_test/sdk_sshtst/objs.w32 rename to test/sdk_sshtst/objs.w32 diff --git a/c_test/sdk_sshtst/resource.h b/test/sdk_sshtst/resource.h similarity index 100% rename from c_test/sdk_sshtst/resource.h rename to test/sdk_sshtst/resource.h diff --git a/c_test/sdk_sshtst/sshtst.c b/test/sdk_sshtst/sshtst.c similarity index 100% rename from c_test/sdk_sshtst/sshtst.c rename to test/sdk_sshtst/sshtst.c diff --git a/c_test/sdk_sshtst/sshtst.dsp b/test/sdk_sshtst/sshtst.dsp similarity index 100% rename from c_test/sdk_sshtst/sshtst.dsp rename to test/sdk_sshtst/sshtst.dsp diff --git a/c_test/sdk_sshtst/sshtst.dsw b/test/sdk_sshtst/sshtst.dsw similarity index 100% rename from c_test/sdk_sshtst/sshtst.dsw rename to test/sdk_sshtst/sshtst.dsw diff --git a/c_test/sdk_sshtst/sshtst.ncb b/test/sdk_sshtst/sshtst.ncb similarity index 100% rename from c_test/sdk_sshtst/sshtst.ncb rename to test/sdk_sshtst/sshtst.ncb diff --git a/c_test/sdk_sshtst/sshtst.rc b/test/sdk_sshtst/sshtst.rc similarity index 100% rename from c_test/sdk_sshtst/sshtst.rc rename to test/sdk_sshtst/sshtst.rc diff --git a/c_test/sdk_sshtst/sshtst.sln b/test/sdk_sshtst/sshtst.sln similarity index 100% rename from c_test/sdk_sshtst/sshtst.sln rename to test/sdk_sshtst/sshtst.sln diff --git a/c_test/sdk_sshtst/sshtst.suo b/test/sdk_sshtst/sshtst.suo similarity index 100% rename from c_test/sdk_sshtst/sshtst.suo rename to test/sdk_sshtst/sshtst.suo diff --git a/c_test/sdk_sshtst/sshtst.vcproj b/test/sdk_sshtst/sshtst.vcproj similarity index 100% rename from c_test/sdk_sshtst/sshtst.vcproj rename to test/sdk_sshtst/sshtst.vcproj diff --git a/c_test/sdk_sshtst/target b/test/sdk_sshtst/target similarity index 100% rename from c_test/sdk_sshtst/target rename to test/sdk_sshtst/target diff --git a/c_test/unx_cachetst/link.lux b/test/unx_cachetst/link.lux similarity index 100% rename from c_test/unx_cachetst/link.lux rename to test/unx_cachetst/link.lux diff --git a/c_test/unx_cachetst/objs.lux b/test/unx_cachetst/objs.lux similarity index 100% rename from c_test/unx_cachetst/objs.lux rename to test/unx_cachetst/objs.lux diff --git a/c_test/unx_cachetst/sscs_unxcachetst.c b/test/unx_cachetst/sscs_unxcachetst.c similarity index 100% rename from c_test/unx_cachetst/sscs_unxcachetst.c rename to test/unx_cachetst/sscs_unxcachetst.c diff --git a/c_test/unx_cachetst/target b/test/unx_cachetst/target similarity index 100% rename from c_test/unx_cachetst/target rename to test/unx_cachetst/target diff --git a/c_test/unx_testcases/cache_keychain_fns.c b/test/unx_testcases/cache_keychain_fns.c similarity index 100% rename from c_test/unx_testcases/cache_keychain_fns.c rename to test/unx_testcases/cache_keychain_fns.c diff --git a/c_test/unx_testcases/cache_secret_fns.c b/test/unx_testcases/cache_secret_fns.c similarity index 100% rename from c_test/unx_testcases/cache_secret_fns.c rename to test/unx_testcases/cache_secret_fns.c diff --git a/c_test/unx_testcases/cache_ss_fns.c b/test/unx_testcases/cache_ss_fns.c similarity index 100% rename from c_test/unx_testcases/cache_ss_fns.c rename to test/unx_testcases/cache_ss_fns.c diff --git a/c_test/unx_testcases/link.lux b/test/unx_testcases/link.lux similarity index 100% rename from c_test/unx_testcases/link.lux rename to test/unx_testcases/link.lux diff --git a/c_test/unx_testcases/objs.lux b/test/unx_testcases/objs.lux similarity index 100% rename from c_test/unx_testcases/objs.lux rename to test/unx_testcases/objs.lux diff --git a/c_test/unx_testcases/target b/test/unx_testcases/target similarity index 100% rename from c_test/unx_testcases/target rename to test/unx_testcases/target diff --git a/c_test/unx_testcases/testcases.c b/test/unx_testcases/testcases.c similarity index 100% rename from c_test/unx_testcases/testcases.c rename to test/unx_testcases/testcases.c diff --git a/c_test/unx_testcases/testcases.h b/test/unx_testcases/testcases.h similarity index 100% rename from c_test/unx_testcases/testcases.h rename to test/unx_testcases/testcases.h diff --git a/casa-yast/CASA.po b/yast2-CASA/CASA.po similarity index 100% rename from casa-yast/CASA.po rename to yast2-CASA/CASA.po diff --git a/casa-yast/CASA.pot b/yast2-CASA/CASA.pot similarity index 100% rename from casa-yast/CASA.pot rename to yast2-CASA/CASA.pot diff --git a/casa-yast/MAINTAINER b/yast2-CASA/MAINTAINER similarity index 100% rename from casa-yast/MAINTAINER rename to yast2-CASA/MAINTAINER diff --git a/casa-yast/Makefile.am b/yast2-CASA/Makefile.am similarity index 100% rename from casa-yast/Makefile.am rename to yast2-CASA/Makefile.am diff --git a/casa-yast/Makefile.am.common b/yast2-CASA/Makefile.am.common similarity index 100% rename from casa-yast/Makefile.am.common rename to yast2-CASA/Makefile.am.common diff --git a/casa-yast/Makefile.in b/yast2-CASA/Makefile.in similarity index 100% rename from casa-yast/Makefile.in rename to yast2-CASA/Makefile.in diff --git a/casa-yast/Makefile.svn b/yast2-CASA/Makefile.svn similarity index 100% rename from casa-yast/Makefile.svn rename to yast2-CASA/Makefile.svn diff --git a/casa-yast/RPMNAME b/yast2-CASA/RPMNAME similarity index 100% rename from casa-yast/RPMNAME rename to yast2-CASA/RPMNAME diff --git a/casa-yast/SUBDIRS b/yast2-CASA/SUBDIRS similarity index 100% rename from casa-yast/SUBDIRS rename to yast2-CASA/SUBDIRS diff --git a/casa-yast/VERSION b/yast2-CASA/VERSION similarity index 100% rename from casa-yast/VERSION rename to yast2-CASA/VERSION diff --git a/casa-yast/aclocal.m4 b/yast2-CASA/aclocal.m4 similarity index 100% rename from casa-yast/aclocal.m4 rename to yast2-CASA/aclocal.m4 diff --git a/casa-yast/agents/Makefile b/yast2-CASA/agents/Makefile similarity index 100% rename from casa-yast/agents/Makefile rename to yast2-CASA/agents/Makefile diff --git a/casa-yast/agents/Makefile.am b/yast2-CASA/agents/Makefile.am similarity index 100% rename from casa-yast/agents/Makefile.am rename to yast2-CASA/agents/Makefile.am diff --git a/casa-yast/agents/Makefile.in b/yast2-CASA/agents/Makefile.in similarity index 100% rename from casa-yast/agents/Makefile.in rename to yast2-CASA/agents/Makefile.in diff --git a/casa-yast/autodocs-cc-base.ami b/yast2-CASA/autodocs-cc-base.ami similarity index 100% rename from casa-yast/autodocs-cc-base.ami rename to yast2-CASA/autodocs-cc-base.ami diff --git a/casa-yast/autodocs-cc-off.ami b/yast2-CASA/autodocs-cc-off.ami similarity index 100% rename from casa-yast/autodocs-cc-off.ami rename to yast2-CASA/autodocs-cc-off.ami diff --git a/casa-yast/autodocs-cc.ami b/yast2-CASA/autodocs-cc.ami similarity index 100% rename from casa-yast/autodocs-cc.ami rename to yast2-CASA/autodocs-cc.ami diff --git a/casa-yast/autodocs-ycp.ami b/yast2-CASA/autodocs-ycp.ami similarity index 100% rename from casa-yast/autodocs-ycp.ami rename to yast2-CASA/autodocs-ycp.ami diff --git a/casa-yast/autom4te.cache/output.0 b/yast2-CASA/autom4te.cache/output.0 similarity index 100% rename from casa-yast/autom4te.cache/output.0 rename to yast2-CASA/autom4te.cache/output.0 diff --git a/casa-yast/autom4te.cache/output.1 b/yast2-CASA/autom4te.cache/output.1 similarity index 100% rename from casa-yast/autom4te.cache/output.1 rename to yast2-CASA/autom4te.cache/output.1 diff --git a/casa-yast/autom4te.cache/requests b/yast2-CASA/autom4te.cache/requests similarity index 100% rename from casa-yast/autom4te.cache/requests rename to yast2-CASA/autom4te.cache/requests diff --git a/casa-yast/autom4te.cache/traces.0 b/yast2-CASA/autom4te.cache/traces.0 similarity index 100% rename from casa-yast/autom4te.cache/traces.0 rename to yast2-CASA/autom4te.cache/traces.0 diff --git a/casa-yast/autom4te.cache/traces.1 b/yast2-CASA/autom4te.cache/traces.1 similarity index 100% rename from casa-yast/autom4te.cache/traces.1 rename to yast2-CASA/autom4te.cache/traces.1 diff --git a/casa-yast/config.guess b/yast2-CASA/config.guess similarity index 100% rename from casa-yast/config.guess rename to yast2-CASA/config.guess diff --git a/casa-yast/config.log b/yast2-CASA/config.log similarity index 100% rename from casa-yast/config.log rename to yast2-CASA/config.log diff --git a/casa-yast/config.status b/yast2-CASA/config.status similarity index 100% rename from casa-yast/config.status rename to yast2-CASA/config.status diff --git a/casa-yast/config.sub b/yast2-CASA/config.sub similarity index 100% rename from casa-yast/config.sub rename to yast2-CASA/config.sub diff --git a/casa-yast/configure b/yast2-CASA/configure similarity index 100% rename from casa-yast/configure rename to yast2-CASA/configure diff --git a/casa-yast/configure.in b/yast2-CASA/configure.in similarity index 100% rename from casa-yast/configure.in rename to yast2-CASA/configure.in diff --git a/casa-yast/configure.in.in b/yast2-CASA/configure.in.in similarity index 100% rename from casa-yast/configure.in.in rename to yast2-CASA/configure.in.in diff --git a/casa-yast/install-sh b/yast2-CASA/install-sh similarity index 100% rename from casa-yast/install-sh rename to yast2-CASA/install-sh diff --git a/casa-yast/make_casa_yast.sh b/yast2-CASA/make_casa_yast.sh similarity index 100% rename from casa-yast/make_casa_yast.sh rename to yast2-CASA/make_casa_yast.sh diff --git a/casa-yast/missing b/yast2-CASA/missing similarity index 100% rename from casa-yast/missing rename to yast2-CASA/missing diff --git a/casa-yast/pluglib-bindings.ami b/yast2-CASA/pluglib-bindings.ami similarity index 100% rename from casa-yast/pluglib-bindings.ami rename to yast2-CASA/pluglib-bindings.ami diff --git a/casa-yast/pofiles/CASA.po b/yast2-CASA/pofiles/CASA.po similarity index 100% rename from casa-yast/pofiles/CASA.po rename to yast2-CASA/pofiles/CASA.po diff --git a/casa-yast/pofiles/Makefile b/yast2-CASA/pofiles/Makefile similarity index 100% rename from casa-yast/pofiles/Makefile rename to yast2-CASA/pofiles/Makefile diff --git a/casa-yast/pofiles/Makefile.am b/yast2-CASA/pofiles/Makefile.am similarity index 100% rename from casa-yast/pofiles/Makefile.am rename to yast2-CASA/pofiles/Makefile.am diff --git a/casa-yast/pofiles/Makefile.in b/yast2-CASA/pofiles/Makefile.in similarity index 100% rename from casa-yast/pofiles/Makefile.in rename to yast2-CASA/pofiles/Makefile.in diff --git a/casa-yast/pofiles/cs/CASA.mo b/yast2-CASA/pofiles/cs/CASA.mo similarity index 100% rename from casa-yast/pofiles/cs/CASA.mo rename to yast2-CASA/pofiles/cs/CASA.mo diff --git a/casa-yast/pofiles/cs/CASA.po b/yast2-CASA/pofiles/cs/CASA.po similarity index 100% rename from casa-yast/pofiles/cs/CASA.po rename to yast2-CASA/pofiles/cs/CASA.po diff --git a/casa-yast/pofiles/de/CASA.mo b/yast2-CASA/pofiles/de/CASA.mo similarity index 100% rename from casa-yast/pofiles/de/CASA.mo rename to yast2-CASA/pofiles/de/CASA.mo diff --git a/casa-yast/pofiles/de/CASA.po b/yast2-CASA/pofiles/de/CASA.po similarity index 100% rename from casa-yast/pofiles/de/CASA.po rename to yast2-CASA/pofiles/de/CASA.po diff --git a/casa-yast/pofiles/en_US/CASA.mo b/yast2-CASA/pofiles/en_US/CASA.mo similarity index 100% rename from casa-yast/pofiles/en_US/CASA.mo rename to yast2-CASA/pofiles/en_US/CASA.mo diff --git a/casa-yast/pofiles/en_US/CASA.po b/yast2-CASA/pofiles/en_US/CASA.po similarity index 100% rename from casa-yast/pofiles/en_US/CASA.po rename to yast2-CASA/pofiles/en_US/CASA.po diff --git a/casa-yast/pofiles/es/CASA.mo b/yast2-CASA/pofiles/es/CASA.mo similarity index 100% rename from casa-yast/pofiles/es/CASA.mo rename to yast2-CASA/pofiles/es/CASA.mo diff --git a/casa-yast/pofiles/es/CASA.po b/yast2-CASA/pofiles/es/CASA.po similarity index 100% rename from casa-yast/pofiles/es/CASA.po rename to yast2-CASA/pofiles/es/CASA.po diff --git a/casa-yast/pofiles/fr/CASA.mo b/yast2-CASA/pofiles/fr/CASA.mo similarity index 100% rename from casa-yast/pofiles/fr/CASA.mo rename to yast2-CASA/pofiles/fr/CASA.mo diff --git a/casa-yast/pofiles/fr/CASA.po b/yast2-CASA/pofiles/fr/CASA.po similarity index 100% rename from casa-yast/pofiles/fr/CASA.po rename to yast2-CASA/pofiles/fr/CASA.po diff --git a/casa-yast/pofiles/hu/CASA.mo b/yast2-CASA/pofiles/hu/CASA.mo similarity index 100% rename from casa-yast/pofiles/hu/CASA.mo rename to yast2-CASA/pofiles/hu/CASA.mo diff --git a/casa-yast/pofiles/hu/CASA.po b/yast2-CASA/pofiles/hu/CASA.po similarity index 100% rename from casa-yast/pofiles/hu/CASA.po rename to yast2-CASA/pofiles/hu/CASA.po diff --git a/casa-yast/pofiles/it/CASA.mo b/yast2-CASA/pofiles/it/CASA.mo similarity index 100% rename from casa-yast/pofiles/it/CASA.mo rename to yast2-CASA/pofiles/it/CASA.mo diff --git a/casa-yast/pofiles/it/CASA.po b/yast2-CASA/pofiles/it/CASA.po similarity index 100% rename from casa-yast/pofiles/it/CASA.po rename to yast2-CASA/pofiles/it/CASA.po diff --git a/casa-yast/pofiles/ja/CASA.mo b/yast2-CASA/pofiles/ja/CASA.mo similarity index 100% rename from casa-yast/pofiles/ja/CASA.mo rename to yast2-CASA/pofiles/ja/CASA.mo diff --git a/casa-yast/pofiles/ja/CASA.po b/yast2-CASA/pofiles/ja/CASA.po similarity index 100% rename from casa-yast/pofiles/ja/CASA.po rename to yast2-CASA/pofiles/ja/CASA.po diff --git a/casa-yast/pofiles/pl/CASA.mo b/yast2-CASA/pofiles/pl/CASA.mo similarity index 100% rename from casa-yast/pofiles/pl/CASA.mo rename to yast2-CASA/pofiles/pl/CASA.mo diff --git a/casa-yast/pofiles/pl/CASA.po b/yast2-CASA/pofiles/pl/CASA.po similarity index 100% rename from casa-yast/pofiles/pl/CASA.po rename to yast2-CASA/pofiles/pl/CASA.po diff --git a/casa-yast/pofiles/pt_BR/CASA.mo b/yast2-CASA/pofiles/pt_BR/CASA.mo similarity index 100% rename from casa-yast/pofiles/pt_BR/CASA.mo rename to yast2-CASA/pofiles/pt_BR/CASA.mo diff --git a/casa-yast/pofiles/pt_BR/CASA.po b/yast2-CASA/pofiles/pt_BR/CASA.po similarity index 100% rename from casa-yast/pofiles/pt_BR/CASA.po rename to yast2-CASA/pofiles/pt_BR/CASA.po diff --git a/casa-yast/pofiles/ru/CASA.mo b/yast2-CASA/pofiles/ru/CASA.mo similarity index 100% rename from casa-yast/pofiles/ru/CASA.mo rename to yast2-CASA/pofiles/ru/CASA.mo diff --git a/casa-yast/pofiles/ru/CASA.po b/yast2-CASA/pofiles/ru/CASA.po similarity index 100% rename from casa-yast/pofiles/ru/CASA.po rename to yast2-CASA/pofiles/ru/CASA.po diff --git a/casa-yast/pofiles/sk/CASA.mo b/yast2-CASA/pofiles/sk/CASA.mo similarity index 100% rename from casa-yast/pofiles/sk/CASA.mo rename to yast2-CASA/pofiles/sk/CASA.mo diff --git a/casa-yast/pofiles/sk/CASA.po b/yast2-CASA/pofiles/sk/CASA.po similarity index 100% rename from casa-yast/pofiles/sk/CASA.po rename to yast2-CASA/pofiles/sk/CASA.po diff --git a/casa-yast/pofiles/sv/CASA.mo b/yast2-CASA/pofiles/sv/CASA.mo similarity index 100% rename from casa-yast/pofiles/sv/CASA.mo rename to yast2-CASA/pofiles/sv/CASA.mo diff --git a/casa-yast/pofiles/sv/CASA.po b/yast2-CASA/pofiles/sv/CASA.po similarity index 100% rename from casa-yast/pofiles/sv/CASA.po rename to yast2-CASA/pofiles/sv/CASA.po diff --git a/casa-yast/pofiles/zh_CN/CASA.mo b/yast2-CASA/pofiles/zh_CN/CASA.mo similarity index 100% rename from casa-yast/pofiles/zh_CN/CASA.mo rename to yast2-CASA/pofiles/zh_CN/CASA.mo diff --git a/casa-yast/pofiles/zh_CN/CASA.po b/yast2-CASA/pofiles/zh_CN/CASA.po similarity index 100% rename from casa-yast/pofiles/zh_CN/CASA.po rename to yast2-CASA/pofiles/zh_CN/CASA.po diff --git a/casa-yast/pofiles/zh_TW/CASA.mo b/yast2-CASA/pofiles/zh_TW/CASA.mo similarity index 100% rename from casa-yast/pofiles/zh_TW/CASA.mo rename to yast2-CASA/pofiles/zh_TW/CASA.mo diff --git a/casa-yast/pofiles/zh_TW/CASA.po b/yast2-CASA/pofiles/zh_TW/CASA.po similarity index 100% rename from casa-yast/pofiles/zh_TW/CASA.po rename to yast2-CASA/pofiles/zh_TW/CASA.po diff --git a/casa-yast/src/.dep b/yast2-CASA/src/.dep similarity index 100% rename from casa-yast/src/.dep rename to yast2-CASA/src/.dep diff --git a/casa-yast/src/CASA.desktop b/yast2-CASA/src/CASA.desktop similarity index 100% rename from casa-yast/src/CASA.desktop rename to yast2-CASA/src/CASA.desktop diff --git a/casa-yast/src/CASA.ycp b/yast2-CASA/src/CASA.ycp similarity index 100% rename from casa-yast/src/CASA.ycp rename to yast2-CASA/src/CASA.ycp diff --git a/casa-yast/src/CASA_auto.ycp b/yast2-CASA/src/CASA_auto.ycp similarity index 100% rename from casa-yast/src/CASA_auto.ycp rename to yast2-CASA/src/CASA_auto.ycp diff --git a/casa-yast/src/CASA_proposal.ycp b/yast2-CASA/src/CASA_proposal.ycp similarity index 100% rename from casa-yast/src/CASA_proposal.ycp rename to yast2-CASA/src/CASA_proposal.ycp diff --git a/casa-yast/src/Makefile b/yast2-CASA/src/Makefile similarity index 100% rename from casa-yast/src/Makefile rename to yast2-CASA/src/Makefile diff --git a/casa-yast/src/Makefile.am b/yast2-CASA/src/Makefile.am similarity index 100% rename from casa-yast/src/Makefile.am rename to yast2-CASA/src/Makefile.am diff --git a/casa-yast/src/Makefile.in b/yast2-CASA/src/Makefile.in similarity index 100% rename from casa-yast/src/Makefile.in rename to yast2-CASA/src/Makefile.in diff --git a/casa-yast/src/NovellCasa.pm b/yast2-CASA/src/NovellCasa.pm similarity index 100% rename from casa-yast/src/NovellCasa.pm rename to yast2-CASA/src/NovellCasa.pm diff --git a/casa-yast/src/NovellCasa.ybc b/yast2-CASA/src/NovellCasa.ybc similarity index 100% rename from casa-yast/src/NovellCasa.ybc rename to yast2-CASA/src/NovellCasa.ybc diff --git a/casa-yast/src/NovellCasa.ycp b/yast2-CASA/src/NovellCasa.ycp similarity index 100% rename from casa-yast/src/NovellCasa.ycp rename to yast2-CASA/src/NovellCasa.ycp diff --git a/casa-yast/src/complex.ycp b/yast2-CASA/src/complex.ycp similarity index 100% rename from casa-yast/src/complex.ycp rename to yast2-CASA/src/complex.ycp diff --git a/casa-yast/src/dialogs.ycp b/yast2-CASA/src/dialogs.ycp similarity index 100% rename from casa-yast/src/dialogs.ycp rename to yast2-CASA/src/dialogs.ycp diff --git a/casa-yast/src/helps.ycp b/yast2-CASA/src/helps.ycp similarity index 100% rename from casa-yast/src/helps.ycp rename to yast2-CASA/src/helps.ycp diff --git a/casa-yast/src/icons/CASA_22.png b/yast2-CASA/src/icons/CASA_22.png similarity index 100% rename from casa-yast/src/icons/CASA_22.png rename to yast2-CASA/src/icons/CASA_22.png diff --git a/casa-yast/src/icons/CASA_32.png b/yast2-CASA/src/icons/CASA_32.png similarity index 100% rename from casa-yast/src/icons/CASA_32.png rename to yast2-CASA/src/icons/CASA_32.png diff --git a/casa-yast/src/icons/CASA_48.png b/yast2-CASA/src/icons/CASA_48.png similarity index 100% rename from casa-yast/src/icons/CASA_48.png rename to yast2-CASA/src/icons/CASA_48.png diff --git a/casa-yast/src/icons/install_casa_yast_icons b/yast2-CASA/src/icons/install_casa_yast_icons similarity index 100% rename from casa-yast/src/icons/install_casa_yast_icons rename to yast2-CASA/src/icons/install_casa_yast_icons diff --git a/casa-yast/src/wizards.ycp b/yast2-CASA/src/wizards.ycp similarity index 100% rename from casa-yast/src/wizards.ycp rename to yast2-CASA/src/wizards.ycp diff --git a/casa-yast/tools/yast2-CASA.spec b/yast2-CASA/tools/yast2-CASA.spec similarity index 100% rename from casa-yast/tools/yast2-CASA.spec rename to yast2-CASA/tools/yast2-CASA.spec diff --git a/casa-yast/yast2-CASA.changes b/yast2-CASA/yast2-CASA.changes similarity index 100% rename from casa-yast/yast2-CASA.changes rename to yast2-CASA/yast2-CASA.changes diff --git a/casa-yast/yast2-CASA.spec.in b/yast2-CASA/yast2-CASA.spec.in similarity index 100% rename from casa-yast/yast2-CASA.spec.in rename to yast2-CASA/yast2-CASA.spec.in