From 9016ccb66f179e697802713df8b0670c37949ab1 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Sat, 24 Mar 2012 02:08:08 -0500
Subject: [PATCH] Removed unnecessary pki folder.

Previously the source code was located inside a pki folder.
This folder was created during svn migration and is no longer
needed. This folder has now been removed and the contents have
been moved up one level.

Ticket #131
---
 pki/.classpath => .classpath                       |    0
 pki/.gitignore => .gitignore                       |    0
 pki/.project => .project                           |    0
 pki/CMakeLists.txt => CMakeLists.txt               |    0
 pki/COPYING => COPYING                             |    0
 pki/CPackConfig.cmake => CPackConfig.cmake         |    0
 pki/ConfigureChecks.cmake => ConfigureChecks.cmake |    0
 pki/DefineOptions.cmake => DefineOptions.cmake     |    0
 pki/README => README                               |    0
 {pki/base => base}/CMakeLists.txt                  |    0
 {pki/base => base}/ca/CMakeLists.txt               |    0
 {pki/base => base}/ca/LICENSE                      |    0
 {pki/base => base}/ca/setup/CMakeLists.txt         |    0
 {pki/base => base}/ca/setup/registry_instance      |    0
 {pki/base => base}/ca/shared/conf/CMakeLists.txt   |    0
 {pki/base => base}/ca/shared/conf/CS.cfg.in        |    0
 {pki/base => base}/ca/shared/conf/acl.ldif         |    0
 .../base => base}/ca/shared/conf/adminCert.profile |    0
 .../ca/shared/conf/caAuditSigningCert.profile      |    0
 {pki/base => base}/ca/shared/conf/caCert.profile   |    0
 .../ca/shared/conf/caOCSPCert.profile              |    0
 {pki/base => base}/ca/shared/conf/catalina.policy  |    0
 .../ca/shared/conf/catalina.properties             |    0
 {pki/base => base}/ca/shared/conf/context.xml      |    0
 {pki/base => base}/ca/shared/conf/database.ldif    |    0
 {pki/base => base}/ca/shared/conf/db.ldif          |    0
 {pki/base => base}/ca/shared/conf/flatfile.txt     |    0
 {pki/base => base}/ca/shared/conf/index.ldif       |    0
 {pki/base => base}/ca/shared/conf/jk2.manifest     |    0
 {pki/base => base}/ca/shared/conf/jk2.properties   |    0
 {pki/base => base}/ca/shared/conf/jkconf.ant.xml   |    0
 .../base => base}/ca/shared/conf/jkconfig.manifest |    0
 .../ca/shared/conf/logging.properties              |    0
 {pki/base => base}/ca/shared/conf/manager.ldif     |    0
 {pki/base => base}/ca/shared/conf/proxy.conf       |    0
 {pki/base => base}/ca/shared/conf/registry.cfg     |    0
 {pki/base => base}/ca/shared/conf/schema.ldif      |    0
 .../ca/shared/conf/server-minimal.xml              |    0
 {pki/base => base}/ca/shared/conf/server.xml       |    0
 .../ca/shared/conf/serverCert.profile              |    0
 .../ca/shared/conf/serverCertNick.conf             |    0
 {pki/base => base}/ca/shared/conf/shm.manifest     |    0
 .../ca/shared/conf/subsystemCert.profile           |    0
 .../ca/shared/conf/tomcat-jk2.manifest             |    0
 {pki/base => base}/ca/shared/conf/tomcat-users.xml |    0
 {pki/base => base}/ca/shared/conf/tomcat6.conf     |    0
 .../ca/shared/conf/uriworkermap.properties         |    0
 {pki/base => base}/ca/shared/conf/vlv.ldif         |    0
 {pki/base => base}/ca/shared/conf/vlvtasks.ldif    |    0
 {pki/base => base}/ca/shared/conf/web.xml          |    0
 .../ca/shared/conf/workers.properties              |    0
 .../ca/shared/conf/workers.properties.minimal      |    0
 .../ca/shared/conf/workers2.properties             |    0
 .../ca/shared/conf/workers2.properties.minimal     |    0
 .../ca/shared/emails/ExpiredUnpublishJob           |    0
 .../ca/shared/emails/ExpiredUnpublishJobItem       |    0
 {pki/base => base}/ca/shared/emails/certIssued_CA  |    0
 .../ca/shared/emails/certIssued_CA.html            |    0
 {pki/base => base}/ca/shared/emails/certIssued_RA  |    0
 .../ca/shared/emails/certIssued_RA.html            |    0
 .../ca/shared/emails/certRequestRejected.html      |    0
 {pki/base => base}/ca/shared/emails/certRevoked_CA |    0
 .../ca/shared/emails/certRevoked_CA.html           |    0
 {pki/base => base}/ca/shared/emails/certRevoked_RA |    0
 .../ca/shared/emails/certRevoked_RA.html           |    0
 {pki/base => base}/ca/shared/emails/euJob1.html    |    0
 .../base => base}/ca/shared/emails/euJob1Item.html |    0
 .../ca/shared/emails/publishCerts.html             |    0
 .../ca/shared/emails/publishCertsItem.html         |    0
 {pki/base => base}/ca/shared/emails/reqInQueue_CA  |    0
 .../ca/shared/emails/reqInQueue_CA.html            |    0
 {pki/base => base}/ca/shared/emails/reqInQueue_RA  |    0
 .../ca/shared/emails/reqInQueue_RA.html            |    0
 {pki/base => base}/ca/shared/emails/riq1Item.html  |    0
 .../ca/shared/emails/riq1Summary.html              |    0
 {pki/base => base}/ca/shared/emails/rnJob1.txt     |    0
 {pki/base => base}/ca/shared/emails/rnJob1Item.txt |    0
 .../ca/shared/emails/rnJob1Summary.txt             |    0
 {pki/base => base}/ca/shared/etc/init.d/pki-cad    |    0
 .../ca/shared/lib/systemd/system/pki-cad.target    |    0
 .../ca/shared/lib/systemd/system/pki-cad@.service  |    0
 .../ca/shared/profiles/ca/DomainController.cfg     |    0
 .../ca/shared/profiles/ca/caAdminCert.cfg          |    0
 .../ca/shared/profiles/ca/caAgentFileSigning.cfg   |    0
 .../ca/shared/profiles/ca/caAgentServerCert.cfg    |    0
 .../ca/shared/profiles/ca/caCACert.cfg             |    0
 .../ca/shared/profiles/ca/caCMCUserCert.cfg        |    0
 .../ca/shared/profiles/ca/caDirUserCert.cfg        |    0
 .../ca/shared/profiles/ca/caDirUserRenewal.cfg     |    0
 .../ca/shared/profiles/ca/caDualCert.cfg           |    0
 .../ca/shared/profiles/ca/caDualRAuserCert.cfg     |    0
 .../ca/shared/profiles/ca/caECDualCert.cfg         |    0
 .../ca/shared/profiles/ca/caECUserCert.cfg         |    0
 .../ca/shared/profiles/ca/caEncECUserCert.cfg      |    0
 .../ca/shared/profiles/ca/caEncUserCert.cfg        |    0
 .../ca/shared/profiles/ca/caFullCMCUserCert.cfg    |    0
 .../ca/shared/profiles/ca/caIPAserviceCert.cfg     |    0
 .../ca/shared/profiles/ca/caInstallCACert.cfg      |    0
 .../profiles/ca/caInternalAuthAuditSigningCert.cfg |    0
 .../profiles/ca/caInternalAuthDRMstorageCert.cfg   |    0
 .../shared/profiles/ca/caInternalAuthOCSPCert.cfg  |    0
 .../profiles/ca/caInternalAuthServerCert.cfg       |    0
 .../profiles/ca/caInternalAuthSubsystemCert.cfg    |    0
 .../profiles/ca/caInternalAuthTransportCert.cfg    |    0
 .../ca/shared/profiles/ca/caJarSigningCert.cfg     |    0
 .../ca/shared/profiles/ca/caManualRenewal.cfg      |    0
 .../ca/shared/profiles/ca/caOCSPCert.cfg           |    0
 .../ca/shared/profiles/ca/caOtherCert.cfg          |    0
 .../ca/shared/profiles/ca/caRACert.cfg             |    0
 .../ca/shared/profiles/ca/caRARouterCert.cfg       |    0
 .../ca/shared/profiles/ca/caRAagentCert.cfg        |    0
 .../ca/shared/profiles/ca/caRAserverCert.cfg       |    0
 .../ca/shared/profiles/ca/caRouterCert.cfg         |    0
 .../shared/profiles/ca/caSSLClientSelfRenewal.cfg  |    0
 .../ca/shared/profiles/ca/caServerCert.cfg         |    0
 .../ca/shared/profiles/ca/caSignedLogCert.cfg      |    0
 .../ca/shared/profiles/ca/caSimpleCMCUserCert.cfg  |    0
 .../ca/shared/profiles/ca/caTPSCert.cfg            |    0
 .../profiles/ca/caTempTokenDeviceKeyEnrollment.cfg |    0
 .../ca/caTempTokenUserEncryptionKeyEnrollment.cfg  |    0
 .../ca/caTempTokenUserSigningKeyEnrollment.cfg     |    0
 .../profiles/ca/caTokenDeviceKeyEnrollment.cfg     |    0
 .../profiles/ca/caTokenMSLoginEnrollment.cfg       |    0
 .../ca/caTokenUserEncryptionKeyEnrollment.cfg      |    0
 .../ca/caTokenUserEncryptionKeyRenewal.cfg         |    0
 .../ca/caTokenUserSigningKeyEnrollment.cfg         |    0
 .../profiles/ca/caTokenUserSigningKeyRenewal.cfg   |    0
 .../ca/shared/profiles/ca/caTransportCert.cfg      |    0
 .../ca/shared/profiles/ca/caUUIDdeviceCert.cfg     |    0
 .../ca/shared/profiles/ca/caUserCert.cfg           |    0
 .../ca/shared/profiles/ca/caUserSMIMEcapCert.cfg   |    0
 .../ca/shared/webapps/ROOT/WEB-INF/web.xml         |    0
 .../base => base}/ca/shared/webapps/ROOT/index.jsp |    0
 .../shared/webapps/ca/WEB-INF/velocity.properties  |    0
 .../ca/shared/webapps/ca/WEB-INF/web.xml           |    0
 {pki/base => base}/ca/src/CMakeLists.txt           |    0
 .../ca/src/com/netscape/ca/CAPolicy.java           |    0
 .../ca/src/com/netscape/ca/CAService.java          |    0
 .../ca/src/com/netscape/ca/CMSCRLExtensions.java   |    0
 .../ca/src/com/netscape/ca/CRLIssuingPoint.java    |    0
 .../src/com/netscape/ca/CRLWithExpiredCerts.java   |    0
 .../src/com/netscape/ca/CertificateAuthority.java  |    0
 .../ca/src/com/netscape/ca/SigningUnit.java        |    0
 {pki/base => base}/common/CMakeLists.txt           |    0
 {pki/base => base}/common/LICENSE                  |    0
 .../common/setup/CertServer.directory              |    0
 {pki/base => base}/common/setup/menu.xml           |    0
 {pki/base => base}/common/setup/web-app_2_3.dtd    |    0
 {pki/base => base}/common/src/CMakeLists.txt       |    0
 .../common/src/LogMessages.properties              |    0
 .../common/src/UserMessages.properties             |    0
 .../common/src/com/netscape/certsrv/acls/ACL.java  |    0
 .../src/com/netscape/certsrv/acls/ACLEntry.java    |    0
 .../com/netscape/certsrv/acls/ACLsResources.java   |    0
 .../com/netscape/certsrv/acls/EACLsException.java  |    0
 .../common/src/com/netscape/certsrv/acls/IACL.java |    0
 .../src/com/netscape/certsrv/acls/IACLEntry.java   |    0
 .../common/src/com/netscape/certsrv/apps/CMS.java  |    0
 .../src/com/netscape/certsrv/apps/ICMSEngine.java  |    0
 .../com/netscape/certsrv/apps/ICommandQueue.java   |    0
 .../certsrv/authentication/AuthCredentials.java    |    0
 .../certsrv/authentication/AuthManagerProxy.java   |    0
 .../certsrv/authentication/AuthMgrPlugin.java      |    0
 .../certsrv/authentication/AuthResources.java      |    0
 .../netscape/certsrv/authentication/AuthToken.java |    0
 .../certsrv/authentication/EAuthException.java     |    0
 .../certsrv/authentication/EAuthInternalError.java |    0
 .../certsrv/authentication/EAuthMgrNotFound.java   |    0
 .../authentication/EAuthMgrPluginNotFound.java     |    0
 .../certsrv/authentication/EAuthUserError.java     |    0
 .../certsrv/authentication/ECompSyntaxErr.java     |    0
 .../certsrv/authentication/EFormSubjectDN.java     |    0
 .../authentication/EInvalidCredentials.java        |    0
 .../certsrv/authentication/EMissingCredential.java |    0
 .../certsrv/authentication/IAuthCredentials.java   |    0
 .../certsrv/authentication/IAuthManager.java       |    0
 .../certsrv/authentication/IAuthSubsystem.java     |    0
 .../certsrv/authentication/IAuthToken.java         |    0
 .../authentication/ISSLClientCertProvider.java     |    0
 .../certsrv/authentication/ISharedToken.java       |    0
 .../com/netscape/certsrv/authority/IAuthority.java |    0
 .../netscape/certsrv/authority/ICertAuthority.java |    0
 .../certsrv/authorization/AuthzManagerProxy.java   |    0
 .../certsrv/authorization/AuthzMgrPlugin.java      |    0
 .../certsrv/authorization/AuthzResources.java      |    0
 .../netscape/certsrv/authorization/AuthzToken.java |    0
 .../certsrv/authorization/EAuthzAccessDenied.java  |    0
 .../certsrv/authorization/EAuthzException.java     |    0
 .../certsrv/authorization/EAuthzInternalError.java |    0
 .../certsrv/authorization/EAuthzMgrNotFound.java   |    0
 .../authorization/EAuthzMgrPluginNotFound.java     |    0
 .../authorization/EAuthzUnknownOperation.java      |    0
 .../authorization/EAuthzUnknownProtectedRes.java   |    0
 .../certsrv/authorization/IAuthzManager.java       |    0
 .../certsrv/authorization/IAuthzSubsystem.java     |    0
 .../src/com/netscape/certsrv/base/ASubsystem.java  |    0
 .../netscape/certsrv/base/AttributeNameHelper.java |    0
 .../com/netscape/certsrv/base/BaseResources.java   |    0
 .../com/netscape/certsrv/base/EBaseException.java  |    0
 .../netscape/certsrv/base/EPropertyNotDefined.java |    0
 .../netscape/certsrv/base/EPropertyNotFound.java   |    0
 .../netscape/certsrv/base/ExtendedPluginInfo.java  |    0
 .../src/com/netscape/certsrv/base/IArgBlock.java   |    0
 .../src/com/netscape/certsrv/base/IAttrSet.java    |    0
 .../src/com/netscape/certsrv/base/IAuthInfo.java   |    0
 .../com/netscape/certsrv/base/ICRLPrettyPrint.java |    0
 .../netscape/certsrv/base/ICertPrettyPrint.java    |    0
 .../com/netscape/certsrv/base/IConfigStore.java    |    0
 .../certsrv/base/IConfigStoreEventListener.java    |    0
 .../com/netscape/certsrv/base/IExtPrettyPrint.java |    0
 .../netscape/certsrv/base/IExtendedPluginInfo.java |    0
 .../src/com/netscape/certsrv/base/IPluginImpl.java |    0
 .../netscape/certsrv/base/IPrettyPrintFormat.java  |    0
 .../certsrv/base/ISecurityDomainSessionTable.java  |    0
 .../netscape/certsrv/base/ISourceConfigStore.java  |    0
 .../src/com/netscape/certsrv/base/ISubsystem.java  |    0
 .../netscape/certsrv/base/ISubsystemSource.java    |    0
 .../src/com/netscape/certsrv/base/ITimeSource.java |    0
 .../src/com/netscape/certsrv/base/KeyGenInfo.java  |    0
 .../netscape/certsrv/base/MessageFormatter.java    |    0
 .../netscape/certsrv/base/MetaAttributeDef.java    |    0
 .../src/com/netscape/certsrv/base/MetaInfo.java    |    0
 .../src/com/netscape/certsrv/base/Nonces.java      |    0
 .../netscape/certsrv/base/PasswordResources.java   |    0
 .../src/com/netscape/certsrv/base/Plugin.java      |    0
 .../com/netscape/certsrv/base/SessionContext.java  |    0
 .../src/com/netscape/certsrv/ca/CAResources.java   |    0
 .../src/com/netscape/certsrv/ca/ECAException.java  |    0
 .../com/netscape/certsrv/ca/EErrorPublishCRL.java  |    0
 .../src/com/netscape/certsrv/ca/ICAService.java    |    0
 .../com/netscape/certsrv/ca/ICMSCRLExtension.java  |    0
 .../com/netscape/certsrv/ca/ICMSCRLExtensions.java |    0
 .../com/netscape/certsrv/ca/ICRLIssuingPoint.java  |    0
 .../netscape/certsrv/ca/ICertificateAuthority.java |    0
 .../certsrv/cert/ICrossCertPairSubsystem.java      |    0
 .../netscape/certsrv/client/IDataProcessor.java    |    0
 .../certsrv/client/connection/IAuthenticator.java  |    0
 .../certsrv/client/connection/IConnection.java     |    0
 .../client/connection/IConnectionFactory.java      |    0
 .../netscape/certsrv/common/ConfigConstants.java   |    0
 .../src/com/netscape/certsrv/common/Constants.java |    0
 .../src/com/netscape/certsrv/common/DestDef.java   |    0
 .../com/netscape/certsrv/common/NameValuePair.java |    0
 .../netscape/certsrv/common/NameValuePairs.java    |    0
 .../src/com/netscape/certsrv/common/OpDef.java     |    0
 .../src/com/netscape/certsrv/common/PrefixDef.java |    0
 .../src/com/netscape/certsrv/common/ScopeDef.java  |    0
 .../src/com/netscape/certsrv/common/TaskId.java    |    0
 .../com/netscape/certsrv/connector/IConnector.java |    0
 .../certsrv/connector/IHttpConnFactory.java        |    0
 .../certsrv/connector/IHttpConnection.java         |    0
 .../certsrv/connector/IHttpPKIMessage.java         |    0
 .../netscape/certsrv/connector/IPKIMessage.java    |    0
 .../certsrv/connector/IRemoteAuthority.java        |    0
 .../certsrv/connector/IRequestEncoder.java         |    0
 .../com/netscape/certsrv/connector/IResender.java  |    0
 .../src/com/netscape/certsrv/dbs/DBResources.java  |    0
 .../src/com/netscape/certsrv/dbs/EDBException.java |    0
 .../netscape/certsrv/dbs/EDBNotAvailException.java |    0
 .../certsrv/dbs/EDBRecordNotFoundException.java    |    0
 .../com/netscape/certsrv/dbs/IDBAttrMapper.java    |    0
 .../com/netscape/certsrv/dbs/IDBDynAttrMapper.java |    0
 .../src/com/netscape/certsrv/dbs/IDBObj.java       |    0
 .../src/com/netscape/certsrv/dbs/IDBRegistry.java  |    0
 .../src/com/netscape/certsrv/dbs/IDBSSession.java  |    0
 .../com/netscape/certsrv/dbs/IDBSearchResults.java |    0
 .../src/com/netscape/certsrv/dbs/IDBSubsystem.java |    0
 .../com/netscape/certsrv/dbs/IDBVirtualList.java   |    0
 .../netscape/certsrv/dbs/IElementProcessor.java    |    0
 .../com/netscape/certsrv/dbs/IFilterConverter.java |    0
 .../src/com/netscape/certsrv/dbs/Modification.java |    0
 .../com/netscape/certsrv/dbs/ModificationSet.java  |    0
 .../netscape/certsrv/dbs/certdb/ICertRecord.java   |    0
 .../certsrv/dbs/certdb/ICertRecordList.java        |    0
 .../certsrv/dbs/certdb/ICertificateRepository.java |    0
 .../certsrv/dbs/certdb/IRevocationInfo.java        |    0
 .../certsrv/dbs/crldb/ICRLIssuingPointRecord.java  |    0
 .../netscape/certsrv/dbs/crldb/ICRLRepository.java |    0
 .../com/netscape/certsrv/dbs/keydb/IKeyRecord.java |    0
 .../netscape/certsrv/dbs/keydb/IKeyRecordList.java |    0
 .../netscape/certsrv/dbs/keydb/IKeyRepository.java |    0
 .../com/netscape/certsrv/dbs/keydb/KeyState.java   |    0
 .../dbs/replicadb/IReplicaIDRepository.java        |    0
 .../certsrv/dbs/repository/IRepository.java        |    0
 .../certsrv/dbs/repository/IRepositoryRecord.java  |    0
 .../certsrv/evaluators/IAccessEvaluator.java       |    0
 .../certsrv/extensions/EExtensionsException.java   |    0
 .../certsrv/extensions/ExtensionsResources.java    |    0
 .../netscape/certsrv/extensions/ICMSExtension.java |    0
 .../com/netscape/certsrv/jobs/EJobsException.java  |    0
 .../common/src/com/netscape/certsrv/jobs/IJob.java |    0
 .../src/com/netscape/certsrv/jobs/IJobCron.java    |    0
 .../com/netscape/certsrv/jobs/IJobsScheduler.java  |    0
 .../src/com/netscape/certsrv/jobs/JobPlugin.java   |    0
 .../com/netscape/certsrv/jobs/JobsResources.java   |    0
 .../com/netscape/certsrv/kra/EKRAException.java    |    0
 .../src/com/netscape/certsrv/kra/IJoinShares.java  |    0
 .../certsrv/kra/IKeyRecoveryAuthority.java         |    0
 .../src/com/netscape/certsrv/kra/IKeyService.java  |    0
 .../com/netscape/certsrv/kra/IProofOfArchival.java |    0
 .../src/com/netscape/certsrv/kra/IShare.java       |    0
 .../src/com/netscape/certsrv/kra/KRAResources.java |    0
 .../com/netscape/certsrv/kra/ProofOfArchival.java  |    0
 .../com/netscape/certsrv/ldap/ELdapException.java  |    0
 .../certsrv/ldap/ELdapServerDownException.java     |    0
 .../com/netscape/certsrv/ldap/ILdapAuthInfo.java   |    0
 .../certsrv/ldap/ILdapBoundConnFactory.java        |    0
 .../netscape/certsrv/ldap/ILdapConnFactory.java    |    0
 .../com/netscape/certsrv/ldap/ILdapConnInfo.java   |    0
 .../com/netscape/certsrv/ldap/ILdapConnModule.java |    0
 .../com/netscape/certsrv/ldap/LdapResources.java   |    0
 .../certsrv/listeners/EListenersException.java     |    0
 .../certsrv/listeners/IRequestListenerPlugin.java  |    0
 .../certsrv/listeners/ListenersResources.java      |    0
 .../com/netscape/certsrv/logging/AuditEvent.java   |    0
 .../com/netscape/certsrv/logging/AuditFormat.java  |    0
 .../com/netscape/certsrv/logging/ConsoleError.java |    0
 .../com/netscape/certsrv/logging/ConsoleLog.java   |    0
 .../netscape/certsrv/logging/ELogException.java    |    0
 .../com/netscape/certsrv/logging/ELogNotFound.java |    0
 .../certsrv/logging/ELogPluginNotFound.java        |    0
 .../netscape/certsrv/logging/IBundleLogEvent.java  |    0
 .../com/netscape/certsrv/logging/ILogEvent.java    |    0
 .../netscape/certsrv/logging/ILogEventFactory.java |    0
 .../certsrv/logging/ILogEventListener.java         |    0
 .../com/netscape/certsrv/logging/ILogQueue.java    |    0
 .../netscape/certsrv/logging/ILogSubsystem.java    |    0
 .../src/com/netscape/certsrv/logging/ILogger.java  |    0
 .../com/netscape/certsrv/logging/LogPlugin.java    |    0
 .../com/netscape/certsrv/logging/LogResources.java |    0
 .../netscape/certsrv/logging/SignedAuditEvent.java |    0
 .../com/netscape/certsrv/logging/SystemEvent.java  |    0
 .../notification/ENotificationException.java       |    0
 .../certsrv/notification/IEmailFormProcessor.java  |    0
 .../certsrv/notification/IEmailResolver.java       |    0
 .../certsrv/notification/IEmailResolverKeys.java   |    0
 .../certsrv/notification/IEmailTemplate.java       |    0
 .../certsrv/notification/IMailNotification.java    |    0
 .../notification/NotificationResources.java        |    0
 .../src/com/netscape/certsrv/ocsp/IDefStore.java   |    0
 .../com/netscape/certsrv/ocsp/IOCSPAuthority.java  |    0
 .../com/netscape/certsrv/ocsp/IOCSPService.java    |    0
 .../src/com/netscape/certsrv/ocsp/IOCSPStore.java  |    0
 .../certsrv/password/EPasswordCheckException.java  |    0
 .../certsrv/password/IConfigPasswordCheck.java     |    0
 .../netscape/certsrv/password/IPasswordCheck.java  |    0
 .../certsrv/pattern/AttrSetCollection.java         |    0
 .../src/com/netscape/certsrv/pattern/Pattern.java  |    0
 .../netscape/certsrv/policy/EPolicyException.java  |    0
 .../netscape/certsrv/policy/IEnrollmentPolicy.java |    0
 .../com/netscape/certsrv/policy/IExpression.java   |    0
 .../policy/IGeneralNameAsConstraintsConfig.java    |    0
 .../certsrv/policy/IGeneralNameConfig.java         |    0
 .../netscape/certsrv/policy/IGeneralNameUtil.java  |    0
 .../policy/IGeneralNamesAsConstraintsConfig.java   |    0
 .../certsrv/policy/IGeneralNamesConfig.java        |    0
 .../certsrv/policy/IKeyArchivalPolicy.java         |    0
 .../certsrv/policy/IKeyRecoveryPolicy.java         |    0
 .../certsrv/policy/IPolicyPredicateParser.java     |    0
 .../netscape/certsrv/policy/IPolicyProcessor.java  |    0
 .../com/netscape/certsrv/policy/IPolicyRule.java   |    0
 .../com/netscape/certsrv/policy/IPolicySet.java    |    0
 .../netscape/certsrv/policy/IRenewalPolicy.java    |    0
 .../netscape/certsrv/policy/IRevocationPolicy.java |    0
 .../certsrv/policy/ISubjAltNameConfig.java         |    0
 .../netscape/certsrv/policy/PolicyResources.java   |    0
 .../netscape/certsrv/profile/CertInfoProfile.java  |    0
 .../netscape/certsrv/profile/EDeferException.java  |    0
 .../certsrv/profile/EProfileException.java         |    0
 .../netscape/certsrv/profile/ERejectException.java |    0
 .../certsrv/profile/ICertInfoPolicyDefault.java    |    0
 .../netscape/certsrv/profile/IEnrollProfile.java   |    0
 .../certsrv/profile/IPolicyConstraint.java         |    0
 .../netscape/certsrv/profile/IPolicyDefault.java   |    0
 .../src/com/netscape/certsrv/profile/IProfile.java |    0
 .../certsrv/profile/IProfileAuthenticator.java     |    0
 .../netscape/certsrv/profile/IProfileContext.java  |    0
 .../com/netscape/certsrv/profile/IProfileEx.java   |    0
 .../netscape/certsrv/profile/IProfileInput.java    |    0
 .../netscape/certsrv/profile/IProfileOutput.java   |    0
 .../netscape/certsrv/profile/IProfilePolicy.java   |    0
 .../certsrv/profile/IProfileSubsystem.java         |    0
 .../netscape/certsrv/profile/IProfileUpdater.java  |    0
 .../com/netscape/certsrv/property/Descriptor.java  |    0
 .../certsrv/property/EPropertyException.java       |    0
 .../netscape/certsrv/property/IConfigTemplate.java |    0
 .../com/netscape/certsrv/property/IDescriptor.java |    0
 .../com/netscape/certsrv/property/PropertySet.java |    0
 .../netscape/certsrv/publish/ECompSyntaxErr.java   |    0
 .../netscape/certsrv/publish/EMapperNotFound.java  |    0
 .../certsrv/publish/EMapperPluginNotFound.java     |    0
 .../certsrv/publish/EPublisherNotFound.java        |    0
 .../certsrv/publish/EPublisherPluginNotFound.java  |    0
 .../netscape/certsrv/publish/ERuleNotFound.java    |    0
 .../certsrv/publish/ERulePluginNotFound.java       |    0
 .../netscape/certsrv/publish/ICRLPublisher.java    |    0
 .../netscape/certsrv/publish/ILdapCertMapper.java  |    0
 .../netscape/certsrv/publish/ILdapCrlMapper.java   |    0
 .../netscape/certsrv/publish/ILdapExpression.java  |    0
 .../com/netscape/certsrv/publish/ILdapMapper.java  |    0
 .../com/netscape/certsrv/publish/ILdapPlugin.java  |    0
 .../netscape/certsrv/publish/ILdapPluginImpl.java  |    0
 .../certsrv/publish/ILdapPublishModule.java        |    0
 .../netscape/certsrv/publish/ILdapPublisher.java   |    0
 .../com/netscape/certsrv/publish/ILdapRule.java    |    0
 .../netscape/certsrv/publish/IPublishRuleSet.java  |    0
 .../certsrv/publish/IPublisherProcessor.java       |    0
 .../certsrv/publish/IXcertPublisherProcessor.java  |    0
 .../certsrv/publish/LdapCertMapResult.java         |    0
 .../com/netscape/certsrv/publish/MapperPlugin.java |    0
 .../com/netscape/certsrv/publish/MapperProxy.java  |    0
 .../netscape/certsrv/publish/PublisherPlugin.java  |    0
 .../netscape/certsrv/publish/PublisherProxy.java   |    0
 .../com/netscape/certsrv/publish/RulePlugin.java   |    0
 .../src/com/netscape/certsrv/ra/IRAService.java    |    0
 .../certsrv/ra/IRegistrationAuthority.java         |    0
 .../certsrv/registry/ERegistryException.java       |    0
 .../com/netscape/certsrv/registry/IPluginInfo.java |    0
 .../netscape/certsrv/registry/IPluginRegistry.java |    0
 .../netscape/certsrv/request/ARequestNotifier.java |    0
 .../netscape/certsrv/request/AgentApproval.java    |    0
 .../netscape/certsrv/request/AgentApprovals.java   |    0
 .../certsrv/request/IEnrollmentRequest.java        |    0
 .../src/com/netscape/certsrv/request/INotify.java  |    0
 .../src/com/netscape/certsrv/request/IPolicy.java  |    0
 .../src/com/netscape/certsrv/request/IRequest.java |    0
 .../com/netscape/certsrv/request/IRequestList.java |    0
 .../netscape/certsrv/request/IRequestListener.java |    0
 .../netscape/certsrv/request/IRequestNotifier.java |    0
 .../netscape/certsrv/request/IRequestQueue.java    |    0
 .../netscape/certsrv/request/IRequestRecord.java   |    0
 .../certsrv/request/IRequestScheduler.java         |    0
 .../certsrv/request/IRequestSubsystem.java         |    0
 .../certsrv/request/IRequestVirtualList.java       |    0
 .../src/com/netscape/certsrv/request/IService.java |    0
 .../netscape/certsrv/request/PolicyMessage.java    |    0
 .../com/netscape/certsrv/request/PolicyResult.java |    0
 .../com/netscape/certsrv/request/RequestId.java    |    0
 .../netscape/certsrv/request/RequestStatus.java    |    0
 .../netscape/certsrv/request/ldap/IRequestMod.java |    0
 .../com/netscape/certsrv/security/Credential.java  |    0
 .../certsrv/security/ICryptoSubsystem.java         |    0
 .../netscape/certsrv/security/IEncryptionUnit.java |    0
 .../netscape/certsrv/security/ISigningUnit.java    |    0
 .../netscape/certsrv/security/IStorageKeyUnit.java |    0
 .../src/com/netscape/certsrv/security/IToken.java  |    0
 .../certsrv/security/ITransportKeyUnit.java        |    0
 .../com/netscape/certsrv/security/KeyCertData.java |    0
 .../selftests/EDuplicateSelfTestException.java     |    0
 .../selftests/EInvalidSelfTestException.java       |    0
 .../selftests/EMissingSelfTestException.java       |    0
 .../certsrv/selftests/ESelfTestException.java      |    0
 .../com/netscape/certsrv/selftests/ISelfTest.java  |    0
 .../certsrv/selftests/ISelfTestSubsystem.java      |    0
 .../certsrv/selftests/SelfTestResources.java       |    0
 .../src/com/netscape/certsrv/template/ArgList.java |    0
 .../src/com/netscape/certsrv/template/ArgSet.java  |    0
 .../com/netscape/certsrv/template/ArgString.java   |    0
 .../com/netscape/certsrv/template/IArgValue.java   |    0
 .../com/netscape/certsrv/tks/ITKSAuthority.java    |    0
 .../com/netscape/certsrv/usrgrp/Certificates.java  |    0
 .../netscape/certsrv/usrgrp/EUsrGrpException.java  |    0
 .../netscape/certsrv/usrgrp/ICertUserLocator.java  |    0
 .../src/com/netscape/certsrv/usrgrp/IGroup.java    |    0
 .../netscape/certsrv/usrgrp/IGroupConstants.java   |    0
 .../com/netscape/certsrv/usrgrp/IIdEvaluator.java  |    0
 .../com/netscape/certsrv/usrgrp/IUGSubsystem.java  |    0
 .../src/com/netscape/certsrv/usrgrp/IUser.java     |    0
 .../netscape/certsrv/usrgrp/IUserConstants.java    |    0
 .../src/com/netscape/certsrv/usrgrp/IUsrGrp.java   |    0
 .../netscape/certsrv/usrgrp/UsrGrpResources.java   |    0
 .../src/com/netscape/certsrv/util/HttpInput.java   |    0
 .../com/netscape/certsrv/util/IStatsSubsystem.java |    0
 .../src/com/netscape/certsrv/util/StatsEvent.java  |    0
 .../netscape/cms/authentication/AVAPattern.java    |    0
 .../authentication/AgentCertAuthentication.java    |    0
 .../com/netscape/cms/authentication/CMCAuth.java   |    0
 .../src/com/netscape/cms/authentication/Crypt.java |    0
 .../com/netscape/cms/authentication/DNPattern.java |    0
 .../cms/authentication/DirBasedAuthentication.java |    0
 .../netscape/cms/authentication/FlatFileAuth.java  |    0
 .../netscape/cms/authentication/HashAuthData.java  |    0
 .../cms/authentication/HashAuthentication.java     |    0
 .../netscape/cms/authentication/PortalEnroll.java  |    0
 .../netscape/cms/authentication/RDNPattern.java    |    0
 .../SSLclientCertAuthentication.java               |    0
 .../netscape/cms/authentication/SharedSecret.java  |    0
 .../cms/authentication/TokenAuthentication.java    |    0
 .../authentication/UdnPwdDirAuthentication.java    |    0
 .../authentication/UidPwdDirAuthentication.java    |    0
 .../authentication/UidPwdPinDirAuthentication.java |    0
 .../com/netscape/cms/authorization/AAclAuthz.java  |    0
 .../netscape/cms/authorization/BasicAclAuthz.java  |    0
 .../netscape/cms/authorization/DirAclAuthz.java    |    0
 .../cms/crl/CMSAuthInfoAccessExtension.java        |    0
 .../crl/CMSAuthorityKeyIdentifierExtension.java    |    0
 .../netscape/cms/crl/CMSCRLNumberExtension.java    |    0
 .../netscape/cms/crl/CMSCRLReasonExtension.java    |    0
 .../cms/crl/CMSCertificateIssuerExtension.java     |    0
 .../cms/crl/CMSDeltaCRLIndicatorExtension.java     |    0
 .../netscape/cms/crl/CMSFreshestCRLExtension.java  |    0
 .../cms/crl/CMSHoldInstructionExtension.java       |    0
 .../cms/crl/CMSInvalidityDateExtension.java        |    0
 .../cms/crl/CMSIssuerAlternativeNameExtension.java |    0
 .../crl/CMSIssuingDistributionPointExtension.java  |    0
 .../cms/evaluators/GroupAccessEvaluator.java       |    0
 .../cms/evaluators/IPAddressAccessEvaluator.java   |    0
 .../cms/evaluators/UserAccessEvaluator.java        |    0
 .../cms/evaluators/UserOrigReqAccessEvaluator.java |    0
 .../common/src/com/netscape/cms/jobs/AJobBase.java |    0
 .../src/com/netscape/cms/jobs/PublishCertsJob.java |    0
 .../netscape/cms/jobs/RenewalNotificationJob.java  |    0
 .../com/netscape/cms/jobs/RequestInQueueJob.java   |    0
 .../com/netscape/cms/jobs/UnpublishExpiredJob.java |    0
 .../cms/listeners/CertificateIssuedListener.java   |    0
 .../cms/listeners/CertificateRevokedListener.java  |    0
 .../netscape/cms/listeners/PinRemovalListener.java |    0
 .../netscape/cms/listeners/RequestInQListener.java |    0
 .../src/com/netscape/cms/logging/LogEntry.java     |    0
 .../src/com/netscape/cms/logging/LogFile.java      |    0
 .../com/netscape/cms/logging/RollingLogFile.java   |    0
 .../cms/notification/MailNotification.java         |    0
 .../common/src/com/netscape/cms/ocsp/DefStore.java |    0
 .../src/com/netscape/cms/ocsp/LDAPStore.java       |    0
 .../com/netscape/cms/password/PasswordChecker.java |    0
 .../src/com/netscape/cms/policy/APolicyRule.java   |    0
 .../cms/policy/constraints/AgentPolicy.java        |    0
 .../constraints/AttributePresentConstraints.java   |    0
 .../cms/policy/constraints/DSAKeyConstraints.java  |    0
 .../cms/policy/constraints/DefaultRevocation.java  |    0
 .../cms/policy/constraints/IssuerConstraints.java  |    0
 .../constraints/KeyAlgorithmConstraints.java       |    0
 .../policy/constraints/ManualAuthentication.java   |    0
 .../cms/policy/constraints/RSAKeyConstraints.java  |    0
 .../cms/policy/constraints/RenewalConstraints.java |    0
 .../constraints/RenewalValidityConstraints.java    |    0
 .../policy/constraints/RevocationConstraints.java  |    0
 .../constraints/SigningAlgorithmConstraints.java   |    0
 .../policy/constraints/SubCANameConstraints.java   |    0
 .../cms/policy/constraints/UniqueSubjectName.java  |    0
 .../constraints/UniqueSubjectNameConstraints.java  |    0
 .../policy/constraints/ValidityConstraints.java    |    0
 .../cms/policy/extensions/AuthInfoAccessExt.java   |    0
 .../extensions/AuthorityKeyIdentifierExt.java      |    0
 .../cms/policy/extensions/BasicConstraintsExt.java |    0
 .../extensions/CRLDistributionPointsExt.java       |    0
 .../policy/extensions/CertificatePoliciesExt.java  |    0
 .../extensions/CertificateRenewalWindowExt.java    |    0
 .../extensions/CertificateScopeOfUseExt.java       |    0
 .../cms/policy/extensions/ExtendedKeyUsageExt.java |    0
 .../cms/policy/extensions/GenericASN1Ext.java      |    0
 .../cms/policy/extensions/IssuerAltNameExt.java    |    0
 .../cms/policy/extensions/KeyUsageExt.java         |    0
 .../cms/policy/extensions/NSCCommentExt.java       |    0
 .../cms/policy/extensions/NSCertTypeExt.java       |    0
 .../cms/policy/extensions/NameConstraintsExt.java  |    0
 .../cms/policy/extensions/OCSPNoCheckExt.java      |    0
 .../policy/extensions/PolicyConstraintsExt.java    |    0
 .../cms/policy/extensions/PolicyMappingsExt.java   |    0
 .../cms/policy/extensions/PresenceExt.java         |    0
 .../extensions/PrivateKeyUsagePeriodExt.java       |    0
 .../extensions/RemoveBasicConstraintsExt.java      |    0
 .../cms/policy/extensions/SubjAltNameExt.java      |    0
 .../cms/policy/extensions/SubjectAltNameExt.java   |    0
 .../extensions/SubjectDirectoryAttributesExt.java  |    0
 .../policy/extensions/SubjectKeyIdentifierExt.java |    0
 .../netscape/cms/profile/common/BasicProfile.java  |    0
 .../cms/profile/common/CACertCAEnrollProfile.java  |    0
 .../cms/profile/common/CAEnrollProfile.java        |    0
 .../netscape/cms/profile/common/EnrollProfile.java |    0
 .../cms/profile/common/EnrollProfileContext.java   |    0
 .../cms/profile/common/ProfileContext.java         |    0
 .../netscape/cms/profile/common/ProfilePolicy.java |    0
 .../cms/profile/common/RAEnrollProfile.java        |    0
 .../profile/common/ServerCertCAEnrollProfile.java  |    0
 .../profile/common/UserCertCAEnrollProfile.java    |    0
 .../constraint/BasicConstraintsExtConstraint.java  |    0
 .../cms/profile/constraint/CAEnrollConstraint.java |    0
 .../profile/constraint/CAValidityConstraint.java   |    0
 .../cms/profile/constraint/EnrollConstraint.java   |    0
 .../constraint/ExtendedKeyUsageExtConstraint.java  |    0
 .../profile/constraint/ExtensionConstraint.java    |    0
 .../cms/profile/constraint/KeyConstraint.java      |    0
 .../profile/constraint/KeyUsageExtConstraint.java  |    0
 .../constraint/NSCertTypeExtConstraint.java        |    0
 .../cms/profile/constraint/NoConstraint.java       |    0
 .../constraint/RenewGracePeriodConstraint.java     |    0
 .../profile/constraint/SigningAlgConstraint.java   |    0
 .../profile/constraint/SubjectNameConstraint.java  |    0
 .../profile/constraint/UniqueKeyConstraint.java    |    0
 .../constraint/UniqueSubjectNameConstraint.java    |    0
 .../cms/profile/constraint/ValidityConstraint.java |    0
 .../cms/profile/def/AuthInfoAccessExtDefault.java  |    0
 .../profile/def/AuthTokenSubjectNameDefault.java   |    0
 .../def/AuthorityKeyIdentifierExtDefault.java      |    0
 .../cms/profile/def/AutoAssignDefault.java         |    0
 .../profile/def/BasicConstraintsExtDefault.java    |    0
 .../netscape/cms/profile/def/CAEnrollDefault.java  |    0
 .../cms/profile/def/CAValidityDefault.java         |    0
 .../def/CRLDistributionPointsExtDefault.java       |    0
 .../profile/def/CertificatePoliciesExtDefault.java |    0
 .../cms/profile/def/CertificateVersionDefault.java |    0
 .../netscape/cms/profile/def/EnrollDefault.java    |    0
 .../netscape/cms/profile/def/EnrollExtDefault.java |    0
 .../profile/def/ExtendedKeyUsageExtDefault.java    |    0
 .../cms/profile/def/FreshestCRLExtDefault.java     |    0
 .../cms/profile/def/GenericExtDefault.java         |    0
 .../com/netscape/cms/profile/def/ImageDefault.java |    0
 .../profile/def/InhibitAnyPolicyExtDefault.java    |    0
 .../cms/profile/def/IssuerAltNameExtDefault.java   |    0
 .../cms/profile/def/KeyUsageExtDefault.java        |    0
 .../cms/profile/def/NSCCommentExtDefault.java      |    0
 .../cms/profile/def/NSCertTypeExtDefault.java      |    0
 .../cms/profile/def/NameConstraintsExtDefault.java |    0
 .../com/netscape/cms/profile/def/NoDefault.java    |    0
 .../cms/profile/def/OCSPNoCheckExtDefault.java     |    0
 .../profile/def/PolicyConstraintsExtDefault.java   |    0
 .../cms/profile/def/PolicyMappingsExtDefault.java  |    0
 .../def/PrivateKeyUsagePeriodExtDefault.java       |    0
 .../cms/profile/def/SigningAlgDefault.java         |    0
 .../cms/profile/def/SubjectAltNameExtDefault.java  |    0
 .../def/SubjectDirAttributesExtDefault.java        |    0
 .../profile/def/SubjectInfoAccessExtDefault.java   |    0
 .../def/SubjectKeyIdentifierExtDefault.java        |    0
 .../cms/profile/def/SubjectNameDefault.java        |    0
 .../cms/profile/def/UserExtensionDefault.java      |    0
 .../netscape/cms/profile/def/UserKeyDefault.java   |    0
 .../cms/profile/def/UserSigningAlgDefault.java     |    0
 .../cms/profile/def/UserSubjectNameDefault.java    |    0
 .../cms/profile/def/UserValidityDefault.java       |    0
 .../netscape/cms/profile/def/ValidityDefault.java  |    0
 .../cms/profile/def/nsHKeySubjectNameDefault.java  |    0
 .../cms/profile/def/nsNKeySubjectNameDefault.java  |    0
 .../def/nsTokenDeviceKeySubjectNameDefault.java    |    0
 .../def/nsTokenUserKeySubjectNameDefault.java      |    0
 .../cms/profile/input/CMCCertReqInput.java         |    0
 .../netscape/cms/profile/input/CertReqInput.java   |    0
 .../cms/profile/input/DualKeyGenInput.java         |    0
 .../cms/profile/input/EncryptionKeyGenInput.java   |    0
 .../netscape/cms/profile/input/EnrollInput.java    |    0
 .../cms/profile/input/FileSigningInput.java        |    0
 .../netscape/cms/profile/input/GenericInput.java   |    0
 .../com/netscape/cms/profile/input/ImageInput.java |    0
 .../netscape/cms/profile/input/KeyGenInput.java    |    0
 .../cms/profile/input/SerialNumRenewInput.java     |    0
 .../cms/profile/input/SigningKeyGenInput.java      |    0
 .../netscape/cms/profile/input/SubjectDNInput.java |    0
 .../cms/profile/input/SubjectNameInput.java        |    0
 .../cms/profile/input/SubmitterInfoInput.java      |    0
 .../cms/profile/input/nsHKeyCertReqInput.java      |    0
 .../cms/profile/input/nsNKeyCertReqInput.java      |    0
 .../netscape/cms/profile/output/CMMFOutput.java    |    0
 .../netscape/cms/profile/output/CertOutput.java    |    0
 .../netscape/cms/profile/output/EnrollOutput.java  |    0
 .../netscape/cms/profile/output/PKCS7Output.java   |    0
 .../netscape/cms/profile/output/nsNKeyOutput.java  |    0
 .../cms/profile/updater/SubsystemGroupUpdater.java |    0
 .../netscape/cms/publish/mappers/AVAPattern.java   |    0
 .../cms/publish/mappers/LdapCaSimpleMap.java       |    0
 .../cms/publish/mappers/LdapCertCompsMap.java      |    0
 .../cms/publish/mappers/LdapCertExactMap.java      |    0
 .../cms/publish/mappers/LdapCertSubjMap.java       |    0
 .../cms/publish/mappers/LdapCrlIssuerCompsMap.java |    0
 .../cms/publish/mappers/LdapDNCompsMap.java        |    0
 .../cms/publish/mappers/LdapEnhancedMap.java       |    0
 .../cms/publish/mappers/LdapSimpleMap.java         |    0
 .../cms/publish/mappers/MapAVAPattern.java         |    0
 .../netscape/cms/publish/mappers/MapDNPattern.java |    0
 .../cms/publish/mappers/MapRDNPattern.java         |    0
 .../com/netscape/cms/publish/mappers/NoMap.java    |    0
 .../cms/publish/publishers/FileBasedPublisher.java |    0
 .../publish/publishers/LdapCaCertPublisher.java    |    0
 .../publish/publishers/LdapCertSubjPublisher.java  |    0
 .../publishers/LdapCertificatePairPublisher.java   |    0
 .../cms/publish/publishers/LdapCrlPublisher.java   |    0
 .../publishers/LdapEncryptCertPublisher.java       |    0
 .../publish/publishers/LdapUserCertPublisher.java  |    0
 .../cms/publish/publishers/OCSPPublisher.java      |    0
 .../com/netscape/cms/publish/publishers/Utils.java |    0
 .../com/netscape/cms/request/RequestScheduler.java |    0
 .../src/com/netscape/cms/selftests/ASelfTest.java  |    0
 .../com/netscape/cms/selftests/ca/CAPresence.java  |    0
 .../com/netscape/cms/selftests/ca/CAValidity.java  |    0
 .../selftests/common/SystemCertsVerification.java  |    0
 .../netscape/cms/selftests/kra/KRAPresence.java    |    0
 .../netscape/cms/selftests/ocsp/OCSPPresence.java  |    0
 .../netscape/cms/selftests/ocsp/OCSPValidity.java  |    0
 .../com/netscape/cms/selftests/ra/RAPresence.java  |    0
 .../cms/selftests/tks/TKSKnownSessionKey.java      |    0
 .../cms/servlet/admin/ACLAdminServlet.java         |    0
 .../netscape/cms/servlet/admin/AdminResources.java |    0
 .../netscape/cms/servlet/admin/AdminServlet.java   |    0
 .../cms/servlet/admin/AuthAdminServlet.java        |    0
 .../cms/servlet/admin/AuthCredentials.java         |    0
 .../netscape/cms/servlet/admin/CAAdminServlet.java |    0
 .../cms/servlet/admin/CMSAdminServlet.java         |    0
 .../cms/servlet/admin/JobsAdminServlet.java        |    0
 .../cms/servlet/admin/KRAAdminServlet.java         |    0
 .../cms/servlet/admin/LogAdminServlet.java         |    0
 .../cms/servlet/admin/OCSPAdminServlet.java        |    0
 .../cms/servlet/admin/PolicyAdminServlet.java      |    0
 .../cms/servlet/admin/ProfileAdminServlet.java     |    0
 .../cms/servlet/admin/PublisherAdminServlet.java   |    0
 .../netscape/cms/servlet/admin/RAAdminServlet.java |    0
 .../cms/servlet/admin/RegistryAdminServlet.java    |    0
 .../cms/servlet/admin/UsrGrpAdminServlet.java      |    0
 .../com/netscape/cms/servlet/base/CMSServlet.java  |    0
 .../netscape/cms/servlet/base/CMSStartServlet.java |    0
 .../cms/servlet/base/DisplayHtmlServlet.java       |    0
 .../cms/servlet/base/DynamicVariablesServlet.java  |    0
 .../com/netscape/cms/servlet/base/GetStats.java    |    0
 .../netscape/cms/servlet/base/IndexServlet.java    |    0
 .../netscape/cms/servlet/base/PortsServlet.java    |    0
 .../netscape/cms/servlet/base/ProxyServlet.java    |    0
 .../cms/servlet/base/SystemInfoServlet.java        |    0
 .../com/netscape/cms/servlet/base/UserInfo.java    |    0
 .../cms/servlet/cert/CMCRevReqServlet.java         |    0
 .../servlet/cert/ChallengeRevocationServlet1.java  |    0
 .../netscape/cms/servlet/cert/CloneRedirect.java   |    0
 .../netscape/cms/servlet/cert/DirAuthServlet.java  |    0
 .../cms/servlet/cert/DisableEnrollResult.java      |    0
 .../netscape/cms/servlet/cert/DisplayBySerial.java |    0
 .../com/netscape/cms/servlet/cert/DisplayCRL.java  |    0
 .../cms/servlet/cert/DisplayHashUserEnroll.java    |    0
 .../com/netscape/cms/servlet/cert/DoRevoke.java    |    0
 .../com/netscape/cms/servlet/cert/DoRevokeTPS.java |    0
 .../com/netscape/cms/servlet/cert/DoUnrevoke.java  |    0
 .../netscape/cms/servlet/cert/DoUnrevokeTPS.java   |    0
 .../cms/servlet/cert/EnableEnrollResult.java       |    0
 .../netscape/cms/servlet/cert/EnrollServlet.java   |    0
 .../com/netscape/cms/servlet/cert/GetBySerial.java |    0
 .../com/netscape/cms/servlet/cert/GetCAChain.java  |    0
 .../src/com/netscape/cms/servlet/cert/GetCRL.java  |    0
 .../cms/servlet/cert/GetCertFromRequest.java       |    0
 .../netscape/cms/servlet/cert/GetEnableStatus.java |    0
 .../src/com/netscape/cms/servlet/cert/GetInfo.java |    0
 .../cms/servlet/cert/HashEnrollServlet.java        |    0
 .../servlet/cert/ImportCertsTemplateFiller.java    |    0
 .../com/netscape/cms/servlet/cert/ListCerts.java   |    0
 .../src/com/netscape/cms/servlet/cert/Monitor.java |    0
 .../netscape/cms/servlet/cert/ReasonToRevoke.java  |    0
 .../cms/servlet/cert/RemoteAuthConfig.java         |    0
 .../netscape/cms/servlet/cert/RenewalServlet.java  |    0
 .../cms/servlet/cert/RevocationServlet.java        |    0
 .../cert/RevocationSuccessTemplateFiller.java      |    0
 .../com/netscape/cms/servlet/cert/SrchCerts.java   |    0
 .../com/netscape/cms/servlet/cert/UpdateCRL.java   |    0
 .../com/netscape/cms/servlet/cert/UpdateDir.java   |    0
 .../cms/servlet/cert/scep/CRSEnrollment.java       |    0
 .../cms/servlet/cert/scep/ChallengePassword.java   |    0
 .../cms/servlet/cert/scep/ExtensionsRequested.java |    0
 .../cms/servlet/common/AuthCredentials.java        |    0
 .../cms/servlet/common/CMCOutputTemplate.java      |    0
 .../com/netscape/cms/servlet/common/CMSFile.java   |    0
 .../netscape/cms/servlet/common/CMSFileLoader.java |    0
 .../cms/servlet/common/CMSGWResources.java         |    0
 .../netscape/cms/servlet/common/CMSGateway.java    |    0
 .../cms/servlet/common/CMSLoadTemplate.java        |    0
 .../netscape/cms/servlet/common/CMSRequest.java    |    0
 .../netscape/cms/servlet/common/CMSTemplate.java   |    0
 .../cms/servlet/common/CMSTemplateParams.java      |    0
 .../cms/servlet/common/ECMSGWException.java        |    0
 .../cms/servlet/common/GenErrorTemplateFiller.java |    0
 .../servlet/common/GenPendingTemplateFiller.java   |    0
 .../servlet/common/GenRejectedTemplateFiller.java  |    0
 .../servlet/common/GenSuccessTemplateFiller.java   |    0
 .../common/GenSvcPendingTemplateFiller.java        |    0
 .../common/GenUnauthorizedTemplateFiller.java      |    0
 .../common/GenUnexpectedErrorTemplateFiller.java   |    0
 .../cms/servlet/common/ICMSTemplateFiller.java     |    0
 .../com/netscape/cms/servlet/common/IRawJS.java    |    0
 .../cms/servlet/common/IndexTemplateFiller.java    |    0
 .../src/com/netscape/cms/servlet/common/RawJS.java |    0
 .../src/com/netscape/cms/servlet/common/Utils.java |    0
 .../cms/servlet/connector/CloneServlet.java        |    0
 .../cms/servlet/connector/ConnectorServlet.java    |    0
 .../servlet/connector/GenerateKeyPairServlet.java  |    0
 .../servlet/connector/TokenKeyRecoveryServlet.java |    0
 .../servlet/csadmin/AdminAuthenticatePanel.java    |    0
 .../netscape/cms/servlet/csadmin/AdminPanel.java   |    0
 .../servlet/csadmin/AgentAuthenticatePanel.java    |    0
 .../cms/servlet/csadmin/AuthenticatePanel.java     |    0
 .../cms/servlet/csadmin/BackupKeyCertPanel.java    |    0
 .../netscape/cms/servlet/csadmin/BaseServlet.java  |    0
 .../netscape/cms/servlet/csadmin/CAInfoPanel.java  |    0
 .../src/com/netscape/cms/servlet/csadmin/Cert.java |    0
 .../cms/servlet/csadmin/CertPrettyPrintPanel.java  |    0
 .../cms/servlet/csadmin/CertRequestPanel.java      |    0
 .../com/netscape/cms/servlet/csadmin/CertUtil.java |    0
 .../cms/servlet/csadmin/CheckIdentity.java         |    0
 .../cms/servlet/csadmin/ConfigBaseServlet.java     |    0
 .../csadmin/ConfigCertApprovalCallback.java        |    0
 .../cms/servlet/csadmin/ConfigCertReqServlet.java  |    0
 .../cms/servlet/csadmin/ConfigCloneServlet.java    |    0
 .../cms/servlet/csadmin/ConfigDatabaseServlet.java |    0
 .../cms/servlet/csadmin/ConfigHSMLoginPanel.java   |    0
 .../cms/servlet/csadmin/ConfigHSMServlet.java      |    0
 .../servlet/csadmin/ConfigImportCertServlet.java   |    0
 .../cms/servlet/csadmin/ConfigJoinServlet.java     |    0
 .../cms/servlet/csadmin/ConfigRootCAServlet.java   |    0
 .../cms/servlet/csadmin/CreateSubsystemPanel.java  |    0
 .../cms/servlet/csadmin/DatabasePanel.java         |    0
 .../cms/servlet/csadmin/DatabaseServlet.java       |    0
 .../cms/servlet/csadmin/DisplayCertChainPanel.java |    0
 .../cms/servlet/csadmin/DisplayServlet.java        |    0
 .../netscape/cms/servlet/csadmin/DonePanel.java    |    0
 .../cms/servlet/csadmin/DownloadPKCS12.java        |    0
 .../netscape/cms/servlet/csadmin/GetCertChain.java |    0
 .../cms/servlet/csadmin/GetConfigEntries.java      |    0
 .../netscape/cms/servlet/csadmin/GetCookie.java    |    0
 .../netscape/cms/servlet/csadmin/GetDomainXML.java |    0
 .../netscape/cms/servlet/csadmin/GetStatus.java    |    0
 .../cms/servlet/csadmin/GetSubsystemCert.java      |    0
 .../netscape/cms/servlet/csadmin/GetTokenInfo.java |    0
 .../cms/servlet/csadmin/GetTransportCert.java      |    0
 .../cms/servlet/csadmin/HierarchyPanel.java        |    0
 .../cms/servlet/csadmin/ImportAdminCertPanel.java  |    0
 .../cms/servlet/csadmin/ImportCAChainPanel.java    |    0
 .../cms/servlet/csadmin/ImportTransportCert.java   |    0
 .../csadmin/LDAPSecurityDomainSessionTable.java    |    0
 .../netscape/cms/servlet/csadmin/LoginServlet.java |    0
 .../cms/servlet/csadmin/MainPageServlet.java       |    0
 .../netscape/cms/servlet/csadmin/ModulePanel.java  |    0
 .../cms/servlet/csadmin/ModuleServlet.java         |    0
 .../netscape/cms/servlet/csadmin/NamePanel.java    |    0
 .../netscape/cms/servlet/csadmin/RegisterUser.java |    0
 .../cms/servlet/csadmin/RestoreKeyCertPanel.java   |    0
 .../cms/servlet/csadmin/SavePKCS12Panel.java       |    0
 .../cms/servlet/csadmin/SecurityDomainLogin.java   |    0
 .../cms/servlet/csadmin/SecurityDomainPanel.java   |    0
 .../csadmin/SecurityDomainSessionTable.java        |    0
 .../netscape/cms/servlet/csadmin/SessionTimer.java |    0
 .../netscape/cms/servlet/csadmin/SizePanel.java    |    0
 .../cms/servlet/csadmin/TokenAuthenticate.java     |    0
 .../cms/servlet/csadmin/UpdateConnector.java       |    0
 .../cms/servlet/csadmin/UpdateDomainXML.java       |    0
 .../cms/servlet/csadmin/UpdateNumberRange.java     |    0
 .../cms/servlet/csadmin/UpdateOCSPConfig.java      |    0
 .../netscape/cms/servlet/csadmin/WelcomePanel.java |    0
 .../cms/servlet/csadmin/WelcomeServlet.java        |    0
 .../cms/servlet/csadmin/WizardPanelBase.java       |    0
 .../cms/servlet/filter/AdminRequestFilter.java     |    0
 .../cms/servlet/filter/AgentRequestFilter.java     |    0
 .../servlet/filter/EEClientAuthRequestFilter.java  |    0
 .../cms/servlet/filter/EERequestFilter.java        |    0
 .../cms/servlet/key/ConfirmRecoverBySerial.java    |    0
 .../netscape/cms/servlet/key/DisplayBySerial.java  |    0
 .../servlet/key/DisplayBySerialForRecovery.java    |    0
 .../netscape/cms/servlet/key/DisplayTransport.java |    0
 .../netscape/cms/servlet/key/ExamineRecovery.java  |    0
 .../cms/servlet/key/GetApprovalStatus.java         |    0
 .../com/netscape/cms/servlet/key/GetAsyncPk12.java |    0
 .../src/com/netscape/cms/servlet/key/GetPk12.java  |    0
 .../cms/servlet/key/GrantAsyncRecovery.java        |    0
 .../netscape/cms/servlet/key/GrantRecovery.java    |    0
 .../netscape/cms/servlet/key/KeyRecordParser.java  |    0
 .../netscape/cms/servlet/key/RecoverBySerial.java  |    0
 .../src/com/netscape/cms/servlet/key/SrchKey.java  |    0
 .../cms/servlet/key/SrchKeyForRecovery.java        |    0
 .../netscape/cms/servlet/ocsp/AddCAServlet.java    |    0
 .../netscape/cms/servlet/ocsp/AddCRLServlet.java   |    0
 .../cms/servlet/ocsp/CheckCertServlet.java         |    0
 .../com/netscape/cms/servlet/ocsp/GetOCSPInfo.java |    0
 .../netscape/cms/servlet/ocsp/ListCAServlet.java   |    0
 .../com/netscape/cms/servlet/ocsp/OCSPServlet.java |    0
 .../netscape/cms/servlet/ocsp/RemoveCAServlet.java |    0
 .../cms/servlet/processors/CMCProcessor.java       |    0
 .../cms/servlet/processors/CRMFProcessor.java      |    0
 .../cms/servlet/processors/IPKIProcessor.java      |    0
 .../cms/servlet/processors/KeyGenProcessor.java    |    0
 .../cms/servlet/processors/PKCS10Processor.java    |    0
 .../cms/servlet/processors/PKIProcessor.java       |    0
 .../cms/servlet/profile/ProfileApproveServlet.java |    0
 .../cms/servlet/profile/ProfileListServlet.java    |    0
 .../cms/servlet/profile/ProfileProcessServlet.java |    0
 .../cms/servlet/profile/ProfileReviewServlet.java  |    0
 .../cms/servlet/profile/ProfileSelectServlet.java  |    0
 .../cms/servlet/profile/ProfileServlet.java        |    0
 .../servlet/profile/ProfileSubmitCMCServlet.java   |    0
 .../cms/servlet/profile/ProfileSubmitServlet.java  |    0
 .../cms/servlet/profile/SSLClientCertProvider.java |    0
 .../cms/servlet/request/CertReqParser.java         |    0
 .../netscape/cms/servlet/request/CheckRequest.java |    0
 .../netscape/cms/servlet/request/IReqParser.java   |    0
 .../netscape/cms/servlet/request/KeyReqParser.java |    0
 .../cms/servlet/request/ProcessCertReq.java        |    0
 .../netscape/cms/servlet/request/ProcessReq.java   |    0
 .../com/netscape/cms/servlet/request/QueryReq.java |    0
 .../netscape/cms/servlet/request/ReqParser.java    |    0
 .../netscape/cms/servlet/request/SearchReqs.java   |    0
 .../com/netscape/cms/servlet/tks/TokenServlet.java |    0
 .../netscape/cms/servlet/wizard/IWizardPanel.java  |    0
 .../netscape/cms/servlet/wizard/WizardServlet.java |    0
 .../src/com/netscape/cms/shares/OldJoinShares.java |    0
 .../src/com/netscape/cms/shares/OldShare.java      |    0
 .../src/com/netscape/cmscore/apps/CMSEngine.java   |    0
 .../com/netscape/cmscore/apps/CommandQueue.java    |    0
 .../com/netscape/cmscore/apps/PKIServerEvent.java  |    0
 .../netscape/cmscore/apps/PKIServerListener.java   |    0
 .../src/com/netscape/cmscore/apps/Setup.java       |    0
 .../src/com/netscape/cmscore/apps/Upgrade.java     |    0
 .../cmscore/authentication/AuthSubsystem.java      |    0
 .../authentication/CertUserDBAuthentication.java   |    0
 .../ChallengePhraseAuthentication.java             |    0
 .../cmscore/authentication/NullAuthentication.java |    0
 .../authentication/PasswdUserDBAuthentication.java |    0
 .../SSLClientCertAuthentication.java               |    0
 .../cmscore/authentication/VerifiedCert.java       |    0
 .../cmscore/authentication/VerifiedCerts.java      |    0
 .../cmscore/authorization/AuthzSubsystem.java      |    0
 .../src/com/netscape/cmscore/base/ArgBlock.java    |    0
 .../com/netscape/cmscore/base/FileConfigStore.java |    0
 .../cmscore/base/JDialogPasswordCallback.java      |    0
 .../com/netscape/cmscore/base/PropConfigStore.java |    0
 .../netscape/cmscore/base/SimpleProperties.java    |    0
 .../netscape/cmscore/base/SourceConfigStore.java   |    0
 .../com/netscape/cmscore/base/SubsystemLoader.java |    0
 .../netscape/cmscore/base/SubsystemRegistry.java   |    0
 .../com/netscape/cmscore/cert/CertDateCompare.java |    0
 .../com/netscape/cmscore/cert/CertPrettyPrint.java |    0
 .../src/com/netscape/cmscore/cert/CertUtils.java   |    0
 .../com/netscape/cmscore/cert/CertificatePair.java |    0
 .../netscape/cmscore/cert/CrlCachePrettyPrint.java |    0
 .../com/netscape/cmscore/cert/CrlPrettyPrint.java  |    0
 .../cmscore/cert/CrossCertPairSubsystem.java       |    0
 .../com/netscape/cmscore/cert/ExtPrettyPrint.java  |    0
 .../netscape/cmscore/cert/OidLoaderSubsystem.java  |    0
 .../netscape/cmscore/cert/PrettyPrintFormat.java   |    0
 .../cmscore/cert/PrettyPrintResources.java         |    0
 .../netscape/cmscore/cert/PubKeyPrettyPrint.java   |    0
 .../netscape/cmscore/cert/X500NameSubsystem.java   |    0
 .../cmscore/connector/HttpConnFactory.java         |    0
 .../netscape/cmscore/connector/HttpConnection.java |    0
 .../netscape/cmscore/connector/HttpConnector.java  |    0
 .../netscape/cmscore/connector/HttpPKIMessage.java |    0
 .../cmscore/connector/HttpRequestEncoder.java      |    0
 .../netscape/cmscore/connector/LocalConnector.java |    0
 .../cmscore/connector/RemoteAuthority.java         |    0
 .../cmscore/connector/RequestTransfer.java         |    0
 .../com/netscape/cmscore/connector/Resender.java   |    0
 .../src/com/netscape/cmscore/crmf/CRMFParser.java  |    0
 .../cmscore/crmf/PKIArchiveOptionsContainer.java   |    0
 .../com/netscape/cmscore/dbs/BigIntegerMapper.java |    0
 .../com/netscape/cmscore/dbs/ByteArrayMapper.java  |    0
 .../src/com/netscape/cmscore/dbs/CRLDBSchema.java  |    0
 .../cmscore/dbs/CRLIssuingPointRecord.java         |    0
 .../com/netscape/cmscore/dbs/CRLRepository.java    |    0
 .../src/com/netscape/cmscore/dbs/CertDBSchema.java |    0
 .../src/com/netscape/cmscore/dbs/CertRecord.java   |    0
 .../com/netscape/cmscore/dbs/CertRecordList.java   |    0
 .../com/netscape/cmscore/dbs/CertRecordMapper.java |    0
 .../cmscore/dbs/CertificateRepository.java         |    0
 .../src/com/netscape/cmscore/dbs/DBRegistry.java   |    0
 .../src/com/netscape/cmscore/dbs/DBSSession.java   |    0
 .../src/com/netscape/cmscore/dbs/DBSUtil.java      |    0
 .../com/netscape/cmscore/dbs/DBSearchResults.java  |    0
 .../src/com/netscape/cmscore/dbs/DBSubsystem.java  |    0
 .../com/netscape/cmscore/dbs/DBVirtualList.java    |    0
 .../com/netscape/cmscore/dbs/DateArrayMapper.java  |    0
 .../src/com/netscape/cmscore/dbs/DateMapper.java   |    0
 .../com/netscape/cmscore/dbs/IntegerMapper.java    |    0
 .../src/com/netscape/cmscore/dbs/KeyDBSchema.java  |    0
 .../src/com/netscape/cmscore/dbs/KeyRecord.java    |    0
 .../com/netscape/cmscore/dbs/KeyRecordList.java    |    0
 .../com/netscape/cmscore/dbs/KeyRecordMapper.java  |    0
 .../com/netscape/cmscore/dbs/KeyRepository.java    |    0
 .../com/netscape/cmscore/dbs/KeyStateMapper.java   |    0
 .../netscape/cmscore/dbs/LdapFilterConverter.java  |    0
 .../src/com/netscape/cmscore/dbs/LongMapper.java   |    0
 .../com/netscape/cmscore/dbs/MetaInfoMapper.java   |    0
 .../netscape/cmscore/dbs/ObjectStreamMapper.java   |    0
 .../com/netscape/cmscore/dbs/PublicKeyMapper.java  |    0
 .../netscape/cmscore/dbs/ReplicaIDRepository.java  |    0
 .../src/com/netscape/cmscore/dbs/Repository.java   |    0
 .../com/netscape/cmscore/dbs/RepositoryRecord.java |    0
 .../com/netscape/cmscore/dbs/RepositorySchema.java |    0
 .../com/netscape/cmscore/dbs/RevocationInfo.java   |    0
 .../netscape/cmscore/dbs/RevocationInfoMapper.java |    0
 .../src/com/netscape/cmscore/dbs/StringMapper.java |    0
 .../netscape/cmscore/dbs/StringVectorMapper.java   |    0
 .../com/netscape/cmscore/dbs/X500NameMapper.java   |    0
 .../netscape/cmscore/dbs/X509CertImplMapper.java   |    0
 .../cmscore/extensions/CMSExtensionsMap.java       |    0
 .../com/netscape/cmscore/extensions/KeyUsage.java  |    0
 .../src/com/netscape/cmscore/jobs/CronItem.java    |    0
 .../src/com/netscape/cmscore/jobs/CronRange.java   |    0
 .../src/com/netscape/cmscore/jobs/JobCron.java     |    0
 .../com/netscape/cmscore/jobs/JobsScheduler.java   |    0
 .../netscape/cmscore/ldap/LdapAndExpression.java   |    0
 .../com/netscape/cmscore/ldap/LdapConnModule.java  |    0
 .../netscape/cmscore/ldap/LdapOrExpression.java    |    0
 .../netscape/cmscore/ldap/LdapPredicateParser.java |    0
 .../netscape/cmscore/ldap/LdapPublishModule.java   |    0
 .../netscape/cmscore/ldap/LdapRequestListener.java |    0
 .../src/com/netscape/cmscore/ldap/LdapRule.java    |    0
 .../cmscore/ldap/LdapSimpleExpression.java         |    0
 .../com/netscape/cmscore/ldap/PublishObject.java   |    0
 .../netscape/cmscore/ldap/PublisherProcessor.java  |    0
 .../cmscore/ldapconn/LdapAnonConnFactory.java      |    0
 .../cmscore/ldapconn/LdapAnonConnection.java       |    0
 .../netscape/cmscore/ldapconn/LdapAuthInfo.java    |    0
 .../cmscore/ldapconn/LdapBoundConnFactory.java     |    0
 .../cmscore/ldapconn/LdapBoundConnection.java      |    0
 .../netscape/cmscore/ldapconn/LdapConnInfo.java    |    0
 .../cmscore/ldapconn/LdapJssSSLSocketFactory.java  |    0
 .../netscape/cmscore/listeners/ListenerPlugin.java |    0
 .../cmscore/logging/AuditEventFactory.java         |    0
 .../com/netscape/cmscore/logging/AuditFormat.java  |    0
 .../src/com/netscape/cmscore/logging/LogQueue.java |    0
 .../com/netscape/cmscore/logging/LogSubsystem.java |    0
 .../src/com/netscape/cmscore/logging/Logger.java   |    0
 .../cmscore/logging/SignedAuditEventFactory.java   |    0
 .../cmscore/logging/SignedAuditLogger.java         |    0
 .../cmscore/logging/SystemEventFactory.java        |    0
 .../cmscore/notification/EmailFormProcessor.java   |    0
 .../cmscore/notification/EmailResolverKeys.java    |    0
 .../cmscore/notification/EmailTemplate.java        |    0
 .../cmscore/notification/ReqCertEmailResolver.java |    0
 .../notification/ReqCertSANameEmailResolver.java   |    0
 .../com/netscape/cmscore/policy/AndExpression.java |    0
 .../netscape/cmscore/policy/GeneralNameUtil.java   |    0
 .../cmscore/policy/GenericPolicyProcessor.java     |    0
 .../cmscore/policy/JavaScriptRequestProxy.java     |    0
 .../com/netscape/cmscore/policy/OrExpression.java  |    0
 .../cmscore/policy/PolicyPredicateParser.java      |    0
 .../src/com/netscape/cmscore/policy/PolicySet.java |    0
 .../netscape/cmscore/policy/SimpleExpression.java  |    0
 .../netscape/cmscore/profile/ProfileSubsystem.java |    0
 .../com/netscape/cmscore/registry/PluginInfo.java  |    0
 .../netscape/cmscore/registry/PluginRegistry.java  |    0
 .../netscape/cmscore/request/ARequestQueue.java    |    0
 .../netscape/cmscore/request/ARequestRecord.java   |    0
 .../cmscore/request/CertRequestConstants.java      |    0
 .../netscape/cmscore/request/ExtDataHashtable.java |    0
 .../com/netscape/cmscore/request/RequestAttr.java  |    0
 .../com/netscape/cmscore/request/RequestQueue.java |    0
 .../netscape/cmscore/request/RequestRecord.java    |    0
 .../cmscore/request/RequestRepository.java         |    0
 .../netscape/cmscore/request/RequestSubsystem.java |    0
 .../src/com/netscape/cmscore/request/Schema.java   |    0
 .../netscape/cmscore/security/CASigningCert.java   |    0
 .../netscape/cmscore/security/CertificateInfo.java |    0
 .../netscape/cmscore/security/JssSubsystem.java    |    0
 .../cmscore/security/KRATransportCert.java         |    0
 .../com/netscape/cmscore/security/KeyCertUtil.java |    0
 .../netscape/cmscore/security/OCSPSigningCert.java |    0
 .../src/com/netscape/cmscore/security/PWCBsdr.java |    0
 .../src/com/netscape/cmscore/security/PWUtil.java  |    0
 .../com/netscape/cmscore/security/PWsdrCache.java  |    0
 .../com/netscape/cmscore/security/Provider.java    |    0
 .../netscape/cmscore/security/RASigningCert.java   |    0
 .../src/com/netscape/cmscore/security/SSLCert.java |    0
 .../cmscore/security/SSLSelfSignedCert.java        |    0
 .../netscape/cmscore/security/SubsystemCert.java   |    0
 .../cmscore/selftests/SelfTestOrderedInstance.java |    0
 .../cmscore/selftests/SelfTestSubsystem.java       |    0
 .../netscape/cmscore/time/SimpleTimeSource.java    |    0
 .../cmscore/usrgrp/CertDNCertUserLocator.java      |    0
 .../cmscore/usrgrp/ExactMatchCertUserLocator.java  |    0
 .../src/com/netscape/cmscore/usrgrp/Group.java     |    0
 .../com/netscape/cmscore/usrgrp/UGSubsystem.java   |    0
 .../src/com/netscape/cmscore/usrgrp/User.java      |    0
 .../src/com/netscape/cmscore/util/Assert.java      |    0
 .../netscape/cmscore/util/AssertionException.java  |    0
 .../src/com/netscape/cmscore/util/Debug.java       |    0
 .../netscape/cmscore/util/ExceptionFormatter.java  |    0
 .../com/netscape/cmscore/util/FileAsString.java    |    0
 .../netscape/cmscore/util/FileDialogFilter.java    |    0
 .../src/com/netscape/cmscore/util/OsSubsystem.java |    0
 .../src/com/netscape/cmscore/util/PFXUtils.java    |    0
 .../netscape/cmscore/util/ProfileSubsystem.java    |    0
 .../com/netscape/cmscore/util/StatsSubsystem.java  |    0
 .../src/com/netscape/cmscore/util/UtilMessage.java |    0
 .../com/netscape/cmscore/util/UtilResources.java   |    0
 .../netscape/certsrv/app/CMSEngineDefaultStub.java |    0
 .../certsrv/authentication/AuthTokenTest.java      |    0
 .../certsrv/logging/LoggerDefaultStub.java         |    0
 .../certsrv/request/AgentApprovalsTest.java        |    0
 .../netscape/cmscore/dbs/CertRecordListTest.java   |    0
 .../cmscore/dbs/DBRegistryDefaultStub.java         |    0
 .../com/netscape/cmscore/dbs/DBRegistryTest.java   |    0
 .../cmscore/dbs/DBSSessionDefaultStub.java         |    0
 .../cmscore/dbs/DBSubsystemDefaultStub.java        |    0
 .../cmscore/dbs/DBVirtualListDefaultStub.java      |    0
 .../cmscore/dbs/RequestRecordDefaultStub.java      |    0
 .../request/DBDynAttrMapperDefaultStub.java        |    0
 .../cmscore/request/ExtAttrDynMapperTest.java      |    0
 .../cmscore/request/ExtDataHashtableTest.java      |    0
 .../cmscore/request/RequestDefaultStub.java        |    0
 .../cmscore/request/RequestModDefaultStub.java     |    0
 .../netscape/cmscore/request/RequestQueueTest.java |    0
 .../cmscore/request/RequestRecordTest.java         |    0
 .../com/netscape/cmscore/request/RequestTest.java  |    0
 .../com/netscape/cmscore/test/CMSBaseTestCase.java |    0
 .../test/com/netscape/cmscore/test/TestHelper.java |    0
 {pki/base => base}/console/CMakeLists.txt          |    0
 {pki/base => base}/console/LICENSE                 |    0
 {pki/base => base}/console/src/CMakeLists.txt      |    0
 .../netscape/admin/certsrv/AttrCellRenderer.java   |    0
 .../src/com/netscape/admin/certsrv/CMSAdmin.java   |    0
 .../netscape/admin/certsrv/CMSAdminResources.java  |    0
 .../com/netscape/admin/certsrv/CMSAdminUtil.java   |    0
 .../netscape/admin/certsrv/CMSBaseMenuInfo.java    |    0
 .../com/netscape/admin/certsrv/CMSBasePanel.java   |    0
 .../admin/certsrv/CMSBaseResourceModel.java        |    0
 .../com/netscape/admin/certsrv/CMSCAUILoader.java  |    0
 .../com/netscape/admin/certsrv/CMSCCMUILoader.java |    0
 .../admin/certsrv/CMSContentTableModel.java        |    0
 .../com/netscape/admin/certsrv/CMSEAUILoader.java  |    0
 .../netscape/admin/certsrv/CMSKernelUILoader.java  |    0
 .../com/netscape/admin/certsrv/CMSMessageBox.java  |    0
 .../netscape/admin/certsrv/CMSOCSPUILoader.java    |    0
 .../com/netscape/admin/certsrv/CMSPageFeeder.java  |    0
 .../com/netscape/admin/certsrv/CMSPassword.java    |    0
 .../com/netscape/admin/certsrv/CMSRAUILoader.java  |    0
 .../admin/certsrv/CMSRemoteClassLoader.java        |    0
 .../netscape/admin/certsrv/CMSResourceObject.java  |    0
 .../netscape/admin/certsrv/CMSResourcePage.java    |    0
 .../com/netscape/admin/certsrv/CMSServerInfo.java  |    0
 .../com/netscape/admin/certsrv/CMSTableModel.java  |    0
 .../com/netscape/admin/certsrv/CMSTaskModel.java   |    0
 .../com/netscape/admin/certsrv/CMSTaskObject.java  |    0
 .../com/netscape/admin/certsrv/CMSUIFramework.java |    0
 .../com/netscape/admin/certsrv/CellEditorData.java |    0
 .../src/com/netscape/admin/certsrv/Console.java    |    0
 .../com/netscape/admin/certsrv/CustomComboBox.java |    0
 .../admin/certsrv/CustomComboBoxModel.java         |    0
 .../admin/certsrv/DefaultTableCellEditor.java      |    0
 .../netscape/admin/certsrv/EAdminException.java    |    0
 .../netscape/admin/certsrv/GenericCellEditor.java  |    0
 .../admin/certsrv/GenericCellRenderer.java         |    0
 .../src/com/netscape/admin/certsrv/HourGlass.java  |    0
 .../netscape/admin/certsrv/IAttributeContent.java  |    0
 .../admin/certsrv/IConnectionListener.java         |    0
 .../com/netscape/admin/certsrv/IDataProcessor.java |    0
 .../com/netscape/admin/certsrv/IDisplayPanel.java  |    0
 .../com/netscape/admin/certsrv/IEditorPanel.java   |    0
 .../com/netscape/admin/certsrv/IFilterPanel.java   |    0
 .../com/netscape/admin/certsrv/IMenuAction.java    |    0
 .../com/netscape/admin/certsrv/IRefreshTab.java    |    0
 .../netscape/admin/certsrv/IRefreshTabPanel.java   |    0
 .../admin/certsrv/IResourceSelectionListener.java  |    0
 .../netscape/admin/certsrv/ISubSystemUILoader.java |    0
 .../src/com/netscape/admin/certsrv/IUIMapper.java  |    0
 .../netscape/admin/certsrv/LabelCellRenderer.java  |    0
 .../netscape/admin/certsrv/MultilineLabelUI.java   |    0
 .../admin/certsrv/PasswordCellRenderer.java        |    0
 .../certsrv/StatusItemContinuousProgress.java      |    0
 .../netscape/admin/certsrv/UIMapperRegistry.java   |    0
 .../netscape/admin/certsrv/certsrv-help.properties |    0
 .../netscape/admin/certsrv/config/ACIDialog.java   |    0
 .../admin/certsrv/config/ACLDataModel.java         |    0
 .../admin/certsrv/config/ACLEditDialog.java        |    0
 .../admin/certsrv/config/ACLImplDataModel.java     |    0
 .../netscape/admin/certsrv/config/ACLImplTab.java  |    0
 .../netscape/admin/certsrv/config/ACLPanel.java    |    0
 .../admin/certsrv/config/AutoRecoveryModel.java    |    0
 .../netscape/admin/certsrv/config/CACertsTab.java  |    0
 .../admin/certsrv/config/CMSAccessLogPanel.java    |    0
 .../admin/certsrv/config/CMSAuditLogPanel.java     |    0
 .../admin/certsrv/config/CMSAutoRecovery.java      |    0
 .../admin/certsrv/config/CMSBaseConfigDialog.java  |    0
 .../admin/certsrv/config/CMSBaseConfigPanel.java   |    0
 .../admin/certsrv/config/CMSBaseLDAPPanel.java     |    0
 .../admin/certsrv/config/CMSBaseLogPanel.java      |    0
 .../netscape/admin/certsrv/config/CMSBaseTab.java  |    0
 .../admin/certsrv/config/CMSBlankPanel.java        |    0
 .../certsrv/config/CMSCACertSettingPanel.java      |    0
 .../admin/certsrv/config/CMSCAConnectorPanel.java  |    0
 .../admin/certsrv/config/CMSCAGeneralPanel.java    |    0
 .../admin/certsrv/config/CMSCALDAPPanel.java       |    0
 .../admin/certsrv/config/CMSCRLCachePanel.java     |    0
 .../admin/certsrv/config/CMSCRLFormatPanel.java    |    0
 .../admin/certsrv/config/CMSCRLIPPanel.java        |    0
 .../admin/certsrv/config/CMSCRLSettingPanel.java   |    0
 .../admin/certsrv/config/CMSCertSettingPanel.java  |    0
 .../certsrv/config/CMSCipherPreferenceDialog.java  |    0
 .../certsrv/config/CMSCipherPreferencePane.java    |    0
 .../admin/certsrv/config/CMSEAGeneralPanel.java    |    0
 .../admin/certsrv/config/CMSEncryptionPanel.java   |    0
 .../admin/certsrv/config/CMSErrorLogPanel.java     |    0
 .../admin/certsrv/config/CMSKRAAutoPanel.java      |    0
 .../admin/certsrv/config/CMSKRAPasswdPanel.java    |    0
 .../admin/certsrv/config/CMSKRASchemePanel.java    |    0
 .../admin/certsrv/config/CMSLDAPSettingPanel.java  |    0
 .../admin/certsrv/config/CMSNetworkPanel.java      |    0
 .../admin/certsrv/config/CMSOCSPGeneralPanel.java  |    0
 .../admin/certsrv/config/CMSPasswordDialog.java    |    0
 .../admin/certsrv/config/CMSPluginInstanceTab.java |    0
 .../admin/certsrv/config/CMSRACLMPanel.java        |    0
 .../admin/certsrv/config/CMSRAConnectorPanel.java  |    0
 .../admin/certsrv/config/CMSRAGeneralPanel.java    |    0
 .../admin/certsrv/config/CMSRALDAPPanel.java       |    0
 .../admin/certsrv/config/CMSRuleDataModel.java     |    0
 .../admin/certsrv/config/CMSSMTPPanel.java         |    0
 .../admin/certsrv/config/CMSSNMPPanel.java         |    0
 .../certsrv/config/CMSSSL2CipherPreference.java    |    0
 .../admin/certsrv/config/CMSSSL2CipherSet.java     |    0
 .../certsrv/config/CMSSSL3CipherPreference.java    |    0
 .../admin/certsrv/config/CMSSSL3CipherSet.java     |    0
 .../admin/certsrv/config/CMSSelfTestsPanel.java    |    0
 .../netscape/admin/certsrv/config/CMSTabPanel.java |    0
 .../certsrv/config/CMSUserCertSettingPanel.java    |    0
 .../certsrv/config/CMStoAdminEncryptionPane.java   |    0
 .../certsrv/config/CRLExtensionsConfigDialog.java  |    0
 .../certsrv/config/CRLExtensionsInstanceTab.java   |    0
 .../config/CRLExtensionsPluginSelectionDialog.java |    0
 .../certsrv/config/CRLExtensionsRuleDataModel.java |    0
 .../netscape/admin/certsrv/config/CRLIPEditor.java |    0
 .../admin/certsrv/config/ConfigTableModel.java     |    0
 .../admin/certsrv/config/ConnectorEditor.java      |    0
 .../certsrv/config/EvaluatorRegisterDialog.java    |    0
 .../admin/certsrv/config/GeneralLogPanel.java      |    0
 .../admin/certsrv/config/JobsConfigDialog.java     |    0
 .../admin/certsrv/config/JobsImplDataModel.java    |    0
 .../netscape/admin/certsrv/config/JobsImplTab.java |    0
 .../admin/certsrv/config/JobsInstanceTab.java      |    0
 .../certsrv/config/JobsPluginSelectionDialog.java  |    0
 .../admin/certsrv/config/JobsRegisterDialog.java   |    0
 .../admin/certsrv/config/JobsRuleDataModel.java    |    0
 .../admin/certsrv/config/JobsSettingPanel.java     |    0
 .../admin/certsrv/config/KeyCreateDialog.java      |    0
 .../admin/certsrv/config/ListCertsModel.java       |    0
 .../admin/certsrv/config/ListKeysModel.java        |    0
 .../admin/certsrv/config/LogConfigDialog.java      |    0
 .../admin/certsrv/config/LogImplDataModel.java     |    0
 .../netscape/admin/certsrv/config/LogImplTab.java  |    0
 .../admin/certsrv/config/LogInstanceTab.java       |    0
 .../certsrv/config/LogPluginSelectionDialog.java   |    0
 .../admin/certsrv/config/LogRegisterDialog.java    |    0
 .../admin/certsrv/config/LogRuleDataModel.java     |    0
 .../admin/certsrv/config/MNSchemeWizard.java       |    0
 .../admin/certsrv/config/MNSchemeWizardInfo.java   |    0
 .../admin/certsrv/config/MapperConfigDialog.java   |    0
 .../admin/certsrv/config/MapperImplDataModel.java  |    0
 .../admin/certsrv/config/MapperImplTab.java        |    0
 .../admin/certsrv/config/MapperInstanceTab.java    |    0
 .../config/MapperPluginSelectionDialog.java        |    0
 .../admin/certsrv/config/MapperRegisterDialog.java |    0
 .../admin/certsrv/config/MapperRuleDataModel.java  |    0
 .../certsrv/config/OCSPStoresConfigDialog.java     |    0
 .../certsrv/config/OCSPStoresInstanceTab.java      |    0
 .../config/OCSPStoresPluginSelectionDialog.java    |    0
 .../certsrv/config/OCSPStoresRuleDataModel.java    |    0
 .../certsrv/config/PanelMapperConfigDialog.java    |    0
 .../certsrv/config/PluginSelectionDialog.java      |    0
 .../admin/certsrv/config/PolicyConfigDialog.java   |    0
 .../admin/certsrv/config/PolicyImplDataModel.java  |    0
 .../admin/certsrv/config/PolicyImplTab.java        |    0
 .../admin/certsrv/config/PolicyInstanceTab.java    |    0
 .../config/PolicyPluginSelectionDialog.java        |    0
 .../admin/certsrv/config/PolicyRegisterDialog.java |    0
 .../admin/certsrv/config/PolicyRuleDataModel.java  |    0
 .../certsrv/config/PolicyRuleOrderDialog.java      |    0
 .../certsrv/config/ProfileComponentCellEditor.java |    0
 .../certsrv/config/ProfileConfigDataModel.java     |    0
 .../admin/certsrv/config/ProfileConfigDialog.java  |    0
 .../admin/certsrv/config/ProfileDataTable.java     |    0
 .../admin/certsrv/config/ProfileEditDataModel.java |    0
 .../admin/certsrv/config/ProfileEditDialog.java    |    0
 .../admin/certsrv/config/ProfileImplDataModel.java |    0
 .../admin/certsrv/config/ProfileImplTab.java       |    0
 .../admin/certsrv/config/ProfileInstanceTab.java   |    0
 .../admin/certsrv/config/ProfileListDataModel.java |    0
 .../certsrv/config/ProfileNonPolicyNewDialog.java  |    0
 .../certsrv/config/ProfileNonPolicySelDialog.java  |    0
 .../config/ProfilePluginSelectionDialog.java       |    0
 .../certsrv/config/ProfilePolicyEditDataModel.java |    0
 .../certsrv/config/ProfilePolicyEditDialog.java    |    0
 .../certsrv/config/ProfilePolicyNewDialog.java     |    0
 .../config/ProfilePolicySelectionDialog.java       |    0
 .../certsrv/config/ProfileRegisterDialog.java      |    0
 .../admin/certsrv/config/ProfileRuleDataModel.java |    0
 .../certsrv/config/PublisherConfigDialog.java      |    0
 .../certsrv/config/PublisherImplDataModel.java     |    0
 .../admin/certsrv/config/PublisherImplTab.java     |    0
 .../admin/certsrv/config/PublisherInstanceTab.java |    0
 .../config/PublisherPluginSelectionDialog.java     |    0
 .../certsrv/config/PublisherRegisterDialog.java    |    0
 .../certsrv/config/PublisherRuleDataModel.java     |    0
 .../admin/certsrv/config/RegisterDialog.java       |    0
 .../admin/certsrv/config/RuleConfigDialog.java     |    0
 .../admin/certsrv/config/RuleImplDataModel.java    |    0
 .../netscape/admin/certsrv/config/RuleImplTab.java |    0
 .../admin/certsrv/config/RuleInstanceTab.java      |    0
 .../certsrv/config/RulePluginSelectionDialog.java  |    0
 .../admin/certsrv/config/RuleRegisterDialog.java   |    0
 .../admin/certsrv/config/RuleRuleDataModel.java    |    0
 .../netscape/admin/certsrv/config/TKSKeysTab.java  |    0
 .../admin/certsrv/config/UserCertsTab.java         |    0
 .../netscape/admin/certsrv/config/ViewDialog.java  |    0
 .../admin/certsrv/config/ViewSelfTestsDialog.java  |    0
 .../admin/certsrv/config/ViewTableModel.java       |    0
 .../certsrv/config/WBaseCertExtensionPage.java     |    0
 .../admin/certsrv/config/WBaseCertRequestPage.java |    0
 .../netscape/admin/certsrv/config/WBaseDNPage.java |    0
 .../admin/certsrv/config/WBaseDNValidityPage.java  |    0
 .../admin/certsrv/config/WBaseKeyPage.java         |    0
 .../certsrv/config/WBaseManualCertRequestPage.java |    0
 .../admin/certsrv/config/WBaseValidityPage.java    |    0
 .../netscape/admin/certsrv/config/WMNNewAgent.java |    0
 .../netscape/admin/certsrv/config/WMNOldAgent.java |    0
 .../admin/certsrv/config/WMNResultPage.java        |    0
 .../admin/certsrv/config/WMNSelection.java         |    0
 .../admin/certsrv/config/WMessageDigestPage.java   |    0
 .../admin/certsrv/config/WarningDialog.java        |    0
 .../config/install/ComponentCellRenderer.java      |    0
 .../certsrv/config/install/InstallWizard.java      |    0
 .../certsrv/config/install/InstallWizardInfo.java  |    0
 .../admin/certsrv/config/install/WIAdminPage.java  |    0
 .../config/install/WIAllCertsInstalledPage.java    |    0
 .../config/install/WICACert1CustomPage.java        |    0
 .../certsrv/config/install/WICACert1Page.java      |    0
 .../certsrv/config/install/WICACert2Page.java      |    0
 .../certsrv/config/install/WICACertDNPage.java     |    0
 .../config/install/WICACertExtensionPage.java      |    0
 .../admin/certsrv/config/install/WICACertPage.java |    0
 .../certsrv/config/install/WICACertSubmitPage.java |    0
 .../config/install/WICACertValidityPage.java       |    0
 .../admin/certsrv/config/install/WICAKeyPage.java  |    0
 .../config/install/WICAMessageDigestPage.java      |    0
 .../config/install/WICAOCSPServicePage.java        |    0
 .../config/install/WICARequestResultPage.java      |    0
 .../config/install/WICASerialNumberPage.java       |    0
 .../certsrv/config/install/WICATokenLogonPage.java |    0
 .../admin/certsrv/config/install/WICertDNPage.java |    0
 .../config/install/WICertExtensionPage.java        |    0
 .../certsrv/config/install/WICertRequestPage.java  |    0
 .../config/install/WICertSetupStatusPage.java      |    0
 .../certsrv/config/install/WICertSubmitPage.java   |    0
 .../certsrv/config/install/WICertValidityPage.java |    0
 .../config/install/WICloneCAKeyCertPage.java       |    0
 .../config/install/WICloneKRAKeyCertPage.java      |    0
 .../certsrv/config/install/WICloneMasterPage.java  |    0
 .../config/install/WICloneOCSPKeyCertPage.java     |    0
 .../admin/certsrv/config/install/WIClonePage.java  |    0
 .../config/install/WICloneRAKeyCertPage.java       |    0
 .../config/install/WICloneTKSKeyCertPage.java      |    0
 .../config/install/WIConfigWebServerPage.java      |    0
 .../config/install/WICreateInternalDBPage.java     |    0
 .../certsrv/config/install/WIDBEnrollPage.java     |    0
 .../config/install/WIDisplayCACertPage.java        |    0
 .../certsrv/config/install/WIDisplayCertPage.java  |    0
 .../config/install/WIDisplayKRACertPage.java       |    0
 .../config/install/WIDisplayOCSPCertPage.java      |    0
 .../config/install/WIDisplayRACertPage.java        |    0
 .../config/install/WIDisplaySSLCertPage.java       |    0
 .../certsrv/config/install/WIExistingDBPage.java   |    0
 .../certsrv/config/install/WIGenCAKeyCertPage.java |    0
 .../config/install/WIGenCAKeyCertReqPage.java      |    0
 .../config/install/WIGenKRAKeyCertPage.java        |    0
 .../config/install/WIGenKRAKeyCertReqPage.java     |    0
 .../certsrv/config/install/WIGenKeyCertPage.java   |    0
 .../config/install/WIGenKeyCertReqPage.java        |    0
 .../config/install/WIGenOCSPKeyCertPage.java       |    0
 .../config/install/WIGenOCSPKeyCertReqPage.java    |    0
 .../certsrv/config/install/WIGenRAKeyCertPage.java |    0
 .../config/install/WIGenRAKeyCertReqPage.java      |    0
 .../config/install/WIGenSSLKeyCertReqPage.java     |    0
 .../config/install/WIGenServerKeyCertPage.java     |    0
 .../config/install/WIInstallCACertStatusPage.java  |    0
 .../config/install/WIInstallCAIntroPage.java       |    0
 .../certsrv/config/install/WIInstallCert1Page.java |    0
 .../certsrv/config/install/WIInstallCert2Page.java |    0
 .../config/install/WIInstallCertStatusPage.java    |    0
 .../certsrv/config/install/WIInstallIntroPage.java |    0
 .../config/install/WIInstallKRACertStatusPage.java |    0
 .../config/install/WIInstallKRAIntroPage.java      |    0
 .../install/WIInstallOCSPCertStatusPage.java       |    0
 .../config/install/WIInstallOCSPIntroPage.java     |    0
 .../config/install/WIInstallRACertStatusPage.java  |    0
 .../config/install/WIInstallRAIntroPage.java       |    0
 .../config/install/WIInstallSSLCertStatusPage.java |    0
 .../config/install/WIInstallSSLIntroPage.java      |    0
 .../config/install/WIInternalDBInfoPage.java       |    0
 .../certsrv/config/install/WIInternalDBPage.java   |    0
 .../config/install/WIInternalTokenLogonPage.java   |    0
 .../config/install/WIIntroMigrationPage.java       |    0
 .../admin/certsrv/config/install/WIIntroPage.java  |    0
 .../config/install/WIIntroSingleSignonPage.java    |    0
 .../certsrv/config/install/WIKRACertDNPage.java    |    0
 .../config/install/WIKRACertExtensionPage.java     |    0
 .../config/install/WIKRACertSubmitPage.java        |    0
 .../config/install/WIKRACertValidityPage.java      |    0
 .../admin/certsrv/config/install/WIKRAKeyPage.java |    0
 .../config/install/WIKRAMessageDigestPage.java     |    0
 .../certsrv/config/install/WIKRANumberPage.java    |    0
 .../config/install/WIKRARequestResultPage.java     |    0
 .../certsrv/config/install/WIKRAScheme1Page.java   |    0
 .../certsrv/config/install/WIKRAScheme2Page.java   |    0
 .../config/install/WIKRAStorageKeyPage.java        |    0
 .../config/install/WIKRATokenLogonPage.java        |    0
 .../admin/certsrv/config/install/WIKeyPage.java    |    0
 .../config/install/WILDAPPublishingPage.java       |    0
 .../certsrv/config/install/WILoggingPage.java      |    0
 .../config/install/WILogonAllTokensPage.java       |    0
 .../config/install/WIManualCACertRequestPage.java  |    0
 .../config/install/WIManualCertRequestPage.java    |    0
 .../config/install/WIManualKRACertRequestPage.java |    0
 .../install/WIManualOCSPCertRequestPage.java       |    0
 .../config/install/WIManualRACertRequestPage.java  |    0
 .../config/install/WIManualSSLCertRequestPage.java |    0
 .../certsrv/config/install/WIMasterOrClone.java    |    0
 .../certsrv/config/install/WIMigrationPage.java    |    0
 .../certsrv/config/install/WINetworkPage.java      |    0
 .../certsrv/config/install/WIOCSPCertDNPage.java   |    0
 .../config/install/WIOCSPCertSubmitPage.java       |    0
 .../certsrv/config/install/WIOCSPKeyPage.java      |    0
 .../config/install/WIOCSPMessageDigestPage.java    |    0
 .../config/install/WIOCSPRequestResultPage.java    |    0
 .../config/install/WIOCSPTokenLogonPage.java       |    0
 .../certsrv/config/install/WIPasteCACertPage.java  |    0
 .../certsrv/config/install/WIPasteCertPage.java    |    0
 .../certsrv/config/install/WIPasteKRACertPage.java |    0
 .../config/install/WIPasteOCSPCertPage.java        |    0
 .../certsrv/config/install/WIPasteRACertPage.java  |    0
 .../certsrv/config/install/WIPasteSSLCertPage.java |    0
 .../certsrv/config/install/WIRACertDNPage.java     |    0
 .../config/install/WIRACertExtensionPage.java      |    0
 .../certsrv/config/install/WIRACertSubmitPage.java |    0
 .../config/install/WIRACertValidityPage.java       |    0
 .../admin/certsrv/config/install/WIRAKeyPage.java  |    0
 .../config/install/WIRAMessageDigestPage.java      |    0
 .../config/install/WIRARequestResultPage.java      |    0
 .../certsrv/config/install/WIRATokenLogonPage.java |    0
 .../certsrv/config/install/WIRecreateDBPage.java   |    0
 .../config/install/WIRemoteCASubsystem.java        |    0
 .../config/install/WIRemoteKRASubsystem.java       |    0
 .../config/install/WIReplAgreementPage.java        |    0
 .../config/install/WIRequestResultPage.java        |    0
 .../admin/certsrv/config/install/WISMTPPage.java   |    0
 .../config/install/WISSLMessageDigestPage.java     |    0
 .../config/install/WISSLRequestResultPage.java     |    0
 .../config/install/WISSLTokenLogonPage.java        |    0
 .../certsrv/config/install/WIServerCertDNPage.java |    0
 .../config/install/WIServerCertExtensionPage.java  |    0
 .../config/install/WIServerCertSubmitPage.java     |    0
 .../config/install/WIServerCertValidityPage.java   |    0
 .../certsrv/config/install/WIServerKeyPage.java    |    0
 .../certsrv/config/install/WIServicesPage.java     |    0
 .../certsrv/config/install/WISingleSignonPage.java |    0
 .../certsrv/config/install/WITokenLogonPage.java   |    0
 .../certsrv/config/install/WITrustDBPage.java      |    0
 .../admin/certsrv/connection/AdminConnection.java  |    0
 .../certsrv/connection/BasicAuthenticator.java     |    0
 .../admin/certsrv/connection/IAuthenticator.java   |    0
 .../admin/certsrv/connection/IConnection.java      |    0
 .../certsrv/connection/IConnectionFactory.java     |    0
 .../admin/certsrv/connection/JSSConnection.java    |    0
 .../certsrv/connection/PromptForTrustDialog.java   |    0
 .../netscape/admin/certsrv/connection/Request.java |    0
 .../admin/certsrv/connection/Response.java         |    0
 .../certsrv/connection/SSLConnectionFactory.java   |    0
 .../admin/certsrv/images/CertificateServer.gif     |  Bin 363 -> 363 bytes
 .../admin/certsrv/images/CertificateServerL.gif    |  Bin 501 -> 501 bytes
 .../com/netscape/admin/certsrv/images/LOGobjs.gif  |  Bin 174 -> 174 bytes
 .../com/netscape/admin/certsrv/images/UGobjs.gif   |  Bin 176 -> 176 bytes
 .../src/com/netscape/admin/certsrv/images/acl.gif  |  Bin 123 -> 123 bytes
 .../com/netscape/admin/certsrv/images/aclobj.gif   |  Bin 178 -> 178 bytes
 .../netscape/admin/certsrv/images/aclplugin.gif    |  Bin 173 -> 173 bytes
 .../com/netscape/admin/certsrv/images/alertl.gif   |  Bin 372 -> 372 bytes
 .../netscape/admin/certsrv/images/allfolder16n.gif |  Bin 878 -> 878 bytes
 .../netscape/admin/certsrv/images/allgroup16n.gif  |  Bin 128 -> 128 bytes
 .../netscape/admin/certsrv/images/alllogdoc16n.gif |  Bin 154 -> 154 bytes
 .../admin/certsrv/images/alllogfolder16n.gif       |  Bin 132 -> 132 bytes
 .../netscape/admin/certsrv/images/alluser16n.gif   |  Bin 85 -> 85 bytes
 .../admin/certsrv/images/alluserwithcert16n.gif    |  Bin 144 -> 144 bytes
 .../src/com/netscape/admin/certsrv/images/auth.gif |  Bin 112 -> 112 bytes
 .../com/netscape/admin/certsrv/images/authobj.gif  |  Bin 179 -> 179 bytes
 .../netscape/admin/certsrv/images/authplugin.gif   |  Bin 167 -> 167 bytes
 .../com/netscape/admin/certsrv/images/cert24.gif   |  Bin 501 -> 501 bytes
 .../com/netscape/admin/certsrv/images/cert41.gif   |  Bin 2153 -> 2153 bytes
 .../com/netscape/admin/certsrv/images/cert42.gif   |  Bin 2291 -> 2291 bytes
 .../netscape/admin/certsrv/images/cms-branding.gif |  Bin 2145 -> 2145 bytes
 .../com/netscape/admin/certsrv/images/error.gif    |  Bin 368 -> 368 bytes
 .../netscape/admin/certsrv/images/genobject.gif    |  Bin 159 -> 159 bytes
 .../com/netscape/admin/certsrv/images/jobobj.gif   |  Bin 178 -> 178 bytes
 .../netscape/admin/certsrv/images/jobplugin.gif    |  Bin 173 -> 173 bytes
 .../src/com/netscape/admin/certsrv/images/jobs.gif |  Bin 123 -> 123 bytes
 .../com/netscape/admin/certsrv/images/ldapub.gif   |  Bin 172 -> 172 bytes
 .../com/netscape/admin/certsrv/images/messagel.gif |  Bin 693 -> 693 bytes
 .../netscape/admin/certsrv/images/notsecure.gif    |  Bin 157 -> 157 bytes
 .../src/com/netscape/admin/certsrv/images/plug.gif |  Bin 175 -> 175 bytes
 .../com/netscape/admin/certsrv/images/plugin.gif   |  Bin 143 -> 143 bytes
 .../netscape/admin/certsrv/images/pluginfolder.gif |  Bin 176 -> 176 bytes
 .../admin/certsrv/images/red-ball-small.gif        |  Bin 255 -> 255 bytes
 .../com/netscape/admin/certsrv/images/rule-16.gif  |  Bin 145 -> 145 bytes
 .../admin/certsrv/images/ruleDisable-16.gif        |  Bin 131 -> 131 bytes
 .../admin/certsrv/images/ruleplugin-16.gif         |  Bin 172 -> 172 bytes
 .../com/netscape/admin/certsrv/images/rulesobj.gif |  Bin 188 -> 188 bytes
 .../com/netscape/admin/certsrv/images/secure.gif   |  Bin 173 -> 173 bytes
 .../netscape/admin/certsrv/images/servlet-16.gif   |  Bin 104 -> 104 bytes
 .../admin/certsrv/images/servlet-plugin-16.gif     |  Bin 164 -> 164 bytes
 .../netscape/admin/certsrv/images/servletobj.gif   |  Bin 172 -> 172 bytes
 .../admin/certsrv/keycert/CertSetupWizard.java     |    0
 .../admin/certsrv/keycert/CertSetupWizardInfo.java |    0
 .../admin/certsrv/keycert/WCACertRequest1Page.java |    0
 .../netscape/admin/certsrv/keycert/WCAKeyPage.java |    0
 .../admin/certsrv/keycert/WCertDNPage.java         |    0
 .../admin/certsrv/keycert/WCertDNValidityPage.java |    0
 .../admin/certsrv/keycert/WCertExtensionPage.java  |    0
 .../certsrv/keycert/WCertMessageDigestPage.java    |    0
 .../admin/certsrv/keycert/WCertRequestPage.java    |    0
 .../admin/certsrv/keycert/WCertTypePage.java       |    0
 .../admin/certsrv/keycert/WCertValidityPage.java   |    0
 .../admin/certsrv/keycert/WDisplayCertPage.java    |    0
 .../admin/certsrv/keycert/WExecute1Page.java       |    0
 .../admin/certsrv/keycert/WExecutePage.java        |    0
 .../admin/certsrv/keycert/WGenerateReqPage.java    |    0
 .../certsrv/keycert/WInstallCertChainPage.java     |    0
 .../admin/certsrv/keycert/WInstallOpPage.java      |    0
 .../admin/certsrv/keycert/WInstallStatusPage.java  |    0
 .../certsrv/keycert/WIntroInstallCertPage.java     |    0
 .../netscape/admin/certsrv/keycert/WIntroPage.java |    0
 .../certsrv/keycert/WIssueImportStatusPage.java    |    0
 .../netscape/admin/certsrv/keycert/WKeyPage.java   |    0
 .../certsrv/keycert/WManualCertRequestPage.java    |    0
 .../certsrv/keycert/WOperationSelectionPage.java   |    0
 .../certsrv/keycert/WOtherCertRequest1Page.java    |    0
 .../admin/certsrv/keycert/WPasteCertPage.java      |    0
 .../netscape/admin/certsrv/keycert/WRAKeyPage.java |    0
 .../admin/certsrv/keycert/WRequestStatusPage.java  |    0
 .../admin/certsrv/keycert/WSSLKeyPage.java         |    0
 .../admin/certsrv/keycert/WTokenLogonPage.java     |    0
 .../admin/certsrv/keycert/WTokenSelectionPage.java |    0
 .../certsrv/keycert/WWarningExecute1Page.java      |    0
 .../admin/certsrv/keycert/WWarningExecutePage.java |    0
 .../admin/certsrv/keycert/WWarningPage.java        |    0
 .../certsrv/managecert/CertificateInfoDialog.java  |    0
 .../admin/certsrv/managecert/ManageCertDialog.java |    0
 .../admin/certsrv/managecert/ManageCertModel.java  |    0
 .../admin/certsrv/menu/CertManagementAction.java   |    0
 .../netscape/admin/certsrv/menu/KeyCertAction.java |    0
 .../admin/certsrv/menu/PKCS11ManagementAction.java |    0
 .../admin/certsrv/menu/RefreshTabPane.java         |    0
 .../admin/certsrv/misc/MessageFormatter.java       |    0
 .../certsrv/notification/RequestCompletePanel.java |    0
 .../certsrv/notification/RequestInQPanel.java      |    0
 .../certsrv/notification/RequestRevokedPanel.java  |    0
 .../admin/certsrv/security/AbstractCipher.java     |    0
 .../certsrv/security/AbstractCipherPreference.java |    0
 .../admin/certsrv/security/CRLAddCertDialog.java   |    0
 .../admin/certsrv/security/CRLCertInfoPane.java    |    0
 .../certsrv/security/CRLDeleteCertDialog.java      |    0
 .../certsrv/security/CRLManagementDialog.java      |    0
 .../netscape/admin/certsrv/security/CRLTable.java  |    0
 .../admin/certsrv/security/CRLTableModel.java      |    0
 .../admin/certsrv/security/CertBasicInfo.java      |    0
 .../certsrv/security/CertDetailInfoDialog.java     |    0
 .../netscape/admin/certsrv/security/CertInfo.java  |    0
 .../admin/certsrv/security/CertInfoDialog.java     |    0
 .../certsrv/security/CertInstallCertInfoPane.java  |    0
 .../certsrv/security/CertInstallCertPane.java      |    0
 .../certsrv/security/CertInstallTypePane.java      |    0
 .../admin/certsrv/security/CertListTable.java      |    0
 .../admin/certsrv/security/CertListTableModel.java |    0
 .../certsrv/security/CertManagementDialog.java     |    0
 .../certsrv/security/CertRequestCertPane.java      |    0
 .../security/CertRequestEnterPasswordPane.java     |    0
 .../certsrv/security/CertRequestInfoPane.java      |    0
 .../security/CertRequestSelectTokenPane.java       |    0
 .../certsrv/security/CertRequestTypePane.java      |    0
 .../certsrv/security/ChangeKeyPasswordDialog.java  |    0
 .../admin/certsrv/security/CipherEntry.java        |    0
 .../certsrv/security/CipherPreferenceDialog.java   |    0
 .../admin/certsrv/security/CipherResourceSet.java  |    0
 .../com/netscape/admin/certsrv/security/Comm.java  |    0
 .../admin/certsrv/security/CreateTrustPane.java    |    0
 .../admin/certsrv/security/EncryptionPane.java     |    0
 .../certsrv/security/GuideCertInstallPane.java     |    0
 .../certsrv/security/GuideCertRequestPane.java     |    0
 .../certsrv/security/GuideCreateTrustPane.java     |    0
 .../admin/certsrv/security/GuideIntroPane.java     |    0
 .../admin/certsrv/security/IAbstractCipherSet.java |    0
 .../admin/certsrv/security/ICipherConstants.java   |    0
 .../certsrv/security/IEncryptionPaneListener.java  |    0
 .../admin/certsrv/security/IKeyCertPage.java       |    0
 .../admin/certsrv/security/KeyCertTaskInfo.java    |    0
 .../admin/certsrv/security/KeyCertUtility.java     |    0
 .../admin/certsrv/security/KeyCertWizard.java      |    0
 .../netscape/admin/certsrv/security/Message.java   |    0
 .../admin/certsrv/security/MessageDialog.java      |    0
 .../certsrv/security/PKCS11AddModuleDialog.java    |    0
 .../certsrv/security/PKCS11ManagementDialog.java   |    0
 .../netscape/admin/certsrv/security/Response.java  |    0
 .../certsrv/security/SSL2CipherPreference.java     |    0
 .../admin/certsrv/security/SSL2CipherSet.java      |    0
 .../certsrv/security/SSL3CipherPreference.java     |    0
 .../admin/certsrv/security/SSL3CipherSet.java      |    0
 .../admin/certsrv/security/StatusPane.java         |    0
 .../security/ToggleCipherPreferencePane.java       |    0
 .../admin/certsrv/security/WizardObservable.java   |    0
 .../admin/certsrv/status/AccessLogDataModel.java   |    0
 .../admin/certsrv/status/AuditLogDataModel.java    |    0
 .../netscape/admin/certsrv/status/CMSLogPanel.java |    0
 .../admin/certsrv/status/DefaultLogParser.java     |    0
 .../admin/certsrv/status/ErrorLogDataModel.java    |    0
 .../netscape/admin/certsrv/status/ILogParser.java  |    0
 .../admin/certsrv/status/LogDataModel.java         |    0
 .../admin/certsrv/status/LogEntryViewDialog.java   |    0
 .../admin/certsrv/status/LogInstancePanel.java     |    0
 .../netscape/admin/certsrv/status/StatusPanel.java |    0
 .../netscape/admin/certsrv/task/AuthDialog.java    |    0
 .../com/netscape/admin/certsrv/task/CGITask.java   |    0
 .../admin/certsrv/task/CMSCertRequest.java         |    0
 .../netscape/admin/certsrv/task/CMSConfigCert.java |    0
 .../netscape/admin/certsrv/task/CMSImportCert.java |    0
 .../admin/certsrv/task/CMSMigrateCreate.java       |    0
 .../com/netscape/admin/certsrv/task/CMSRemove.java |    0
 .../admin/certsrv/task/CMSRequestCert.java         |    0
 .../netscape/admin/certsrv/task/CMSRestart.java    |    0
 .../com/netscape/admin/certsrv/task/CMSStart.java  |    0
 .../admin/certsrv/task/CMSStartDaemon.java         |    0
 .../com/netscape/admin/certsrv/task/CMSStatus.java |    0
 .../com/netscape/admin/certsrv/task/CMSStop.java   |    0
 .../admin/certsrv/task/CreateInstanceDialog.java   |    0
 .../com/netscape/admin/certsrv/task/KeyCert.java   |    0
 .../netscape/admin/certsrv/task/StatusDialog.java  |    0
 .../netscape/admin/certsrv/ug/AuthBaseDialog.java  |    0
 .../admin/certsrv/ug/AuthConfigDialog.java         |    0
 .../admin/certsrv/ug/AuthImplDataModel.java        |    0
 .../com/netscape/admin/certsrv/ug/AuthImplTab.java |    0
 .../netscape/admin/certsrv/ug/AuthInstanceTab.java |    0
 .../certsrv/ug/AuthPluginSelectionDialog.java      |    0
 .../admin/certsrv/ug/AuthRegisterDialog.java       |    0
 .../admin/certsrv/ug/AuthRuleDataModel.java        |    0
 .../netscape/admin/certsrv/ug/AuthViewDialog.java  |    0
 .../netscape/admin/certsrv/ug/CMSBaseUGTab.java    |    0
 .../netscape/admin/certsrv/ug/CMSUGTabPanel.java   |    0
 .../netscape/admin/certsrv/ug/CertDataModel.java   |    0
 .../admin/certsrv/ug/CertImportDialog.java         |    0
 .../admin/certsrv/ug/CertManagementDialog.java     |    0
 .../netscape/admin/certsrv/ug/CertViewDialog.java  |    0
 .../netscape/admin/certsrv/ug/GroupDataModel.java  |    0
 .../com/netscape/admin/certsrv/ug/GroupEditor.java |    0
 .../admin/certsrv/ug/GroupListDataModel.java       |    0
 .../netscape/admin/certsrv/ug/GroupListDialog.java |    0
 .../com/netscape/admin/certsrv/ug/GroupTab.java    |    0
 .../netscape/admin/certsrv/ug/MemberDataModel.java |    0
 .../netscape/admin/certsrv/ug/UserDataModel.java   |    0
 .../com/netscape/admin/certsrv/ug/UserEditor.java  |    0
 .../admin/certsrv/ug/UserListDataModel.java        |    0
 .../netscape/admin/certsrv/ug/UserListDialog.java  |    0
 .../src/com/netscape/admin/certsrv/ug/UserTab.java |    0
 .../admin/certsrv/wizard/ConfigServlet.java        |    0
 .../netscape/admin/certsrv/wizard/IWizardDone.java |    0
 .../admin/certsrv/wizard/IWizardPanel.java         |    0
 .../admin/certsrv/wizard/WizardBasePanel.java      |    0
 .../netscape/admin/certsrv/wizard/WizardInfo.java  |    0
 .../admin/certsrv/wizard/WizardWidget.java         |    0
 .../netscape/certsrv/common/ConfigConstants.java   |    0
 .../src/com/netscape/certsrv/common/Constants.java |    0
 .../src/com/netscape/certsrv/common/DestDef.java   |    0
 .../com/netscape/certsrv/common/NameValuePair.java |    0
 .../netscape/certsrv/common/NameValuePairs.java    |    0
 .../src/com/netscape/certsrv/common/OpDef.java     |    0
 .../src/com/netscape/certsrv/common/PrefixDef.java |    0
 .../src/com/netscape/certsrv/common/ScopeDef.java  |    0
 .../src/com/netscape/certsrv/common/TaskId.java    |    0
 .../base => base}/console/templates/CMakeLists.txt |    0
 .../console/templates/pki_console_wrapper          |    0
 {pki/base => base}/java-tools/CMakeLists.txt       |    0
 {pki/base => base}/java-tools/LICENSE              |    0
 {pki/base => base}/java-tools/doc/README           |    0
 {pki/base => base}/java-tools/src/CMakeLists.txt   |    0
 .../java-tools/src/com/netscape/cmstools/AtoB.java |    0
 .../src/com/netscape/cmstools/AuditVerify.java     |    0
 .../java-tools/src/com/netscape/cmstools/BtoA.java |    0
 .../src/com/netscape/cmstools/CMCEnroll.java       |    0
 .../src/com/netscape/cmstools/CMCRequest.java      |    0
 .../src/com/netscape/cmstools/CMCResponse.java     |    0
 .../src/com/netscape/cmstools/CMCRevoke.java       |    0
 .../src/com/netscape/cmstools/CRMFPopClient.java   |    0
 .../src/com/netscape/cmstools/DRMTool.cfg          |    0
 .../src/com/netscape/cmstools/DRMTool.java         |    0
 .../src/com/netscape/cmstools/ExtJoiner.java       |    0
 .../src/com/netscape/cmstools/GenExtKeyUsage.java  |    0
 .../com/netscape/cmstools/GenIssuerAltNameExt.java |    0
 .../netscape/cmstools/GenSubjectAltNameExt.java    |    0
 .../src/com/netscape/cmstools/HttpClient.java      |    0
 .../src/com/netscape/cmstools/OCSPClient.java      |    0
 .../src/com/netscape/cmstools/PKCS10Client.java    |    0
 .../src/com/netscape/cmstools/PKCS12Export.java    |    0
 .../src/com/netscape/cmstools/PasswordCache.java   |    0
 .../src/com/netscape/cmstools/PrettyPrintCert.java |    0
 .../src/com/netscape/cmstools/PrettyPrintCrl.java  |    0
 .../src/com/netscape/cmstools/TestCRLSigning.java  |    0
 .../src/com/netscape/cmstools/TokenInfo.java       |    0
 .../java-tools/templates/CMakeLists.txt            |    0
 .../templates/pki_java_command_wrapper.in          |    0
 .../templates/pretty_print_cert_command_wrapper.in |    0
 .../templates/pretty_print_crl_command_wrapper.in  |    0
 {pki/base => base}/kra/CMakeLists.txt              |    0
 {pki/base => base}/kra/LICENSE                     |    0
 {pki/base => base}/kra/setup/CMakeLists.txt        |    0
 {pki/base => base}/kra/setup/registry_instance     |    0
 {pki/base => base}/kra/shared/conf/CMakeLists.txt  |    0
 {pki/base => base}/kra/shared/conf/CS.cfg.in       |    0
 {pki/base => base}/kra/shared/conf/acl.ldif        |    0
 {pki/base => base}/kra/shared/conf/catalina.policy |    0
 .../kra/shared/conf/catalina.properties            |    0
 {pki/base => base}/kra/shared/conf/context.xml     |    0
 {pki/base => base}/kra/shared/conf/database.ldif   |    0
 {pki/base => base}/kra/shared/conf/db.ldif         |    0
 {pki/base => base}/kra/shared/conf/index.ldif      |    0
 {pki/base => base}/kra/shared/conf/jk2.manifest    |    0
 {pki/base => base}/kra/shared/conf/jk2.properties  |    0
 {pki/base => base}/kra/shared/conf/jkconf.ant.xml  |    0
 .../kra/shared/conf/jkconfig.manifest              |    0
 .../kra/shared/conf/logging.properties             |    0
 {pki/base => base}/kra/shared/conf/manager.ldif    |    0
 {pki/base => base}/kra/shared/conf/schema.ldif     |    0
 .../kra/shared/conf/server-minimal.xml             |    0
 {pki/base => base}/kra/shared/conf/server.xml      |    0
 .../kra/shared/conf/serverCert.profile             |    0
 .../kra/shared/conf/serverCertNick.conf            |    0
 {pki/base => base}/kra/shared/conf/shm.manifest    |    0
 .../kra/shared/conf/storageCert.profile            |    0
 .../kra/shared/conf/subsystemCert.profile          |    0
 .../kra/shared/conf/tomcat-jk2.manifest            |    0
 .../base => base}/kra/shared/conf/tomcat-users.xml |    0
 {pki/base => base}/kra/shared/conf/tomcat6.conf    |    0
 .../kra/shared/conf/transportCert.profile          |    0
 .../kra/shared/conf/uriworkermap.properties        |    0
 {pki/base => base}/kra/shared/conf/vlv.ldif        |    0
 {pki/base => base}/kra/shared/conf/vlvtasks.ldif   |    0
 {pki/base => base}/kra/shared/conf/web.xml         |    0
 .../kra/shared/conf/workers.properties             |    0
 .../kra/shared/conf/workers.properties.minimal     |    0
 .../kra/shared/conf/workers2.properties            |    0
 .../kra/shared/conf/workers2.properties.minimal    |    0
 {pki/base => base}/kra/shared/etc/init.d/pki-krad  |    0
 .../kra/shared/lib/systemd/system/pki-krad.target  |    0
 .../shared/lib/systemd/system/pki-krad@.service    |    0
 .../kra/shared/webapps/ROOT/WEB-INF/web.xml        |    0
 .../kra/shared/webapps/ROOT/index.jsp              |    0
 .../shared/webapps/kra/WEB-INF/velocity.properties |    0
 .../kra/shared/webapps/kra/WEB-INF/web.xml         |    0
 {pki/base => base}/kra/src/CMakeLists.txt          |    0
 .../kra/src/com/netscape/kra/EncryptionUnit.java   |    0
 .../src/com/netscape/kra/EnrollmentService.java    |    0
 .../kra/src/com/netscape/kra/KRANotify.java        |    0
 .../kra/src/com/netscape/kra/KRAPolicy.java        |    0
 .../kra/src/com/netscape/kra/KRAService.java       |    0
 .../src/com/netscape/kra/KeyRecoveryAuthority.java |    0
 .../src/com/netscape/kra/NetkeyKeygenService.java  |    0
 .../kra/src/com/netscape/kra/RecoveryService.java  |    0
 .../kra/src/com/netscape/kra/StorageKeyUnit.java   |    0
 .../com/netscape/kra/TokenKeyRecoveryService.java  |    0
 .../kra/src/com/netscape/kra/TransportKeyUnit.java |    0
 .../migrate/41ToTxt/classes/CMS41LdifParser.class  |  Bin 9562 -> 9562 bytes
 .../migrate/41ToTxt/classes/Main.class             |  Bin 1615 -> 1615 bytes
 {pki/base => base}/migrate/41ToTxt/run.bat         |    0
 {pki/base => base}/migrate/41ToTxt/run.sh          |    0
 {pki/base => base}/migrate/41ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/41ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/41ToTxt/src/compile.sh  |    0
 .../42SP2ToTxt/classes/CMS42SP2LdifParser.class    |  Bin 9028 -> 9028 bytes
 .../migrate/42SP2ToTxt/classes/Main.class          |  Bin 1552 -> 1552 bytes
 {pki/base => base}/migrate/42SP2ToTxt/run.bat      |    0
 {pki/base => base}/migrate/42SP2ToTxt/run.sh       |    0
 .../base => base}/migrate/42SP2ToTxt/src/Main.java |    0
 .../migrate/42SP2ToTxt/src/compile.bat             |    0
 .../migrate/42SP2ToTxt/src/compile.sh              |    0
 .../migrate/42ToTxt/classes/CMS42LdifParser.class  |  Bin 9562 -> 9562 bytes
 .../migrate/42ToTxt/classes/Main.class             |  Bin 1615 -> 1615 bytes
 {pki/base => base}/migrate/42ToTxt/run.bat         |    0
 {pki/base => base}/migrate/42ToTxt/run.sh          |    0
 {pki/base => base}/migrate/42ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/42ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/42ToTxt/src/compile.sh  |    0
 .../migrate/45ToTxt/classes/CMS45LdifParser.class  |  Bin 9025 -> 9025 bytes
 .../migrate/45ToTxt/classes/Main.class             |  Bin 1518 -> 1518 bytes
 {pki/base => base}/migrate/45ToTxt/run.bat         |    0
 {pki/base => base}/migrate/45ToTxt/run.sh          |    0
 {pki/base => base}/migrate/45ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/45ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/45ToTxt/src/compile.sh  |    0
 .../migrate/47ToTxt/classes/CMS47LdifParser.class  |  Bin 10672 -> 10672 bytes
 .../migrate/47ToTxt/classes/Main.class             |  Bin 1517 -> 1517 bytes
 {pki/base => base}/migrate/47ToTxt/run.bat         |    0
 {pki/base => base}/migrate/47ToTxt/run.sh          |    0
 {pki/base => base}/migrate/47ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/47ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/47ToTxt/src/compile.sh  |    0
 .../migrate/60ToTxt/classes/CMS60LdifParser.class  |  Bin 9019 -> 9019 bytes
 .../migrate/60ToTxt/classes/Main.class             |  Bin 1518 -> 1518 bytes
 {pki/base => base}/migrate/60ToTxt/run.bat         |    0
 {pki/base => base}/migrate/60ToTxt/run.sh          |    0
 {pki/base => base}/migrate/60ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/60ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/60ToTxt/src/compile.sh  |    0
 .../migrate/61ToTxt/classes/CMS61LdifParser.class  |  Bin 9117 -> 9117 bytes
 .../migrate/61ToTxt/classes/Main.class             |  Bin 1497 -> 1497 bytes
 {pki/base => base}/migrate/61ToTxt/run.bat         |    0
 {pki/base => base}/migrate/61ToTxt/run.sh          |    0
 {pki/base => base}/migrate/61ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/61ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/61ToTxt/src/compile.sh  |    0
 .../migrate/62ToTxt/classes/CMS62LdifParser.class  |  Bin 9117 -> 9117 bytes
 .../migrate/62ToTxt/classes/Main.class             |  Bin 1497 -> 1497 bytes
 {pki/base => base}/migrate/62ToTxt/run.bat         |    0
 {pki/base => base}/migrate/62ToTxt/run.sh          |    0
 {pki/base => base}/migrate/62ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/62ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/62ToTxt/src/compile.sh  |    0
 .../migrate/63ToTxt/classes/CMS63LdifParser.class  |  Bin 8978 -> 8978 bytes
 .../migrate/63ToTxt/classes/Main.class             |  Bin 1501 -> 1501 bytes
 {pki/base => base}/migrate/63ToTxt/run.bat         |    0
 {pki/base => base}/migrate/63ToTxt/run.sh          |    0
 {pki/base => base}/migrate/63ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/63ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/63ToTxt/src/compile.sh  |    0
 .../migrate/70ToTxt/classes/CMS70LdifParser.class  |  Bin 8978 -> 8978 bytes
 .../migrate/70ToTxt/classes/Main.class             |  Bin 1501 -> 1501 bytes
 {pki/base => base}/migrate/70ToTxt/run.bat         |    0
 {pki/base => base}/migrate/70ToTxt/run.sh          |    0
 {pki/base => base}/migrate/70ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/70ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/70ToTxt/src/compile.sh  |    0
 .../migrate/71ToTxt/classes/CMS71LdifParser.class  |  Bin 8978 -> 8978 bytes
 .../migrate/71ToTxt/classes/Main.class             |  Bin 1501 -> 1501 bytes
 {pki/base => base}/migrate/71ToTxt/run.bat         |    0
 {pki/base => base}/migrate/71ToTxt/run.sh          |    0
 {pki/base => base}/migrate/71ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/71ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/71ToTxt/src/compile.sh  |    0
 .../migrate/72ToTxt/classes/CMS72LdifParser.class  |  Bin 9200 -> 9200 bytes
 .../migrate/72ToTxt/classes/Main.class             |  Bin 1513 -> 1513 bytes
 {pki/base => base}/migrate/72ToTxt/run.bat         |    0
 {pki/base => base}/migrate/72ToTxt/run.sh          |    0
 {pki/base => base}/migrate/72ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/72ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/72ToTxt/src/compile.sh  |    0
 .../migrate/73ToTxt/classes/CMS73LdifParser.class  |  Bin 9188 -> 9188 bytes
 .../migrate/73ToTxt/classes/Main.class             |  Bin 1505 -> 1505 bytes
 {pki/base => base}/migrate/73ToTxt/run.bat         |    0
 {pki/base => base}/migrate/73ToTxt/run.sh          |    0
 {pki/base => base}/migrate/73ToTxt/src/Main.java   |    0
 {pki/base => base}/migrate/73ToTxt/src/compile.bat |    0
 {pki/base => base}/migrate/73ToTxt/src/compile.sh  |    0
 .../migrate/80/MigrateSecurityDomain.class         |  Bin 6951 -> 6951 bytes
 .../migrate/80/MigrateSecurityDomain.java          |    0
 {pki/base => base}/migrate/80/readme               |    0
 {pki/base => base}/migrate/80/schema-add.ldif      |    0
 {pki/base => base}/migrate/CMakeLists.txt          |    0
 {pki/base => base}/migrate/LICENSE                 |    0
 {pki/base => base}/migrate/TpsTo80/Makefile        |    0
 .../migrate/TpsTo80/linux/migrateTPSData.i386      |  Bin 10408 -> 10408 bytes
 .../migrate/TpsTo80/linux/migrateTPSData.x86_64    |  Bin 12616 -> 12616 bytes
 .../base => base}/migrate/TpsTo80/migrateTPSData.c |    0
 {pki/base => base}/migrate/TpsTo80/readme          |    0
 .../TpsTo80/solaris/migrateTPSData.sol9sparc       |  Bin 15712 -> 15712 bytes
 .../migrate/TxtTo60/classes/CMS60LdifParser.class  |  Bin 12047 -> 12047 bytes
 .../migrate/TxtTo60/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo60/classes/Main.class             |  Bin 1518 -> 1518 bytes
 {pki/base => base}/migrate/TxtTo60/run.bat         |    0
 {pki/base => base}/migrate/TxtTo60/run.sh          |    0
 {pki/base => base}/migrate/TxtTo60/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo60/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo60/src/compile.sh  |    0
 .../migrate/TxtTo61/classes/CMS61LdifParser.class  |  Bin 12150 -> 12150 bytes
 .../migrate/TxtTo61/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo61/classes/Main.class             |  Bin 1497 -> 1497 bytes
 {pki/base => base}/migrate/TxtTo61/run.bat         |    0
 {pki/base => base}/migrate/TxtTo61/run.sh          |    0
 {pki/base => base}/migrate/TxtTo61/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo61/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo61/src/compile.sh  |    0
 .../migrate/TxtTo62/classes/CMS62LdifParser.class  |  Bin 12355 -> 12355 bytes
 .../migrate/TxtTo62/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo62/classes/Main.class             |  Bin 1497 -> 1497 bytes
 {pki/base => base}/migrate/TxtTo62/run.bat         |    0
 {pki/base => base}/migrate/TxtTo62/run.sh          |    0
 {pki/base => base}/migrate/TxtTo62/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo62/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo62/src/compile.sh  |    0
 .../migrate/TxtTo70/classes/CMS70LdifParser.class  |  Bin 12270 -> 12270 bytes
 .../migrate/TxtTo70/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo70/classes/Main.class             |  Bin 1501 -> 1501 bytes
 {pki/base => base}/migrate/TxtTo70/run.bat         |    0
 {pki/base => base}/migrate/TxtTo70/run.sh          |    0
 {pki/base => base}/migrate/TxtTo70/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo70/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo70/src/compile.sh  |    0
 .../migrate/TxtTo71/classes/CMS71LdifParser.class  |  Bin 12270 -> 12270 bytes
 .../migrate/TxtTo71/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo71/classes/Main.class             |  Bin 1501 -> 1501 bytes
 {pki/base => base}/migrate/TxtTo71/run.bat         |    0
 {pki/base => base}/migrate/TxtTo71/run.sh          |    0
 {pki/base => base}/migrate/TxtTo71/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo71/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo71/src/compile.sh  |    0
 .../migrate/TxtTo72/classes/CMS72LdifParser.class  |  Bin 12186 -> 12186 bytes
 .../migrate/TxtTo72/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo72/classes/Main.class             |  Bin 1513 -> 1513 bytes
 {pki/base => base}/migrate/TxtTo72/run.bat         |    0
 {pki/base => base}/migrate/TxtTo72/run.sh          |    0
 {pki/base => base}/migrate/TxtTo72/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo72/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo72/src/compile.sh  |    0
 .../migrate/TxtTo73/classes/CMS73LdifParser.class  |  Bin 12166 -> 12166 bytes
 .../migrate/TxtTo73/classes/DummyAuthManager.class |  Bin 1187 -> 1187 bytes
 .../migrate/TxtTo73/classes/Main.class             |  Bin 1505 -> 1505 bytes
 {pki/base => base}/migrate/TxtTo73/run.bat         |    0
 {pki/base => base}/migrate/TxtTo73/run.sh          |    0
 {pki/base => base}/migrate/TxtTo73/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo73/src/compile.bat |    0
 {pki/base => base}/migrate/TxtTo73/src/compile.sh  |    0
 .../migrate/TxtTo80/classes/CS80LdifParser.class   |  Bin 8542 -> 8542 bytes
 .../migrate/TxtTo80/classes/Main.class             |  Bin 1626 -> 1626 bytes
 {pki/base => base}/migrate/TxtTo80/run.sh          |    0
 {pki/base => base}/migrate/TxtTo80/src/Main.java   |    0
 {pki/base => base}/migrate/TxtTo80/src/compile.sh  |    0
 {pki/base => base}/migrate/kra/RecoverKey.class    |  Bin 3566 -> 3566 bytes
 {pki/base => base}/migrate/kra/RecoverKey.java     |    0
 {pki/base => base}/migrate/kra/RecoverPin.class    |  Bin 5029 -> 5029 bytes
 {pki/base => base}/migrate/kra/RecoverPin.java     |    0
 {pki/base => base}/migrate/kra/readme.txt          |    0
 {pki/base => base}/native-tools/CMakeLists.txt     |    0
 {pki/base => base}/native-tools/LICENSE            |    0
 {pki/base => base}/native-tools/doc/README         |    0
 {pki/base => base}/native-tools/src/CMakeLists.txt |    0
 .../native-tools/src/bulkissuance/CMakeLists.txt   |    0
 .../native-tools/src/bulkissuance/bulkissuance.c   |    0
 .../src/bulkissuance/bulkissuance.data             |    0
 .../native-tools/src/bulkissuance/getopt.c         |    0
 .../native-tools/src/p7tool/CMakeLists.txt         |    0
 .../native-tools/src/p7tool/NSPRerrs.h             |    0
 .../native-tools/src/p7tool/SECerrs.h              |    0
 .../native-tools/src/p7tool/SSLerrs.h              |    0
 .../base => base}/native-tools/src/p7tool/p7tool.c |    0
 .../native-tools/src/p7tool/pppolicy.c             |    0
 .../native-tools/src/p7tool/secerror.c             |    0
 .../native-tools/src/p7tool/secerror.h             |    0
 .../base => base}/native-tools/src/p7tool/secpwd.c |    0
 .../native-tools/src/p7tool/secutil.c              |    0
 .../native-tools/src/p7tool/secutil.h              |    0
 .../native-tools/src/revoker/CMakeLists.txt        |    0
 .../native-tools/src/revoker/getopt.c              |    0
 .../native-tools/src/revoker/revoker.c             |    0
 .../native-tools/src/setpin/CMakeLists.txt         |    0
 {pki/base => base}/native-tools/src/setpin/b64.c   |    0
 .../native-tools/src/setpin/options.c              |    0
 .../native-tools/src/setpin/options.h              |    0
 .../base => base}/native-tools/src/setpin/setpin.c |    0
 .../native-tools/src/setpin/setpin.conf            |    0
 .../native-tools/src/setpin/setpin_options.c       |    0
 .../native-tools/src/setpin/setpin_options.h       |    0
 .../native-tools/src/sslget/CMakeLists.txt         |    0
 .../base => base}/native-tools/src/sslget/getopt.c |    0
 .../base => base}/native-tools/src/sslget/sslget.c |    0
 .../native-tools/src/tkstool/CMakeLists.txt        |    0
 .../native-tools/src/tkstool/NSPRerrs.h            |    0
 .../native-tools/src/tkstool/SECerrs.h             |    0
 .../native-tools/src/tkstool/SSLerrs.h             |    0
 .../native-tools/src/tkstool/delete.c              |    0
 {pki/base => base}/native-tools/src/tkstool/file.c |    0
 {pki/base => base}/native-tools/src/tkstool/find.c |    0
 {pki/base => base}/native-tools/src/tkstool/help.c |    0
 {pki/base => base}/native-tools/src/tkstool/key.c  |    0
 {pki/base => base}/native-tools/src/tkstool/list.c |    0
 .../native-tools/src/tkstool/modules.c             |    0
 .../native-tools/src/tkstool/pppolicy.c            |    0
 .../native-tools/src/tkstool/random.c              |    0
 .../native-tools/src/tkstool/retrieve.c            |    0
 .../native-tools/src/tkstool/secerror.c            |    0
 .../native-tools/src/tkstool/secpwd.c              |    0
 .../native-tools/src/tkstool/secutil.c             |    0
 .../native-tools/src/tkstool/secutil.h             |    0
 .../native-tools/src/tkstool/tkstool.c             |    0
 .../native-tools/src/tkstool/tkstool.h             |    0
 {pki/base => base}/native-tools/src/tkstool/util.c |    0
 .../native-tools/src/tkstool/version.c             |    0
 {pki/base => base}/ocsp/CMakeLists.txt             |    0
 {pki/base => base}/ocsp/LICENSE                    |    0
 {pki/base => base}/ocsp/setup/CMakeLists.txt       |    0
 {pki/base => base}/ocsp/setup/registry_instance    |    0
 {pki/base => base}/ocsp/shared/conf/CMakeLists.txt |    0
 {pki/base => base}/ocsp/shared/conf/CS.cfg.in      |    0
 {pki/base => base}/ocsp/shared/conf/acl.ldif       |    0
 .../base => base}/ocsp/shared/conf/catalina.policy |    0
 .../ocsp/shared/conf/catalina.properties           |    0
 {pki/base => base}/ocsp/shared/conf/context.xml    |    0
 {pki/base => base}/ocsp/shared/conf/database.ldif  |    0
 {pki/base => base}/ocsp/shared/conf/db.ldif        |    0
 {pki/base => base}/ocsp/shared/conf/index.ldif     |    0
 {pki/base => base}/ocsp/shared/conf/jk2.manifest   |    0
 {pki/base => base}/ocsp/shared/conf/jk2.properties |    0
 {pki/base => base}/ocsp/shared/conf/jkconf.ant.xml |    0
 .../ocsp/shared/conf/jkconfig.manifest             |    0
 .../ocsp/shared/conf/logging.properties            |    0
 {pki/base => base}/ocsp/shared/conf/manager.ldif   |    0
 {pki/base => base}/ocsp/shared/conf/schema.ldif    |    0
 .../ocsp/shared/conf/server-minimal.xml            |    0
 {pki/base => base}/ocsp/shared/conf/server.xml     |    0
 .../ocsp/shared/conf/serverCertNick.conf           |    0
 {pki/base => base}/ocsp/shared/conf/shm.manifest   |    0
 .../ocsp/shared/conf/tomcat-jk2.manifest           |    0
 .../ocsp/shared/conf/tomcat-users.xml              |    0
 {pki/base => base}/ocsp/shared/conf/tomcat6.conf   |    0
 .../ocsp/shared/conf/uriworkermap.properties       |    0
 {pki/base => base}/ocsp/shared/conf/web.xml        |    0
 .../ocsp/shared/conf/workers.properties            |    0
 .../ocsp/shared/conf/workers.properties.minimal    |    0
 .../ocsp/shared/conf/workers2.properties           |    0
 .../ocsp/shared/conf/workers2.properties.minimal   |    0
 .../base => base}/ocsp/shared/etc/init.d/pki-ocspd |    0
 .../shared/lib/systemd/system/pki-ocspd.target     |    0
 .../shared/lib/systemd/system/pki-ocspd@.service   |    0
 .../ocsp/shared/webapps/ROOT/WEB-INF/web.xml       |    0
 .../ocsp/shared/webapps/ROOT/index.jsp             |    0
 .../webapps/ocsp/WEB-INF/velocity.properties       |    0
 .../ocsp/shared/webapps/ocsp/WEB-INF/web.xml       |    0
 {pki/base => base}/ocsp/src/CMakeLists.txt         |    0
 .../ocsp/src/com/netscape/ocsp/EOCSPException.java |    0
 .../ocsp/src/com/netscape/ocsp/OCSPAuthority.java  |    0
 .../ocsp/src/com/netscape/ocsp/OCSPResources.java  |    0
 .../ocsp/src/com/netscape/ocsp/SigningUnit.java    |    0
 {pki/base => base}/ra/CMakeLists.txt               |    0
 {pki/base => base}/ra/LICENSE                      |    0
 {pki/base => base}/ra/apache/conf/httpd.conf       |    0
 {pki/base => base}/ra/apache/conf/magic            |    0
 {pki/base => base}/ra/apache/conf/mime.types       |    0
 {pki/base => base}/ra/apache/conf/nss.conf         |    0
 {pki/base => base}/ra/apache/conf/perl.conf        |    0
 {pki/base => base}/ra/doc/CMakeLists.txt           |    0
 {pki/base => base}/ra/doc/CS.cfg.in                |    0
 .../ra/emails/mail_approve_request.vm              |    0
 .../base => base}/ra/emails/mail_create_request.vm |    0
 {pki/base => base}/ra/etc/init.d/pki-rad           |    0
 {pki/base => base}/ra/forms/admin/group/add.cgi    |    0
 .../ra/forms/admin/group/add_member.cgi            |    0
 .../base => base}/ra/forms/admin/group/add_new.cgi |    0
 {pki/base => base}/ra/forms/admin/group/delete.cgi |    0
 .../ra/forms/admin/group/delete_member.cgi         |    0
 {pki/base => base}/ra/forms/admin/group/index.cgi  |    0
 {pki/base => base}/ra/forms/admin/group/read.cgi   |    0
 {pki/base => base}/ra/forms/admin/index.cgi        |    0
 {pki/base => base}/ra/forms/admin/user/add.cgi     |    0
 {pki/base => base}/ra/forms/admin/user/add_new.cgi |    0
 {pki/base => base}/ra/forms/admin/user/delete.cgi  |    0
 {pki/base => base}/ra/forms/admin/user/index.cgi   |    0
 {pki/base => base}/ra/forms/admin/user/read.cgi    |    0
 {pki/base => base}/ra/forms/agent/cert/index.cgi   |    0
 {pki/base => base}/ra/forms/agent/cert/read.cgi    |    0
 {pki/base => base}/ra/forms/agent/cert/revoke.cgi  |    0
 {pki/base => base}/ra/forms/agent/cert/submit.cgi  |    0
 {pki/base => base}/ra/forms/agent/error.cgi        |    0
 {pki/base => base}/ra/forms/agent/index.cgi        |    0
 .../ra/forms/agent/request/add_note.cgi            |    0
 .../base => base}/ra/forms/agent/request/index.cgi |    0
 {pki/base => base}/ra/forms/agent/request/op.cgi   |    0
 {pki/base => base}/ra/forms/agent/request/read.cgi |    0
 {pki/base => base}/ra/forms/ee/agent/enroll.cgi    |    0
 {pki/base => base}/ra/forms/ee/agent/index.cgi     |    0
 {pki/base => base}/ra/forms/ee/agent/new.cgi       |    0
 {pki/base => base}/ra/forms/ee/agent/start.cgi     |    0
 {pki/base => base}/ra/forms/ee/agent/submit.cgi    |    0
 {pki/base => base}/ra/forms/ee/error.cgi           |    0
 {pki/base => base}/ra/forms/ee/index.cgi           |    0
 {pki/base => base}/ra/forms/ee/request/getcert.cgi |    0
 .../ra/forms/ee/request/importcert.cgi             |    0
 {pki/base => base}/ra/forms/ee/request/index.cgi   |    0
 {pki/base => base}/ra/forms/ee/request/status.cgi  |    0
 {pki/base => base}/ra/forms/ee/scep/enroll.cgi     |    0
 {pki/base => base}/ra/forms/ee/scep/index.cgi      |    0
 {pki/base => base}/ra/forms/ee/scep/installer.cgi  |    0
 {pki/base => base}/ra/forms/ee/scep/manager.cgi    |    0
 {pki/base => base}/ra/forms/ee/scep/pkiclient.cgi  |    0
 {pki/base => base}/ra/forms/ee/scep/submit.cgi     |    0
 {pki/base => base}/ra/forms/ee/server/admin.cgi    |    0
 {pki/base => base}/ra/forms/ee/server/index.cgi    |    0
 {pki/base => base}/ra/forms/ee/server/submit.cgi   |    0
 {pki/base => base}/ra/forms/ee/user/index.cgi      |    0
 {pki/base => base}/ra/forms/ee/user/renew.cgi      |    0
 {pki/base => base}/ra/forms/ee/user/renewal.cgi    |    0
 {pki/base => base}/ra/forms/ee/user/submit.cgi     |    0
 {pki/base => base}/ra/forms/ee/user/user.cgi       |    0
 {pki/base => base}/ra/forms/index.cgi              |    0
 .../ra/lib/perl/PKI/Base/CertStore.pm              |    0
 {pki/base => base}/ra/lib/perl/PKI/Base/Conf.pm    |    0
 .../base => base}/ra/lib/perl/PKI/Base/PinStore.pm |    0
 .../base => base}/ra/lib/perl/PKI/Base/Registry.pm |    0
 .../base => base}/ra/lib/perl/PKI/Base/TimeTool.pm |    0
 .../ra/lib/perl/PKI/Base/UserStore.pm              |    0
 {pki/base => base}/ra/lib/perl/PKI/Base/Util.pm    |    0
 {pki/base => base}/ra/lib/perl/PKI/Conn/CA.pm      |    0
 .../ra/lib/perl/PKI/RA/AdminAuthPanel.pm           |    0
 .../base => base}/ra/lib/perl/PKI/RA/AdminPanel.pm |    0
 .../ra/lib/perl/PKI/RA/AgentAuthPanel.pm           |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/BasePanel.pm |    0
 .../ra/lib/perl/PKI/RA/CAInfoPanel.pm              |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/CertInfo.pm  |    0
 .../ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm     |    0
 .../ra/lib/perl/PKI/RA/CertRequestPanel.pm         |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/Common.pm    |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/Config.pm    |    0
 .../ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm      |    0
 .../ra/lib/perl/PKI/RA/ConfigHSMPanel.pm           |    0
 .../ra/lib/perl/PKI/RA/DRMInfoPanel.pm             |    0
 .../ra/lib/perl/PKI/RA/DatabasePanel.pm            |    0
 .../ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm   |    0
 .../ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm    |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/DonePanel.pm |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/GlobalVar.pm |    0
 .../ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm     |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/Login.pm     |    0
 .../base => base}/ra/lib/perl/PKI/RA/LoginPanel.pm |    0
 .../ra/lib/perl/PKI/RA/ModulePanel.pm              |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/Modutil.pm   |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/NamePanel.pm |    0
 .../ra/lib/perl/PKI/RA/ReqCertInfo.pm              |    0
 .../ra/lib/perl/PKI/RA/SecurityDomainPanel.pm      |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/SizePanel.pm |    0
 .../ra/lib/perl/PKI/RA/SubsystemTypePanel.pm       |    0
 .../ra/lib/perl/PKI/RA/TKSInfoPanel.pm             |    0
 .../ra/lib/perl/PKI/RA/WelcomePanel.pm             |    0
 {pki/base => base}/ra/lib/perl/PKI/RA/wizard.pm    |    0
 .../ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm   |    0
 .../ra/lib/perl/PKI/Request/Plugin/CreatePin.pm    |    0
 .../perl/PKI/Request/Plugin/EmailNotification.pm   |    0
 .../ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm  |    0
 .../base => base}/ra/lib/perl/PKI/Request/Queue.pm |    0
 {pki/base => base}/ra/lib/perl/PKI/Service/Op.pm   |    0
 .../base => base}/ra/lib/perl/Template/Velocity.pm |    0
 {pki/base => base}/ra/scripts/nss_pcache           |    0
 {pki/base => base}/ra/scripts/schema.sql           |    0
 {pki/base => base}/ra/setup/CMakeLists.txt         |    0
 {pki/base => base}/ra/setup/registry_instance      |    0
 .../scripts/enable_cvs_keywords_in_svn             |    0
 {pki/base => base}/scripts/pkicheck                |    0
 {pki/base => base}/scripts/pkimanifest             |    0
 {pki/base => base}/selinux/CMakeLists.txt          |    0
 {pki/base => base}/selinux/LICENSE                 |    0
 {pki/base => base}/selinux/src/CMakeLists.txt      |    0
 {pki/base => base}/selinux/src/Makefile            |    0
 {pki/base => base}/selinux/src/pki.fc              |    0
 {pki/base => base}/selinux/src/pki.if              |    0
 {pki/base => base}/selinux/src/pki.sh              |    0
 {pki/base => base}/selinux/src/pki.te              |    0
 {pki/base => base}/setup/CMakeLists.txt            |    0
 {pki/base => base}/setup/LICENSE                   |    0
 {pki/base => base}/setup/pki-setup-proxy           |    0
 {pki/base => base}/setup/pkicommon.pm              |    0
 {pki/base => base}/setup/pkicreate                 |    0
 {pki/base => base}/setup/pkiremove                 |    0
 {pki/base => base}/setup/scripts/functions         |    0
 .../setup/scripts/pki_apache_initscript            |    0
 {pki/base => base}/setup/scripts/pkicontrol        |    0
 {pki/base => base}/silent/CMakeLists.txt           |    0
 {pki/base => base}/silent/LICENSE                  |    0
 {pki/base => base}/silent/scripts/CMakeLists.txt   |    0
 {pki/base => base}/silent/scripts/pkisilent        |    0
 {pki/base => base}/silent/src/CMakeLists.txt       |    0
 .../silent/src/argparser/ArgParseException.java    |    0
 .../silent/src/argparser/ArgParser.java            |    0
 .../silent/src/argparser/ArgParserTest.java        |    0
 .../silent/src/argparser/BooleanHolder.java        |    0
 .../silent/src/argparser/CharHolder.java           |    0
 .../silent/src/argparser/DoubleHolder.java         |    0
 .../silent/src/argparser/FloatHolder.java          |    0
 .../silent/src/argparser/IntHolder.java            |    0
 .../silent/src/argparser/LongHolder.java           |    0
 .../silent/src/argparser/ObjectHolder.java         |    0
 .../silent/src/argparser/SimpleExample.java        |    0
 .../silent/src/argparser/StringHolder.java         |    0
 .../silent/src/argparser/StringScanException.java  |    0
 .../silent/src/argparser/StringScanner.java        |    0
 {pki/base => base}/silent/src/ca/ConfigureCA.java  |    0
 {pki/base => base}/silent/src/ca/DirEnroll.java    |    0
 {pki/base => base}/silent/src/ca/Request.java      |    0
 {pki/base => base}/silent/src/ca/UserEnroll.java   |    0
 {pki/base => base}/silent/src/ca/checkRequest.java |    0
 .../silent/src/common/AutoInstaller.java           |    0
 .../base => base}/silent/src/common/BaseState.java |    0
 .../base => base}/silent/src/common/CMSConfig.java |    0
 .../silent/src/common/CMSInstance.java             |    0
 {pki/base => base}/silent/src/common/CMSLDAP.java  |    0
 .../silent/src/common/CMSProperties.java           |    0
 {pki/base => base}/silent/src/common/CMSTask.java  |    0
 .../silent/src/common/Certificate_Record.java      |    0
 .../base => base}/silent/src/common/ComCrypto.java |    0
 .../base => base}/silent/src/common/Con2Agent.java |    0
 {pki/base => base}/silent/src/common/ParseXML.java |    0
 .../base => base}/silent/src/common/PostQuery.java |    0
 .../silent/src/common/ServerInfo.java              |    0
 .../silent/src/common/TestClient.java              |    0
 .../base => base}/silent/src/common/Utilities.java |    0
 .../silent/src/common/createinstance.java          |    0
 .../base => base}/silent/src/drm/ConfigureDRM.java |    0
 .../silent/src/http/CertSelection.java             |    0
 .../silent/src/http/HTMLDocument.java              |    0
 {pki/base => base}/silent/src/http/HTTPClient.java |    0
 .../silent/src/http/HTTPResponse.java              |    0
 .../silent/src/ocsp/ConfigureOCSP.java             |    0
 {pki/base => base}/silent/src/ra/ConfigureRA.java  |    0
 .../silent/src/subca/ConfigureSubCA.java           |    0
 .../base => base}/silent/src/tks/ConfigureTKS.java |    0
 .../base => base}/silent/src/tps/ConfigureTPS.java |    0
 .../silent/templates/pki_silent.template           |    0
 .../silent/templates/subca_silent.template         |    0
 {pki/base => base}/symkey/CMakeLists.txt           |    0
 {pki/base => base}/symkey/LICENSE                  |    0
 {pki/base => base}/symkey/src/CMakeLists.txt       |    0
 .../symkey/src/com/netscape/symkey/Base.h          |    0
 .../symkey/src/com/netscape/symkey/Buffer.cpp      |    0
 .../symkey/src/com/netscape/symkey/Buffer.h        |    0
 .../symkey/src/com/netscape/symkey/CMakeLists.txt  |    0
 .../symkey/src/com/netscape/symkey/EncryptData.cpp |    0
 .../symkey/src/com/netscape/symkey/SessionKey.cpp  |    0
 .../symkey/src/com/netscape/symkey/SessionKey.java |    0
 .../symkey/src/com/netscape/symkey/SymKey.cpp      |    0
 .../symkey/src/com/netscape/symkey/SymKey.h        |    0
 {pki/base => base}/tks/CMakeLists.txt              |    0
 {pki/base => base}/tks/LICENSE                     |    0
 {pki/base => base}/tks/setup/CMakeLists.txt        |    0
 {pki/base => base}/tks/setup/registry_instance     |    0
 {pki/base => base}/tks/shared/conf/CMakeLists.txt  |    0
 {pki/base => base}/tks/shared/conf/CS.cfg.in       |    0
 {pki/base => base}/tks/shared/conf/acl.ldif        |    0
 {pki/base => base}/tks/shared/conf/catalina.policy |    0
 .../tks/shared/conf/catalina.properties            |    0
 {pki/base => base}/tks/shared/conf/context.xml     |    0
 {pki/base => base}/tks/shared/conf/database.ldif   |    0
 {pki/base => base}/tks/shared/conf/db.ldif         |    0
 {pki/base => base}/tks/shared/conf/index.ldif      |    0
 {pki/base => base}/tks/shared/conf/jk2.manifest    |    0
 {pki/base => base}/tks/shared/conf/jk2.properties  |    0
 {pki/base => base}/tks/shared/conf/jkconf.ant.xml  |    0
 .../tks/shared/conf/jkconfig.manifest              |    0
 .../tks/shared/conf/logging.properties             |    0
 {pki/base => base}/tks/shared/conf/manager.ldif    |    0
 {pki/base => base}/tks/shared/conf/schema.ldif     |    0
 .../tks/shared/conf/server-minimal.xml             |    0
 {pki/base => base}/tks/shared/conf/server.xml      |    0
 .../tks/shared/conf/serverCertNick.conf            |    0
 {pki/base => base}/tks/shared/conf/shm.manifest    |    0
 .../tks/shared/conf/tomcat-jk2.manifest            |    0
 .../base => base}/tks/shared/conf/tomcat-users.xml |    0
 {pki/base => base}/tks/shared/conf/tomcat6.conf    |    0
 .../tks/shared/conf/uriworkermap.properties        |    0
 {pki/base => base}/tks/shared/conf/web.xml         |    0
 .../tks/shared/conf/workers.properties             |    0
 .../tks/shared/conf/workers.properties.minimal     |    0
 .../tks/shared/conf/workers2.properties            |    0
 .../tks/shared/conf/workers2.properties.minimal    |    0
 {pki/base => base}/tks/shared/etc/init.d/pki-tksd  |    0
 .../tks/shared/lib/systemd/system/pki-tksd.target  |    0
 .../shared/lib/systemd/system/pki-tksd@.service    |    0
 .../tks/shared/webapps/ROOT/WEB-INF/web.xml        |    0
 .../tks/shared/webapps/ROOT/index.jsp              |    0
 .../shared/webapps/tks/WEB-INF/velocity.properties |    0
 .../tks/shared/webapps/tks/WEB-INF/web.xml         |    0
 {pki/base => base}/tks/src/CMakeLists.txt          |    0
 .../tks/src/com/netscape/tks/TKSAuthority.java     |    0
 {pki/base => base}/tps/CMakeLists.txt              |    0
 {pki/base => base}/tps/LICENSE                     |    0
 {pki/base => base}/tps/apache/LICENSE-2.0          |    0
 {pki/base => base}/tps/apache/conf/httpd.conf      |    0
 {pki/base => base}/tps/apache/conf/magic           |    0
 {pki/base => base}/tps/apache/conf/mime.types      |    0
 {pki/base => base}/tps/apache/conf/nss.conf        |    0
 {pki/base => base}/tps/apache/conf/perl.conf       |    0
 .../tps/apache/pki_instance_command_wrapper        |    0
 .../tps/apache/pki_subsystem_command_wrapper       |    0
 {pki/base => base}/tps/apache/readme.html          |    0
 {pki/base => base}/tps/applets/1.2.4122DFB4.ijc    |  Bin 11944 -> 11944 bytes
 {pki/base => base}/tps/applets/1.2.416DA155.ijc    |  Bin 11945 -> 11945 bytes
 {pki/base => base}/tps/applets/1.3.42260AFA.ijc    |  Bin 13117 -> 13117 bytes
 {pki/base => base}/tps/applets/1.3.4255CC01.ijc    |  Bin 14909 -> 14909 bytes
 {pki/base => base}/tps/applets/1.3.42659461.ijc    |  Bin 14879 -> 14879 bytes
 {pki/base => base}/tps/applets/1.3.427BDDB8.ijc    |  Bin 14527 -> 14527 bytes
 {pki/base => base}/tps/applets/1.3.44724DDE.ijc    |  Bin 14529 -> 14529 bytes
 {pki/base => base}/tps/applets/1.3.45787308.ijc    |  Bin 14893 -> 14893 bytes
 {pki/base => base}/tps/applets/1.4.499dc06c.ijc    |  Bin 14912 -> 14912 bytes
 {pki/base => base}/tps/applets/1.4.4d40a449.ijc    |  Bin 14874 -> 14874 bytes
 {pki/base => base}/tps/applets/3FD00877.ijc        |  Bin 13662 -> 13662 bytes
 {pki/base => base}/tps/applets/4003196C.ijc        |  Bin 13683 -> 13683 bytes
 {pki/base => base}/tps/applets/402428AD.ijc        |  Bin 13699 -> 13699 bytes
 {pki/base => base}/tps/applets/404E4697.ijc        |  Bin 11995 -> 11995 bytes
 {pki/base => base}/tps/applets/4122DFB4.ijc        |  Bin 11944 -> 11944 bytes
 {pki/base => base}/tps/applets/listappletdates     |    0
 {pki/base => base}/tps/applets/readme.txt          |    0
 {pki/base => base}/tps/doc/CMakeLists.txt          |    0
 {pki/base => base}/tps/doc/CS.cfg.in               |    0
 {pki/base => base}/tps/etc/init.d/pki-tpsd         |    0
 .../tps/forms/esc/cgi-bin/demo/enroll.cgi          |    0
 .../tps/forms/esc/cgi-bin/demo/index.cgi           |    0
 .../tps/forms/esc/cgi-bin/home/cachain.cgi         |    0
 .../tps/forms/esc/cgi-bin/home/enroll.cgi          |    0
 .../tps/forms/esc/cgi-bin/home/index.cgi           |    0
 .../tps/forms/esc/cgi-bin/so/enroll.cgi            |    0
 .../tps/forms/esc/cgi-bin/so/index.cgi             |    0
 .../tps/forms/esc/cgi-bin/sow/ajax-list.cgi        |    0
 .../base => base}/tps/forms/esc/cgi-bin/sow/cfg.pl |    0
 .../tps/forms/esc/cgi-bin/sow/enroll.cgi           |    0
 .../tps/forms/esc/cgi-bin/sow/enroll_temp.cgi      |    0
 .../tps/forms/esc/cgi-bin/sow/format.cgi           |    0
 .../tps/forms/esc/cgi-bin/sow/formatso.cgi         |    0
 .../tps/forms/esc/cgi-bin/sow/index.cgi            |    0
 .../tps/forms/esc/cgi-bin/sow/is_agent.cgi         |    0
 .../tps/forms/esc/cgi-bin/sow/is_user.cgi          |    0
 .../tps/forms/esc/cgi-bin/sow/main.cgi             |    0
 .../tps/forms/esc/cgi-bin/sow/noaccess.cgi         |    0
 .../tps/forms/esc/cgi-bin/sow/read.cgi             |    0
 .../tps/forms/esc/cgi-bin/sow/read_temp.cgi        |    0
 .../tps/forms/esc/cgi-bin/sow/search.cgi           |    0
 .../tps/forms/esc/cgi-bin/sow/search_temp.cgi      |    0
 .../tps/forms/esc/cgi-bin/sow/seturl.cgi           |    0
 .../tps/forms/esc/cgi-bin/sow/welcome.cgi          |    0
 {pki/base => base}/tps/forms/esc/esc.cgi           |    0
 {pki/base => base}/tps/forms/esc/home.cgi          |    0
 {pki/base => base}/tps/forms/index.cgi             |    0
 {pki/base => base}/tps/forms/index.html            |    0
 {pki/base => base}/tps/lib/perl/PKI/Base/Conf.pm   |    0
 .../tps/lib/perl/PKI/Base/Registry.pm              |    0
 {pki/base => base}/tps/lib/perl/PKI/Service/Op.pm  |    0
 .../tps/lib/perl/PKI/TPS/AdminAuthPanel.pm         |    0
 .../tps/lib/perl/PKI/TPS/AdminPanel.pm             |    0
 .../tps/lib/perl/PKI/TPS/AgentAuthPanel.pm         |    0
 .../tps/lib/perl/PKI/TPS/AuthDBPanel.pm            |    0
 .../tps/lib/perl/PKI/TPS/BasePanel.pm              |    0
 .../tps/lib/perl/PKI/TPS/CAInfoPanel.pm            |    0
 .../base => base}/tps/lib/perl/PKI/TPS/CertInfo.pm |    0
 .../tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm   |    0
 .../tps/lib/perl/PKI/TPS/CertRequestPanel.pm       |    0
 {pki/base => base}/tps/lib/perl/PKI/TPS/Common.pm  |    0
 {pki/base => base}/tps/lib/perl/PKI/TPS/Config.pm  |    0
 .../tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm    |    0
 .../tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm         |    0
 .../tps/lib/perl/PKI/TPS/DRMInfoPanel.pm           |    0
 .../tps/lib/perl/PKI/TPS/DatabasePanel.pm          |    0
 .../tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm |    0
 .../tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm  |    0
 .../tps/lib/perl/PKI/TPS/DonePanel.pm              |    0
 .../tps/lib/perl/PKI/TPS/GlobalVar.pm              |    0
 .../tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm   |    0
 {pki/base => base}/tps/lib/perl/PKI/TPS/Login.pm   |    0
 .../tps/lib/perl/PKI/TPS/LoginPanel.pm             |    0
 .../tps/lib/perl/PKI/TPS/ModulePanel.pm            |    0
 {pki/base => base}/tps/lib/perl/PKI/TPS/Modutil.pm |    0
 .../tps/lib/perl/PKI/TPS/NamePanel.pm              |    0
 .../tps/lib/perl/PKI/TPS/ReqCertInfo.pm            |    0
 .../tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm    |    0
 .../tps/lib/perl/PKI/TPS/SizePanel.pm              |    0
 .../tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm     |    0
 .../tps/lib/perl/PKI/TPS/TKSInfoPanel.pm           |    0
 .../tps/lib/perl/PKI/TPS/WelcomePanel.pm           |    0
 {pki/base => base}/tps/lib/perl/PKI/TPS/wizard.pm  |    0
 .../tps/lib/perl/Template/Velocity.pm              |    0
 {pki/base => base}/tps/scripts/addAgents.ldif      |    0
 {pki/base => base}/tps/scripts/addIndexes.ldif     |    0
 {pki/base => base}/tps/scripts/addTokens.ldif      |    0
 {pki/base => base}/tps/scripts/addVLVIndexes.ldif  |    0
 {pki/base => base}/tps/scripts/database.ldif       |    0
 {pki/base => base}/tps/scripts/nss_pcache          |    0
 {pki/base => base}/tps/scripts/schemaMods.ldif     |    0
 {pki/base => base}/tps/scripts/vlvtasks.ldif       |    0
 {pki/base => base}/tps/setup/CMakeLists.txt        |    0
 {pki/base => base}/tps/setup/create.pl             |    0
 {pki/base => base}/tps/setup/registry_instance     |    0
 {pki/base => base}/tps/src/CMakeLists.txt          |    0
 {pki/base => base}/tps/src/apdu/APDU.cpp           |    0
 {pki/base => base}/tps/src/apdu/APDU_Response.cpp  |    0
 .../tps/src/apdu/Create_Object_APDU.cpp            |    0
 .../base => base}/tps/src/apdu/Create_Pin_APDU.cpp |    0
 .../tps/src/apdu/Delete_File_APDU.cpp              |    0
 .../tps/src/apdu/External_Authenticate_APDU.cpp    |    0
 .../tps/src/apdu/Format_Muscle_Applet_APDU.cpp     |    0
 .../tps/src/apdu/Generate_Key_APDU.cpp             |    0
 {pki/base => base}/tps/src/apdu/Get_Data_APDU.cpp  |    0
 .../tps/src/apdu/Get_IssuerInfo_APDU.cpp           |    0
 .../base => base}/tps/src/apdu/Get_Status_APDU.cpp |    0
 .../tps/src/apdu/Get_Version_APDU.cpp              |    0
 .../base => base}/tps/src/apdu/Import_Key_APDU.cpp |    0
 .../tps/src/apdu/Import_Key_Enc_APDU.cpp           |    0
 .../tps/src/apdu/Initialize_Update_APDU.cpp        |    0
 .../tps/src/apdu/Install_Applet_APDU.cpp           |    0
 .../tps/src/apdu/Install_Load_APDU.cpp             |    0
 {pki/base => base}/tps/src/apdu/Lifecycle_APDU.cpp |    0
 .../tps/src/apdu/List_Objects_APDU.cpp             |    0
 {pki/base => base}/tps/src/apdu/List_Pins_APDU.cpp |    0
 {pki/base => base}/tps/src/apdu/Load_File_APDU.cpp |    0
 {pki/base => base}/tps/src/apdu/Put_Key_APDU.cpp   |    0
 .../tps/src/apdu/Read_Buffer_APDU.cpp              |    0
 .../tps/src/apdu/Read_Object_APDU.cpp              |    0
 {pki/base => base}/tps/src/apdu/Select_APDU.cpp    |    0
 .../tps/src/apdu/Set_IssuerInfo_APDU.cpp           |    0
 {pki/base => base}/tps/src/apdu/Set_Pin_APDU.cpp   |    0
 .../tps/src/apdu/Unblock_Pin_APDU.cpp              |    0
 .../tps/src/apdu/Write_Object_APDU.cpp             |    0
 .../tps/src/authentication/CMakeLists.txt          |    0
 .../tps/src/authentication/LDAP_Authentication.cpp |    0
 {pki/base => base}/tps/src/channel/Channel.cpp     |    0
 .../tps/src/channel/Secure_Channel.cpp             |    0
 {pki/base => base}/tps/src/cms/CertEnroll.cpp      |    0
 {pki/base => base}/tps/src/cms/ConnectionInfo.cpp  |    0
 {pki/base => base}/tps/src/cms/HttpConnection.cpp  |    0
 {pki/base => base}/tps/src/engine/RA.cpp           |    0
 {pki/base => base}/tps/src/httpClient/Cache.cpp    |    0
 {pki/base => base}/tps/src/httpClient/engine.cpp   |    0
 {pki/base => base}/tps/src/httpClient/http.cpp     |    0
 .../tps/src/httpClient/httpClient.cpp              |    0
 .../base => base}/tps/src/httpClient/nscperror.cpp |    0
 {pki/base => base}/tps/src/httpClient/request.cpp  |    0
 {pki/base => base}/tps/src/httpClient/response.cpp |    0
 {pki/base => base}/tps/src/include/apdu/APDU.h     |    0
 .../tps/src/include/apdu/APDU_Response.h           |    0
 .../tps/src/include/apdu/Create_Object_APDU.h      |    0
 .../tps/src/include/apdu/Create_Pin_APDU.h         |    0
 .../tps/src/include/apdu/Delete_File_APDU.h        |    0
 .../src/include/apdu/External_Authenticate_APDU.h  |    0
 .../src/include/apdu/Format_Muscle_Applet_APDU.h   |    0
 .../tps/src/include/apdu/Generate_Key_APDU.h       |    0
 .../tps/src/include/apdu/Get_Data_APDU.h           |    0
 .../tps/src/include/apdu/Get_IssuerInfo_APDU.h     |    0
 .../tps/src/include/apdu/Get_Status_APDU.h         |    0
 .../tps/src/include/apdu/Get_Version_APDU.h        |    0
 .../tps/src/include/apdu/Import_Key_APDU.h         |    0
 .../tps/src/include/apdu/Import_Key_Enc_APDU.h     |    0
 .../tps/src/include/apdu/Initialize_Update_APDU.h  |    0
 .../tps/src/include/apdu/Install_Applet_APDU.h     |    0
 .../tps/src/include/apdu/Install_Load_APDU.h       |    0
 .../tps/src/include/apdu/Lifecycle_APDU.h          |    0
 .../tps/src/include/apdu/List_Objects_APDU.h       |    0
 .../tps/src/include/apdu/List_Pins_APDU.h          |    0
 .../tps/src/include/apdu/Load_File_APDU.h          |    0
 .../tps/src/include/apdu/Put_Key_APDU.h            |    0
 .../tps/src/include/apdu/Read_Buffer_APDU.h        |    0
 .../tps/src/include/apdu/Read_Object_APDU.h        |    0
 .../tps/src/include/apdu/Select_APDU.h             |    0
 .../tps/src/include/apdu/Set_IssuerInfo_APDU.h     |    0
 .../tps/src/include/apdu/Set_Pin_APDU.h            |    0
 .../tps/src/include/apdu/Unblock_Pin_APDU.h        |    0
 .../tps/src/include/apdu/Write_Object_APDU.h       |    0
 .../tps/src/include/authentication/AuthParams.h    |    0
 .../src/include/authentication/Authentication.h    |    0
 .../include/authentication/LDAP_Authentication.h   |    0
 .../tps/src/include/channel/Channel.h              |    0
 .../tps/src/include/channel/Secure_Channel.h       |    0
 .../base => base}/tps/src/include/cms/CertEnroll.h |    0
 .../tps/src/include/cms/ConnectionInfo.h           |    0
 .../tps/src/include/cms/HttpConnection.h           |    0
 {pki/base => base}/tps/src/include/engine/RA.h     |    0
 {pki/base => base}/tps/src/include/engine/audit.h  |    0
 .../src/include/httpClient/httpc/AccessLogger.h    |    0
 .../tps/src/include/httpClient/httpc/Auth.h        |    0
 .../tps/src/include/httpClient/httpc/ByteBuffer.h  |    0
 .../tps/src/include/httpClient/httpc/CERTUtil.h    |    0
 .../tps/src/include/httpClient/httpc/Cache.h       |    0
 .../tps/src/include/httpClient/httpc/Connection.h  |    0
 .../include/httpClient/httpc/ConnectionListener.h  |    0
 .../tps/src/include/httpClient/httpc/DebugLogger.h |    0
 .../tps/src/include/httpClient/httpc/Defines.h     |    0
 .../tps/src/include/httpClient/httpc/ErrorLogger.h |    0
 .../tps/src/include/httpClient/httpc/Iterator.h    |    0
 .../src/include/httpClient/httpc/LogRotationTask.h |    0
 .../tps/src/include/httpClient/httpc/Logger.h      |    0
 .../tps/src/include/httpClient/httpc/NSPRerrs.h    |    0
 .../tps/src/include/httpClient/httpc/PSBuddy.h     |    0
 .../src/include/httpClient/httpc/PSBuddyCache.h    |    0
 .../tps/src/include/httpClient/httpc/PSBuddyList.h |    0
 .../src/include/httpClient/httpc/PSBuddyListener.h |    0
 .../src/include/httpClient/httpc/PSBuddyService.h  |    0
 .../src/include/httpClient/httpc/PSCertExtension.h |    0
 .../tps/src/include/httpClient/httpc/PSCommonLib.h |    0
 .../tps/src/include/httpClient/httpc/PSConfig.h    |    0
 .../src/include/httpClient/httpc/PSConfigManager.h |    0
 .../src/include/httpClient/httpc/PSConfigReader.h  |    0
 .../tps/src/include/httpClient/httpc/PSCrypt.h     |    0
 .../httpClient/httpc/PSDataSourceListener.h        |    0
 .../include/httpClient/httpc/PSDataSourceManager.h |    0
 .../tps/src/include/httpClient/httpc/PSGroup.h     |    0
 .../src/include/httpClient/httpc/PSGroupCache.h    |    0
 .../tps/src/include/httpClient/httpc/PSHelper.h    |    0
 .../tps/src/include/httpClient/httpc/PSListener.h  |    0
 .../tps/src/include/httpClient/httpc/PSPRUtil.h    |    0
 .../tps/src/include/httpClient/httpc/PSPlugin.h    |    0
 .../src/include/httpClient/httpc/PSPluginManager.h |    0
 .../tps/src/include/httpClient/httpc/PSServer.h    |    0
 .../tps/src/include/httpClient/httpc/PSServerLib.h |    0
 .../include/httpClient/httpc/PSServerListener.h    |    0
 .../src/include/httpClient/httpc/PSServerManager.h |    0
 .../include/httpClient/httpc/PSServiceListener.h   |    0
 .../include/httpClient/httpc/PSServiceManager.h    |    0
 .../tps/src/include/httpClient/httpc/PSUser.h      |    0
 .../tps/src/include/httpClient/httpc/PSWaspLib.h   |    0
 .../tps/src/include/httpClient/httpc/Pool.h        |    0
 .../src/include/httpClient/httpc/PresenceManager.h |    0
 .../src/include/httpClient/httpc/PresenceServer.h  |    0
 .../include/httpClient/httpc/PresenceServerImpl.h  |    0
 .../tps/src/include/httpClient/httpc/SECerrs.h     |    0
 .../src/include/httpClient/httpc/SSLServerSocket.h |    0
 .../tps/src/include/httpClient/httpc/SSLSocket.h   |    0
 .../tps/src/include/httpClient/httpc/SSLerrs.h     |    0
 .../src/include/httpClient/httpc/ScheduledTask.h   |    0
 .../tps/src/include/httpClient/httpc/Scheduler.h   |    0
 .../src/include/httpClient/httpc/SecurityHeaders.h |    0
 .../include/httpClient/httpc/ServerConnection.h    |    0
 .../httpClient/httpc/ServerHeaderProcessor.h       |    0
 .../src/include/httpClient/httpc/ServerSocket.h    |    0
 .../tps/src/include/httpClient/httpc/Socket.h      |    0
 .../tps/src/include/httpClient/httpc/SocketINC.h   |    0
 .../tps/src/include/httpClient/httpc/SocketLib.h   |    0
 .../tps/src/include/httpClient/httpc/StringList.h  |    0
 .../tps/src/include/httpClient/httpc/StringUtil.h  |    0
 .../tps/src/include/httpClient/httpc/TaskList.h    |    0
 .../tps/src/include/httpClient/httpc/ThreadPool.h  |    0
 .../tps/src/include/httpClient/httpc/URLUtil.h     |    0
 .../tps/src/include/httpClient/httpc/engine.h      |    0
 .../tps/src/include/httpClient/httpc/http.h        |    0
 .../tps/src/include/httpClient/httpc/request.h     |    0
 .../tps/src/include/httpClient/httpc/response.h    |    0
 .../tps/src/include/main/AttributeSpec.h           |    0
 .../tps/src/include/main/AuthenticationEntry.h     |    0
 {pki/base => base}/tps/src/include/main/Base.h     |    0
 {pki/base => base}/tps/src/include/main/Buffer.h   |    0
 .../tps/src/include/main/ConfigStore.h             |    0
 {pki/base => base}/tps/src/include/main/LogFile.h  |    0
 {pki/base => base}/tps/src/include/main/Login.h    |    0
 {pki/base => base}/tps/src/include/main/Memory.h   |    0
 .../base => base}/tps/src/include/main/MemoryMgr.h |    0
 .../tps/src/include/main/NameValueSet.h            |    0
 .../tps/src/include/main/ObjectSpec.h              |    0
 .../base => base}/tps/src/include/main/PKCS11Obj.h |    0
 .../tps/src/include/main/PublishEntry.h            |    0
 .../tps/src/include/main/RA_Context.h              |    0
 {pki/base => base}/tps/src/include/main/RA_Msg.h   |    0
 .../tps/src/include/main/RA_Session.h              |    0
 .../base => base}/tps/src/include/main/RA_pblock.h |    0
 .../tps/src/include/main/RollingLogFile.h          |    0
 {pki/base => base}/tps/src/include/main/SecureId.h |    0
 {pki/base => base}/tps/src/include/main/Util.h     |    0
 .../tps/src/include/modules/tps/AP_Context.h       |    0
 .../tps/src/include/modules/tps/AP_Session.h       |    0
 .../tps/src/include/msg/RA_ASQ_Request_Msg.h       |    0
 .../tps/src/include/msg/RA_ASQ_Response_Msg.h      |    0
 .../tps/src/include/msg/RA_Begin_Op_Msg.h          |    0
 .../tps/src/include/msg/RA_End_Op_Msg.h            |    0
 .../include/msg/RA_Extended_Login_Request_Msg.h    |    0
 .../include/msg/RA_Extended_Login_Response_Msg.h   |    0
 .../tps/src/include/msg/RA_Login_Request_Msg.h     |    0
 .../tps/src/include/msg/RA_Login_Response_Msg.h    |    0
 .../tps/src/include/msg/RA_New_Pin_Request_Msg.h   |    0
 .../tps/src/include/msg/RA_New_Pin_Response_Msg.h  |    0
 .../tps/src/include/msg/RA_SecureId_Request_Msg.h  |    0
 .../tps/src/include/msg/RA_SecureId_Response_Msg.h |    0
 .../src/include/msg/RA_Status_Update_Request_Msg.h |    0
 .../include/msg/RA_Status_Update_Response_Msg.h    |    0
 .../tps/src/include/msg/RA_Token_PDU_Request_Msg.h |    0
 .../src/include/msg/RA_Token_PDU_Response_Msg.h    |    0
 .../src/include/processor/RA_Enroll_Processor.h    |    0
 .../src/include/processor/RA_Format_Processor.h    |    0
 .../src/include/processor/RA_Pin_Reset_Processor.h |    0
 .../tps/src/include/processor/RA_Processor.h       |    0
 .../tps/src/include/processor/RA_Renew_Processor.h |    0
 .../src/include/processor/RA_Unblock_Processor.h   |    0
 .../tps/src/include/publisher/IConnector.h         |    0
 .../tps/src/include/publisher/IPublish_Data.h      |    0
 .../tps/src/include/publisher/IPublisher.h         |    0
 .../tps/src/include/publisher/NetkeyPublisher.h    |    0
 .../tps/src/include/selftests/SelfTest.h           |    0
 .../tps/src/include/selftests/TPSPresence.h        |    0
 .../include/selftests/TPSSystemCertsVerification.h |    0
 .../tps/src/include/selftests/TPSValidity.h        |    0
 .../tps/src/include/service/NK_Context.h           |    0
 .../tps/src/include/service/NK_Session.h           |    0
 {pki/base => base}/tps/src/include/tus/tus_db.h    |    0
 {pki/base => base}/tps/src/main/AttributeSpec.cpp  |    0
 {pki/base => base}/tps/src/main/AuthParams.cpp     |    0
 {pki/base => base}/tps/src/main/Authentication.cpp |    0
 .../tps/src/main/AuthenticationEntry.cpp           |    0
 {pki/base => base}/tps/src/main/Buffer.cpp         |    0
 {pki/base => base}/tps/src/main/ConfigStore.cpp    |    0
 {pki/base => base}/tps/src/main/LogFile.cpp        |    0
 {pki/base => base}/tps/src/main/Login.cpp          |    0
 {pki/base => base}/tps/src/main/Memory.cpp         |    0
 {pki/base => base}/tps/src/main/NameValueSet.cpp   |    0
 {pki/base => base}/tps/src/main/ObjectSpec.cpp     |    0
 {pki/base => base}/tps/src/main/PKCS11Obj.cpp      |    0
 {pki/base => base}/tps/src/main/RA_Context.cpp     |    0
 {pki/base => base}/tps/src/main/RA_Msg.cpp         |    0
 {pki/base => base}/tps/src/main/RA_Session.cpp     |    0
 {pki/base => base}/tps/src/main/RA_pblock.cpp      |    0
 {pki/base => base}/tps/src/main/RollingLogFile.cpp |    0
 {pki/base => base}/tps/src/main/SecureId.cpp       |    0
 {pki/base => base}/tps/src/main/Util.cpp           |    0
 {pki/base => base}/tps/src/modules/CMakeLists.txt  |    0
 .../tps/src/modules/tokendb/CMakeLists.txt         |    0
 .../tps/src/modules/tokendb/mod_tokendb.cpp        |    0
 .../tps/src/modules/tps/AP_Context.cpp             |    0
 .../tps/src/modules/tps/AP_Session.cpp             |    0
 .../tps/src/modules/tps/CMakeLists.txt             |    0
 {pki/base => base}/tps/src/modules/tps/mod_tps.cpp |    0
 .../tps/src/msg/RA_ASQ_Request_Msg.cpp             |    0
 .../tps/src/msg/RA_ASQ_Response_Msg.cpp            |    0
 {pki/base => base}/tps/src/msg/RA_Begin_Op_Msg.cpp |    0
 {pki/base => base}/tps/src/msg/RA_End_Op_Msg.cpp   |    0
 .../tps/src/msg/RA_Extended_Login_Request_Msg.cpp  |    0
 .../tps/src/msg/RA_Extended_Login_Response_Msg.cpp |    0
 .../tps/src/msg/RA_Login_Request_Msg.cpp           |    0
 .../tps/src/msg/RA_Login_Response_Msg.cpp          |    0
 .../tps/src/msg/RA_New_Pin_Request_Msg.cpp         |    0
 .../tps/src/msg/RA_New_Pin_Response_Msg.cpp        |    0
 .../tps/src/msg/RA_SecureId_Request_Msg.cpp        |    0
 .../tps/src/msg/RA_SecureId_Response_Msg.cpp       |    0
 .../tps/src/msg/RA_Status_Update_Request_Msg.cpp   |    0
 .../tps/src/msg/RA_Status_Update_Response_Msg.cpp  |    0
 .../tps/src/msg/RA_Token_PDU_Request_Msg.cpp       |    0
 .../tps/src/msg/RA_Token_PDU_Response_Msg.cpp      |    0
 .../tps/src/processor/RA_Enroll_Processor.cpp      |    0
 .../tps/src/processor/RA_Format_Processor.cpp      |    0
 .../tps/src/processor/RA_Pin_Reset_Processor.cpp   |    0
 .../tps/src/processor/RA_Processor.cpp             |    0
 .../tps/src/processor/RA_Renew_Processor.cpp       |    0
 .../tps/src/processor/RA_Unblock_Processor.cpp     |    0
 {pki/base => base}/tps/src/selftests/SelfTest.cpp  |    0
 .../tps/src/selftests/TPSPresence.cpp              |    0
 .../src/selftests/TPSSystemCertsVerification.cpp   |    0
 .../tps/src/selftests/TPSValidity.cpp              |    0
 .../tps/src/test/Test_ConfigStore.cfg              |    0
 .../tps/src/test/Test_ConfigStore.cpp              |    0
 {pki/base => base}/tps/src/tus/CMakeLists.txt      |    0
 {pki/base => base}/tps/src/tus/tus_db.c            |    0
 .../tps/stubs/modules/nss/mod_nss_stub.c           |    0
 {pki/base => base}/tps/tools/CMakeLists.txt        |    0
 .../tps/tools/raclient/CMakeLists.txt              |    0
 .../base => base}/tps/tools/raclient/RA_Client.cpp |    0
 {pki/base => base}/tps/tools/raclient/RA_Client.h  |    0
 {pki/base => base}/tps/tools/raclient/RA_Conn.cpp  |    0
 {pki/base => base}/tps/tools/raclient/RA_Conn.h    |    0
 {pki/base => base}/tps/tools/raclient/RA_Token.cpp |    0
 {pki/base => base}/tps/tools/raclient/RA_Token.h   |    0
 {pki/base => base}/tps/tools/raclient/enroll.tps   |    0
 {pki/base => base}/tps/tools/raclient/enroll1.test |    0
 {pki/base => base}/tps/tools/raclient/format.tps   |    0
 .../tps/tools/raclient/nt_enroll.test              |    0
 {pki/base => base}/tps/tools/raclient/readme.txt   |    0
 .../base => base}/tps/tools/raclient/reset_pin.tps |    0
 .../tps/tools/raclient/reset_pin1.test             |    0
 .../tps/tools/raclient/reset_pin2.test             |    0
 {pki/base => base}/tps/tools/tus/add.c             |    0
 {pki/base => base}/tps/tools/tus/test.c            |    0
 {pki/base => base}/tps/ui/perl/Velocity.pm         |    0
 {pki/base => base}/tps/wrappers/tpsclient.in       |    0
 {pki/base => base}/util/CMakeLists.txt             |    0
 {pki/base => base}/util/LICENSE                    |    0
 {pki/base => base}/util/src/CMakeLists.txt         |    0
 .../com/netscape/cmsutil/crypto/CryptoUtil.java    |    0
 .../src/com/netscape/cmsutil/crypto/Module.java    |    0
 .../src/com/netscape/cmsutil/crypto/Token.java     |    0
 .../com/netscape/cmsutil/http/ConnectAsync.java    |    0
 .../util/src/com/netscape/cmsutil/http/Http.java   |    0
 .../src/com/netscape/cmsutil/http/HttpClient.java  |    0
 .../netscape/cmsutil/http/HttpEofException.java    |    0
 .../src/com/netscape/cmsutil/http/HttpMessage.java |    0
 .../cmsutil/http/HttpProtocolException.java        |    0
 .../src/com/netscape/cmsutil/http/HttpRequest.java |    0
 .../com/netscape/cmsutil/http/HttpResponse.java    |    0
 .../netscape/cmsutil/http/JssSSLSocketFactory.java |    0
 .../src/com/netscape/cmsutil/ldap/LDAPUtil.java    |    0
 .../com/netscape/cmsutil/net/ISocketFactory.java   |    0
 .../netscape/cmsutil/ocsp/BasicOCSPResponse.java   |    0
 .../util/src/com/netscape/cmsutil/ocsp/CertID.java |    0
 .../src/com/netscape/cmsutil/ocsp/CertStatus.java  |    0
 .../src/com/netscape/cmsutil/ocsp/GoodInfo.java    |    0
 .../src/com/netscape/cmsutil/ocsp/KeyHashID.java   |    0
 .../util/src/com/netscape/cmsutil/ocsp/NameID.java |    0
 .../src/com/netscape/cmsutil/ocsp/OCSPRequest.java |    0
 .../com/netscape/cmsutil/ocsp/OCSPResponse.java    |    0
 .../netscape/cmsutil/ocsp/OCSPResponseStatus.java  |    0
 .../src/com/netscape/cmsutil/ocsp/Request.java     |    0
 .../src/com/netscape/cmsutil/ocsp/ResponderID.java |    0
 .../src/com/netscape/cmsutil/ocsp/Response.java    |    0
 .../com/netscape/cmsutil/ocsp/ResponseBytes.java   |    0
 .../com/netscape/cmsutil/ocsp/ResponseData.java    |    0
 .../src/com/netscape/cmsutil/ocsp/RevokedInfo.java |    0
 .../src/com/netscape/cmsutil/ocsp/Signature.java   |    0
 .../com/netscape/cmsutil/ocsp/SingleResponse.java  |    0
 .../src/com/netscape/cmsutil/ocsp/TBSRequest.java  |    0
 .../src/com/netscape/cmsutil/ocsp/UnknownInfo.java |    0
 .../netscape/cmsutil/password/IPasswordReader.java |    0
 .../netscape/cmsutil/password/IPasswordStore.java  |    0
 .../netscape/cmsutil/password/IPasswordWriter.java |    0
 .../cmsutil/password/PlainPasswordFile.java        |    0
 .../cmsutil/password/PlainPasswordReader.java      |    0
 .../cmsutil/password/PlainPasswordWriter.java      |    0
 .../com/netscape/cmsutil/radius/AccessAccept.java  |    0
 .../netscape/cmsutil/radius/AccessChallenge.java   |    0
 .../com/netscape/cmsutil/radius/AccessReject.java  |    0
 .../com/netscape/cmsutil/radius/AccessRequest.java |    0
 .../src/com/netscape/cmsutil/radius/Attribute.java |    0
 .../netscape/cmsutil/radius/AttributeFactory.java  |    0
 .../com/netscape/cmsutil/radius/AttributeSet.java  |    0
 .../com/netscape/cmsutil/radius/Authenticator.java |    0
 .../cmsutil/radius/CHAPChallengeAttribute.java     |    0
 .../cmsutil/radius/CHAPPasswordAttribute.java      |    0
 .../cmsutil/radius/CallbackIdAttribute.java        |    0
 .../cmsutil/radius/CallbackNumberAttribute.java    |    0
 .../cmsutil/radius/CallerStationIdAttribute.java   |    0
 .../cmsutil/radius/CallingStationIdAttribute.java  |    0
 .../cmsutil/radius/ChallengeException.java         |    0
 .../netscape/cmsutil/radius/FilterIdAttribute.java |    0
 .../radius/FramedAppleTalkLinkAttribute.java       |    0
 .../radius/FramedAppleTalkNetworkAttribute.java    |    0
 .../radius/FramedAppleTalkZoneAttribute.java       |    0
 .../cmsutil/radius/FramedCompressionAttribute.java |    0
 .../cmsutil/radius/FramedIPAddressAttribute.java   |    0
 .../cmsutil/radius/FramedIPNetmaskAttribute.java   |    0
 .../cmsutil/radius/FramedIPXNetworkAttribute.java  |    0
 .../cmsutil/radius/FramedMTUAttribute.java         |    0
 .../cmsutil/radius/FramedProtocolAttribute.java    |    0
 .../cmsutil/radius/FramedRouteAttribute.java       |    0
 .../cmsutil/radius/FramedRoutingAttribute.java     |    0
 .../netscape/cmsutil/radius/GenericAttribute.java  |    0
 .../cmsutil/radius/IdleTimeoutAttribute.java       |    0
 .../cmsutil/radius/LoginIPHostAttribute.java       |    0
 .../cmsutil/radius/LoginLATGroupAttribute.java     |    0
 .../cmsutil/radius/LoginLATNodeAttribute.java      |    0
 .../cmsutil/radius/LoginLATPortAttribute.java      |    0
 .../cmsutil/radius/LoginLATServiceAttribute.java   |    0
 .../cmsutil/radius/LoginServiceAttribute.java      |    0
 .../cmsutil/radius/LoginTCPPortAttribute.java      |    0
 .../netscape/cmsutil/radius/NASClassAttribute.java |    0
 .../cmsutil/radius/NASIPAddressAttribute.java      |    0
 .../cmsutil/radius/NASIdentifierAttribute.java     |    0
 .../src/com/netscape/cmsutil/radius/NASPacket.java |    0
 .../netscape/cmsutil/radius/NASPortAttribute.java  |    0
 .../cmsutil/radius/NASPortTypeAttribute.java       |    0
 .../src/com/netscape/cmsutil/radius/Packet.java    |    0
 .../com/netscape/cmsutil/radius/PacketFactory.java |    0
 .../cmsutil/radius/PortLimitAttribute.java         |    0
 .../cmsutil/radius/ProxyStateAttribute.java        |    0
 .../com/netscape/cmsutil/radius/RadiusConn.java    |    0
 .../netscape/cmsutil/radius/RejectException.java   |    0
 .../cmsutil/radius/ReplyMessageAttribute.java      |    0
 .../cmsutil/radius/RequestAuthenticator.java       |    0
 .../cmsutil/radius/ResponseAuthenticator.java      |    0
 .../com/netscape/cmsutil/radius/ServerPacket.java  |    0
 .../cmsutil/radius/ServiceTypeAttribute.java       |    0
 .../cmsutil/radius/SessionTimeoutAttribute.java    |    0
 .../netscape/cmsutil/radius/StateAttribute.java    |    0
 .../cmsutil/radius/TerminationActionAttribute.java |    0
 .../netscape/cmsutil/radius/UserNameAttribute.java |    0
 .../cmsutil/radius/UserPasswordAttribute.java      |    0
 .../cmsutil/radius/VendorSpecificAttribute.java    |    0
 .../com/netscape/cmsutil/scep/CRSPKIMessage.java   |    0
 .../util/src/com/netscape/cmsutil/util/Cert.java   |    0
 .../util/src/com/netscape/cmsutil/util/Fmt.java    |    0
 .../src/com/netscape/cmsutil/util/HMACDigest.java  |    0
 .../util/src/com/netscape/cmsutil/util/Utils.java  |    0
 .../src/com/netscape/cmsutil/xml/XMLObject.java    |    0
 .../util/src/netscape/net/NetworkClient.java       |    0
 .../src/netscape/net/TransferProtocolClient.java   |    0
 .../util/src/netscape/net/smtp/SmtpClient.java     |    0
 .../netscape/net/smtp/SmtpProtocolException.java   |    0
 .../src/netscape/security/acl/AclEntryImpl.java    |    0
 .../util/src/netscape/security/acl/AclImpl.java    |    0
 .../netscape/security/acl/AllPermissionsImpl.java  |    0
 .../util/src/netscape/security/acl/GroupImpl.java  |    0
 .../util/src/netscape/security/acl/OwnerImpl.java  |    0
 .../src/netscape/security/acl/PermissionImpl.java  |    0
 .../src/netscape/security/acl/PrincipalImpl.java   |    0
 .../src/netscape/security/acl/WorldGroupImpl.java  |    0
 .../security/extensions/AccessDescription.java     |    0
 .../extensions/AuthInfoAccessExtension.java        |    0
 .../src/netscape/security/extensions/CertInfo.java |    0
 .../CertificateRenewalWindowExtension.java         |    0
 .../security/extensions/CertificateScopeEntry.java |    0
 .../extensions/CertificateScopeOfUseExtension.java |    0
 .../extensions/ExtendedKeyUsageExtension.java      |    0
 .../security/extensions/GenericASN1Extension.java  |    0
 .../extensions/InhibitAnyPolicyExtension.java      |    0
 .../netscape/security/extensions/KerberosName.java |    0
 .../security/extensions/NSCertTypeExtension.java   |    0
 .../security/extensions/OCSPNoCheckExtension.java  |    0
 .../extensions/PresenceServerExtension.java        |    0
 .../extensions/SubjectInfoAccessExtension.java     |    0
 .../src/netscape/security/pkcs/ContentInfo.java    |    0
 .../netscape/security/pkcs/EncodingException.java  |    0
 .../util/src/netscape/security/pkcs/PKCS10.java    |    0
 .../netscape/security/pkcs/PKCS10Attribute.java    |    0
 .../netscape/security/pkcs/PKCS10Attributes.java   |    0
 .../util/src/netscape/security/pkcs/PKCS7.java     |    0
 .../util/src/netscape/security/pkcs/PKCS8Key.java  |    0
 .../src/netscape/security/pkcs/PKCS9Attribute.java |    0
 .../netscape/security/pkcs/PKCS9Attributes.java    |    0
 .../netscape/security/pkcs/ParsingException.java   |    0
 .../src/netscape/security/pkcs/SignerInfo.java     |    0
 .../util/src/netscape/security/provider/CMS.java   |    0
 .../util/src/netscape/security/provider/DSA.java   |    0
 .../netscape/security/provider/DSAKeyFactory.java  |    0
 .../security/provider/DSAKeyPairGenerator.java     |    0
 .../security/provider/DSAParameterGenerator.java   |    0
 .../netscape/security/provider/DSAParameters.java  |    0
 .../netscape/security/provider/DSAPrivateKey.java  |    0
 .../netscape/security/provider/DSAPublicKey.java   |    0
 .../util/src/netscape/security/provider/MD5.java   |    0
 .../netscape/security/provider/RSAPublicKey.java   |    0
 .../util/src/netscape/security/provider/SHA.java   |    0
 .../util/src/netscape/security/provider/Sun.java   |    0
 .../netscape/security/provider/SystemIdentity.java |    0
 .../netscape/security/provider/SystemSigner.java   |    0
 .../security/provider/X509CertificateFactory.java  |    0
 .../netscape/security/util/ASN1CharStrConvMap.java |    0
 .../util/src/netscape/security/util/ArraySet.java  |    0
 .../util/src/netscape/security/util/BigInt.java    |    0
 .../util/src/netscape/security/util/BitArray.java  |    0
 .../netscape/security/util/ByteArrayLexOrder.java  |    0
 .../netscape/security/util/ByteArrayTagOrder.java  |    0
 .../security/util/ByteToCharIA5String.java         |    0
 .../security/util/ByteToCharPrintable.java         |    0
 .../netscape/security/util/ByteToCharUnicode.java  |    0
 .../security/util/ByteToCharUniversalString.java   |    0
 .../netscape/security/util/CertPrettyPrint.java    |    0
 .../security/util/CharToByteIA5String.java         |    0
 .../security/util/CharToBytePrintable.java         |    0
 .../security/util/CharToByteUniversalString.java   |    0
 .../src/netscape/security/util/CrlPrettyPrint.java |    0
 .../src/netscape/security/util/DerEncoder.java     |    0
 .../src/netscape/security/util/DerInputBuffer.java |    0
 .../src/netscape/security/util/DerInputStream.java |    0
 .../netscape/security/util/DerOutputStream.java    |    0
 .../util/src/netscape/security/util/DerValue.java  |    0
 .../src/netscape/security/util/ExtPrettyPrint.java |    0
 .../netscape/security/util/ObjectIdentifier.java   |    0
 .../netscape/security/util/PrettyPrintFormat.java  |    0
 .../security/util/PrettyPrintResources.java        |    0
 .../netscape/security/util/PubKeyPrettyPrint.java  |    0
 .../src/netscape/security/x509/ACertAttrSet.java   |    0
 .../util/src/netscape/security/x509/AVA.java       |    0
 .../netscape/security/x509/AVAValueConverter.java  |    0
 .../util/src/netscape/security/x509/AlgIdDSA.java  |    0
 .../src/netscape/security/x509/AlgorithmId.java    |    0
 .../util/src/netscape/security/x509/Attribute.java |    0
 .../security/x509/AttributeNameEnumeration.java    |    0
 .../x509/AuthorityKeyIdentifierExtension.java      |    0
 .../security/x509/BasicConstraintsExtension.java   |    0
 .../util/src/netscape/security/x509/CPSuri.java    |    0
 .../security/x509/CRLDistributionPoint.java        |    0
 .../x509/CRLDistributionPointsExtension.java       |    0
 .../src/netscape/security/x509/CRLExtensions.java  |    0
 .../netscape/security/x509/CRLNumberExtension.java |    0
 .../netscape/security/x509/CRLReasonExtension.java |    0
 .../src/netscape/security/x509/CertAndKeyGen.java  |    0
 .../src/netscape/security/x509/CertAttrSet.java    |    0
 .../src/netscape/security/x509/CertException.java  |    0
 .../src/netscape/security/x509/CertParseError.java |    0
 .../security/x509/CertificateAlgorithmId.java      |    0
 .../netscape/security/x509/CertificateChain.java   |    0
 .../security/x509/CertificateExtensions.java       |    0
 .../security/x509/CertificateIssuerExtension.java  |    0
 .../security/x509/CertificateIssuerName.java       |    0
 .../x509/CertificateIssuerUniqueIdentity.java      |    0
 .../x509/CertificatePoliciesExtension.java         |    0
 .../security/x509/CertificatePolicyId.java         |    0
 .../security/x509/CertificatePolicyInfo.java       |    0
 .../security/x509/CertificatePolicyMap.java        |    0
 .../security/x509/CertificatePolicySet.java        |    0
 .../security/x509/CertificateSerialNumber.java     |    0
 .../security/x509/CertificateSubjectName.java      |    0
 .../x509/CertificateSubjectUniqueIdentity.java     |    0
 .../security/x509/CertificateValidity.java         |    0
 .../netscape/security/x509/CertificateVersion.java |    0
 .../netscape/security/x509/CertificateX509Key.java |    0
 .../util/src/netscape/security/x509/DNSName.java   |    0
 .../security/x509/DeltaCRLIndicatorExtension.java  |    0
 .../netscape/security/x509/DirStrConverter.java    |    0
 .../src/netscape/security/x509/DisplayText.java    |    0
 .../src/netscape/security/x509/EDIPartyName.java   |    0
 .../util/src/netscape/security/x509/Extension.java |    0
 .../src/netscape/security/x509/Extensions.java     |    0
 .../security/x509/FreshestCRLExtension.java        |    0
 .../src/netscape/security/x509/GeneralName.java    |    0
 .../security/x509/GeneralNameInterface.java        |    0
 .../src/netscape/security/x509/GeneralNames.java   |    0
 .../security/x509/GeneralNamesException.java       |    0
 .../src/netscape/security/x509/GeneralSubtree.java |    0
 .../netscape/security/x509/GeneralSubtrees.java    |    0
 .../security/x509/GenericValueConverter.java       |    0
 .../security/x509/HoldInstructionExtension.java    |    0
 .../netscape/security/x509/IA5StringConverter.java |    0
 .../src/netscape/security/x509/IPAddressName.java  |    0
 .../security/x509/InvalidIPAddressException.java   |    0
 .../security/x509/InvalidityDateExtension.java     |    0
 .../x509/IssuerAlternativeNameExtension.java       |    0
 .../security/x509/IssuingDistributionPoint.java    |    0
 .../x509/IssuingDistributionPointExtension.java    |    0
 .../src/netscape/security/x509/KeyIdentifier.java  |    0
 .../netscape/security/x509/KeyUsageExtension.java  |    0
 .../netscape/security/x509/LdapDNStrConverter.java |    0
 .../security/x509/LdapV3DNStrConverter.java        |    0
 .../security/x509/NSCCommentExtension.java         |    0
 .../security/x509/NameConstraintsExtension.java    |    0
 .../netscape/security/x509/NoticeReference.java    |    0
 .../util/src/netscape/security/x509/OIDMap.java    |    0
 .../util/src/netscape/security/x509/OIDName.java   |    0
 .../util/src/netscape/security/x509/OtherName.java |    0
 .../src/netscape/security/x509/PKIXExtensions.java |    0
 .../netscape/security/x509/PolicyConstraint.java   |    0
 .../security/x509/PolicyConstraintsExtension.java  |    0
 .../security/x509/PolicyMappingsExtension.java     |    0
 .../security/x509/PolicyQualifierInfo.java         |    0
 .../netscape/security/x509/PolicyQualifiers.java   |    0
 .../netscape/security/x509/PrintableConverter.java |    0
 .../security/x509/PrivateKeyUsageExtension.java    |    0
 .../util/src/netscape/security/x509/Qualifier.java |    0
 .../util/src/netscape/security/x509/RDN.java       |    0
 .../security/x509/RFC1779StrConverter.java         |    0
 .../src/netscape/security/x509/RFC822Name.java     |    0
 .../src/netscape/security/x509/ReasonFlags.java    |    0
 .../netscape/security/x509/RevocationReason.java   |    0
 .../netscape/security/x509/RevokedCertImpl.java    |    0
 .../netscape/security/x509/RevokedCertificate.java |    0
 .../src/netscape/security/x509/SerialNumber.java   |    0
 .../x509/SubjectAlternativeNameExtension.java      |    0
 .../x509/SubjectDirAttributesExtension.java        |    0
 .../x509/SubjectKeyIdentifierExtension.java        |    0
 .../util/src/netscape/security/x509/URIName.java   |    0
 .../src/netscape/security/x509/UniqueIdentity.java |    0
 .../src/netscape/security/x509/UserNotice.java     |    0
 .../util/src/netscape/security/x509/X500Name.java  |    0
 .../netscape/security/x509/X500NameAttrMap.java    |    0
 .../src/netscape/security/x509/X500Signer.java     |    0
 .../netscape/security/x509/X509AttributeName.java  |    0
 .../src/netscape/security/x509/X509CRLImpl.java    |    0
 .../util/src/netscape/security/x509/X509Cert.java  |    0
 .../src/netscape/security/x509/X509CertImpl.java   |    0
 .../src/netscape/security/x509/X509CertInfo.java   |    0
 .../security/x509/X509ExtensionException.java      |    0
 .../util/src/netscape/security/x509/X509Key.java   |    0
 .../Modules/CMakeDetermineJavaCompiler.cmake       |    0
 .../Modules/CMakeJavaCompiler.cmake.in             |    0
 .../Modules/CMakeJavaInformation.cmake             |    0
 .../Modules/CMakeTestJavaCompiler.cmake            |    0
 {pki/cmake => cmake}/Modules/COPYING-CMAKE-SCRIPTS |    0
 .../Modules/DefineCMakeDefaults.cmake              |    0
 .../Modules/DefineCompilerFlags.cmake              |    0
 .../Modules/DefineInstallationPaths.cmake          |    0
 .../Modules/DefinePlatformDefaults.cmake           |    0
 {pki/cmake => cmake}/Modules/FindAPR.cmake         |    0
 {pki/cmake => cmake}/Modules/FindJNI.cmake         |    0
 {pki/cmake => cmake}/Modules/FindJava.cmake        |    0
 {pki/cmake => cmake}/Modules/FindLdap.cmake        |    0
 {pki/cmake => cmake}/Modules/FindMozLDAP.cmake     |    0
 {pki/cmake => cmake}/Modules/FindNSPR.cmake        |    0
 {pki/cmake => cmake}/Modules/FindNSS.cmake         |    0
 {pki/cmake => cmake}/Modules/FindOpenSSL.cmake     |    0
 {pki/cmake => cmake}/Modules/FindSvrcore.cmake     |    0
 {pki/cmake => cmake}/Modules/FindZLIB.cmake        |    0
 .../Modules/MacroCheckCCompilerFlagSSP.cmake       |    0
 {pki/cmake => cmake}/Modules/MacroCopyFile.cmake   |    0
 .../Modules/MacroEnsureOutOfSourceBuild.cmake      |    0
 {pki/cmake => cmake}/Modules/UseJava.cmake         |    0
 .../Modules/UseJavaClassFilelist.cmake             |    0
 {pki/cmake => cmake}/Modules/UseJavaSymlinks.cmake |    0
 ..._uninstall.cmake.in => cmake_uninstall.cmake.in |    0
 pki/config.h.cmake => config.h.cmake               |    0
 {pki/dogtag => dogtag}/CMakeLists.txt              |    0
 {pki/dogtag => dogtag}/ca-ui/CMakeLists.txt        |    0
 {pki/dogtag => dogtag}/ca-ui/LICENSE               |    0
 .../ca-ui/shared/webapps/ca/404.html               |    0
 .../ca-ui/shared/webapps/ca/500.html               |    0
 .../shared/webapps/ca/GenUnexpectedError.template  |    0
 .../webapps/ca/admin/GenUnexpectedError.template   |    0
 .../webapps/ca/admin/ca/EnrollSuccess.template     |    0
 .../webapps/ca/admin/ca/ImportAdminCert.template   |    0
 .../shared/webapps/ca/admin/ca/ImportCert.template |    0
 .../shared/webapps/ca/admin/ca/adminEnroll.html    |    0
 .../ca/admin/ca/securitydomainlogin.template       |    0
 .../shared/webapps/ca/admin/ca/sendCookie.template |    0
 .../ca-ui/shared/webapps/ca/admin/cms-funcs.js     |    0
 .../shared/webapps/ca/admin/graphics/gray90.gif    |  Bin 66 -> 66 bytes
 .../ca-ui/shared/webapps/ca/admin/graphics/hr.gif  |  Bin 60 -> 60 bytes
 .../shared/webapps/ca/admin/graphics/spacer.gif    |  Bin 43 -> 43 bytes
 .../ca-ui/shared/webapps/ca/admin/helpfun.js       |    0
 .../ca-ui/shared/webapps/ca/admin/index.html       |    0
 .../shared/webapps/ca/agent/GenError.template      |    0
 .../shared/webapps/ca/agent/GenPending.template    |    0
 .../shared/webapps/ca/agent/GenRejected.template   |    0
 .../shared/webapps/ca/agent/GenSuccess.template    |    0
 .../shared/webapps/ca/agent/GenSvcPending.template |    0
 .../webapps/ca/agent/GenUnauthorized.template      |    0
 .../webapps/ca/agent/GenUnexpectedError.template   |    0
 .../webapps/ca/agent/ca/EnrollSuccess.template     |    0
 .../shared/webapps/ca/agent/ca/ImportCert.template |    0
 .../shared/webapps/ca/agent/ca/ListRequests.html   |    0
 .../webapps/ca/agent/ca/ProfileApprove.template    |    0
 .../webapps/ca/agent/ca/ProfileList.template       |    0
 .../webapps/ca/agent/ca/ProfileProcess.template    |    0
 .../webapps/ca/agent/ca/ProfileReview.template     |    0
 .../webapps/ca/agent/ca/ProfileSelect.template     |    0
 .../ca-ui/shared/webapps/ca/agent/ca/SrchCert.html |    0
 .../shared/webapps/ca/agent/ca/SrchRequests.html   |    0
 .../shared/webapps/ca/agent/ca/SrchRevokeCert.html |    0
 .../shared/webapps/ca/agent/ca/UpdateDir.html      |    0
 .../ca-ui/shared/webapps/ca/agent/ca/blank.html    |    0
 .../webapps/ca/agent/ca/bulkissuance.template      |    0
 .../webapps/ca/agent/ca/cloneRedirect.template     |    0
 .../webapps/ca/agent/ca/confirmRevocation.template |    0
 .../webapps/ca/agent/ca/displayBySerial.template   |    0
 .../webapps/ca/agent/ca/displayBySerial2.template  |    0
 .../shared/webapps/ca/agent/ca/displayCRL.template |    0
 .../ca/agent/ca/displayCertFromRequest.template    |    0
 .../shared/webapps/ca/agent/ca/error.template      |    0
 .../ca-ui/shared/webapps/ca/agent/ca/frameCRL.html |    0
 .../ca-ui/shared/webapps/ca/agent/ca/frameDir.html |    0
 .../webapps/ca/agent/ca/frameDisplayCRL.html       |    0
 .../shared/webapps/ca/agent/ca/frameList.html      |    0
 .../shared/webapps/ca/agent/ca/frameListReq.html   |    0
 .../shared/webapps/ca/agent/ca/frameOCSP.html      |    0
 .../shared/webapps/ca/agent/ca/frameProfile.html   |    0
 .../shared/webapps/ca/agent/ca/frameRevoke.html    |    0
 .../shared/webapps/ca/agent/ca/frameSearch.html    |    0
 .../webapps/ca/agent/ca/frameSrchRequests.html     |    0
 .../shared/webapps/ca/agent/ca/frameStats.html     |    0
 .../webapps/ca/agent/ca/getOCSPInfo.template       |    0
 .../shared/webapps/ca/agent/ca/getStats.template   |    0
 .../ca-ui/shared/webapps/ca/agent/ca/index.html    |    0
 .../ca-ui/shared/webapps/ca/agent/ca/menuCRL.html  |    0
 .../ca-ui/shared/webapps/ca/agent/ca/menuDir.html  |    0
 .../shared/webapps/ca/agent/ca/menuDisplayCRL.html |    0
 .../ca-ui/shared/webapps/ca/agent/ca/menuList.html |    0
 .../shared/webapps/ca/agent/ca/menuListReq.html    |    0
 .../ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html |    0
 .../shared/webapps/ca/agent/ca/menuProfile.html    |    0
 .../shared/webapps/ca/agent/ca/menuRevoke.html     |    0
 .../shared/webapps/ca/agent/ca/menuSearch.html     |    0
 .../webapps/ca/agent/ca/menuSrchRequests.html      |    0
 .../shared/webapps/ca/agent/ca/menuStats.html      |    0
 .../ca-ui/shared/webapps/ca/agent/ca/monitor.html  |    0
 .../shared/webapps/ca/agent/ca/monitor.template    |    0
 .../shared/webapps/ca/agent/ca/notImplemented.html |    0
 .../webapps/ca/agent/ca/processCertReq.template    |    0
 .../shared/webapps/ca/agent/ca/processReq.template |    0
 .../shared/webapps/ca/agent/ca/queryBySerial.html  |    0
 .../shared/webapps/ca/agent/ca/queryCert.html      |    0
 .../shared/webapps/ca/agent/ca/queryCert.template  |    0
 .../shared/webapps/ca/agent/ca/queryReq.template   |    0
 .../webapps/ca/agent/ca/reasonToRevoke.template    |    0
 .../webapps/ca/agent/ca/revocationResult.template  |    0
 .../webapps/ca/agent/ca/revokeBySerial.template    |    0
 .../shared/webapps/ca/agent/ca/revokeCert.html     |    0
 .../shared/webapps/ca/agent/ca/srchCert.template   |    0
 .../webapps/ca/agent/ca/toDisplayCRL.template      |    0
 .../webapps/ca/agent/ca/toUpdateCRL.template       |    0
 .../ca-ui/shared/webapps/ca/agent/ca/top.html      |    0
 .../ca/agent/ca/unrevocationResult.template        |    0
 .../shared/webapps/ca/agent/ca/updateCRL.html      |    0
 .../shared/webapps/ca/agent/ca/updateCRL.template  |    0
 .../shared/webapps/ca/agent/ca/updateDir.template  |    0
 .../ca-ui/shared/webapps/ca/agent/cms-funcs.js     |    0
 .../ca-ui/shared/webapps/ca/agent/funcs.js         |    0
 .../shared/webapps/ca/agent/graphics/dgLeftTab.gif |  Bin 89 -> 89 bytes
 .../webapps/ca/agent/graphics/dgRightTab.gif       |  Bin 102 -> 102 bytes
 .../shared/webapps/ca/agent/graphics/favicon.ico   |  Bin 601 -> 601 bytes
 .../shared/webapps/ca/agent/graphics/goto-tall.gif |  Bin 86 -> 86 bytes
 .../shared/webapps/ca/agent/graphics/gray90.gif    |  Bin 66 -> 66 bytes
 .../ca-ui/shared/webapps/ca/agent/graphics/hr.gif  |  Bin 60 -> 60 bytes
 .../shared/webapps/ca/agent/graphics/lgLeftTab.gif |  Bin 89 -> 89 bytes
 .../webapps/ca/agent/graphics/lgRightTab.gif       |  Bin 102 -> 102 bytes
 .../webapps/ca/agent/graphics/logo_header.gif      |  Bin 5833 -> 5833 bytes
 .../shared/webapps/ca/agent/graphics/spacer.gif    |  Bin 43 -> 43 bytes
 .../ca-ui/shared/webapps/ca/agent/header.template  |    0
 .../ca-ui/shared/webapps/ca/agent/helpfun.js       |    0
 .../ca-ui/shared/webapps/ca/agent/index.html       |    0
 .../ca-ui/shared/webapps/ca/agent/index.template   |    0
 .../ca-ui/shared/webapps/ca/agent/ports.template   |    0
 .../ca-ui/shared/webapps/ca/agent/xenroll.dll      |  Bin 172664 -> 172664 bytes
 .../ca-ui/shared/webapps/ca/ee/GenError.template   |    0
 .../ca-ui/shared/webapps/ca/ee/GenPending.template |    0
 .../shared/webapps/ca/ee/GenRejected.template      |    0
 .../ca-ui/shared/webapps/ca/ee/GenSuccess.template |    0
 .../shared/webapps/ca/ee/GenSvcPending.template    |    0
 .../shared/webapps/ca/ee/GenUnauthorized.template  |    0
 .../webapps/ca/ee/GenUnexpectedError.template      |    0
 .../ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html   |    0
 .../shared/webapps/ca/ee/ca/CMCEnrollment.html     |    0
 .../ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html   |    0
 .../webapps/ca/ee/ca/CertBasedDualEnroll.html      |    0
 .../ca/ee/ca/CertBasedEncryptionEnroll.html        |    0
 .../webapps/ca/ee/ca/CertBasedSingleEnroll.html    |    0
 .../shared/webapps/ca/ee/ca/ChallengeRevoke1.html  |    0
 .../shared/webapps/ca/ee/ca/DirPinUserEnroll.html  |    0
 .../shared/webapps/ca/ee/ca/DirUserEnroll.html     |    0
 .../ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html  |    0
 .../shared/webapps/ca/ee/ca/EnrollSuccess.template |    0
 .../ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html  |    0
 .../webapps/ca/ee/ca/ImportAdminCert.template      |    0
 .../shared/webapps/ca/ee/ca/ImportCert.template    |    0
 .../ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html |    0
 .../ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html |    0
 .../shared/webapps/ca/ee/ca/ManObjSignEnroll.html  |    0
 .../ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html |    0
 .../shared/webapps/ca/ee/ca/ManServerEnroll.html   |    0
 .../shared/webapps/ca/ee/ca/ManUserEnroll.html     |    0
 .../shared/webapps/ca/ee/ca/NISUserEnroll.html     |    0
 .../shared/webapps/ca/ee/ca/OCSPResponder.html     |    0
 .../webapps/ca/ee/ca/ObjSignPKCS10Enroll.html      |    0
 .../shared/webapps/ca/ee/ca/PortalEnrollment.html  |    0
 .../shared/webapps/ca/ee/ca/ProfileList.template   |    0
 .../shared/webapps/ca/ee/ca/ProfileSelect.template |    0
 .../shared/webapps/ca/ee/ca/ProfileSubmit.html     |    0
 .../shared/webapps/ca/ee/ca/ProfileSubmit.template |    0
 .../webapps/ca/ee/ca/RenewalSuccess.template       |    0
 .../webapps/ca/ee/ca/RevocationSuccess.template    |    0
 .../shared/webapps/ca/ee/ca/UserDnEnroll.html      |    0
 .../ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html |    0
 .../shared/webapps/ca/ee/ca/UserRevocation.html    |    0
 .../ca-ui/shared/webapps/ca/ee/ca/bench2k.html     |    0
 .../shared/webapps/ca/ee/ca/checkRequest.html      |    0
 .../webapps/ca/ee/ca/displayBySerial.template      |    0
 .../webapps/ca/ee/ca/displayBySerial2.template     |    0
 .../shared/webapps/ca/ee/ca/displayCRL.template    |    0
 .../shared/webapps/ca/ee/ca/displayCaCert.template |    0
 .../ca/ee/ca/displayCertFromRequest.template       |    0
 .../ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html  |    0
 .../ca-ui/shared/webapps/ca/ee/ca/index.html       |    0
 .../webapps/ca/ee/ca/policyEnrollment/index.html   |    0
 .../ca/ee/ca/policyEnrollment/profileMenu.html     |    0
 .../ca/ee/ca/policyEnrollment/retrievalMenu.html   |    0
 .../ca/ee/ca/policyEnrollment/revocationMenu.html  |    0
 .../webapps/ca/ee/ca/profileEnrollment/index.html  |    0
 .../ca/ee/ca/profileEnrollment/profileMenu.html    |    0
 .../ca/ee/ca/profileEnrollment/retrievalMenu.html  |    0
 .../ca/ee/ca/profileEnrollment/revocationMenu.html |    0
 .../ca-ui/shared/webapps/ca/ee/ca/profileMenu.html |    0
 .../shared/webapps/ca/ee/ca/queryBySerial.html     |    0
 .../ca-ui/shared/webapps/ca/ee/ca/queryCert.html   |    0
 .../shared/webapps/ca/ee/ca/queryCert.template     |    0
 .../webapps/ca/ee/ca/reasonToRevoke.template       |    0
 .../shared/webapps/ca/ee/ca/recoveryMenu.html      |    0
 .../webapps/ca/ee/ca/remoteAuthConfig.template     |    0
 .../ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html |    0
 .../shared/webapps/ca/ee/ca/requestStatus.template |    0
 .../shared/webapps/ca/ee/ca/retrievalMenu.html     |    0
 .../shared/webapps/ca/ee/ca/revocationMenu.html    |    0
 .../webapps/ca/ee/ca/revocationResult.template     |    0
 .../ca-ui/shared/webapps/ca/ee/ca/srchCert.html    |    0
 .../shared/webapps/ca/ee/ca/srchCert.template      |    0
 .../ca-ui/shared/webapps/ca/ee/ca/tabs.html        |    0
 .../shared/webapps/ca/ee/ca/toDisplayCRL.template  |    0
 .../webapps/ca/ee/ca/unrevocationResult.template   |    0
 .../ca-ui/shared/webapps/ca/ee/cms-funcs.js        |    0
 .../ca-ui/shared/webapps/ca/ee/graphics/alertl.gif |  Bin 372 -> 372 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/delete.gif |  Bin 112 -> 112 bytes
 .../shared/webapps/ca/ee/graphics/dgLeftTab.gif    |  Bin 89 -> 89 bytes
 .../shared/webapps/ca/ee/graphics/dgRightTab.gif   |  Bin 102 -> 102 bytes
 .../shared/webapps/ca/ee/graphics/dgRightTab2.gif  |  Bin 102 -> 102 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/error.gif  |  Bin 368 -> 368 bytes
 .../shared/webapps/ca/ee/graphics/favicon.ico      |  Bin 601 -> 601 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/folder.gif |  Bin 112 -> 112 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/gray90.gif |  Bin 66 -> 66 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/hr.gif     |  Bin 60 -> 60 bytes
 .../shared/webapps/ca/ee/graphics/lgLeftTab.gif    |  Bin 89 -> 89 bytes
 .../shared/webapps/ca/ee/graphics/lgRightTab.gif   |  Bin 102 -> 102 bytes
 .../shared/webapps/ca/ee/graphics/lgRightTab2.gif  |  Bin 102 -> 102 bytes
 .../shared/webapps/ca/ee/graphics/listclosed.gif   |  Bin 104 -> 104 bytes
 .../shared/webapps/ca/ee/graphics/logo_header.gif  |  Bin 5833 -> 5833 bytes
 .../shared/webapps/ca/ee/graphics/messagel.gif     |  Bin 693 -> 693 bytes
 .../ca-ui/shared/webapps/ca/ee/graphics/spacer.gif |  Bin 43 -> 43 bytes
 .../shared/webapps/ca/ee/graphics/whLeftTab.gif    |  Bin 79 -> 79 bytes
 .../shared/webapps/ca/ee/graphics/whRightTab.gif   |  Bin 102 -> 102 bytes
 .../shared/webapps/ca/ee/graphics/whRightTab2.gif  |  Bin 102 -> 102 bytes
 .../ca-ui/shared/webapps/ca/ee/helpfun.js          |    0
 .../ca-ui/shared/webapps/ca/ee/index.html          |    0
 .../ca-ui/shared/webapps/ca/index.html             |    0
 .../ca-ui/shared/webapps/ca/services.template      |    0
 {pki/dogtag => dogtag}/common-ui/CMakeLists.txt    |    0
 {pki/dogtag => dogtag}/common-ui/LICENSE           |    0
 {pki/dogtag => dogtag}/common-ui/build.xml         |    0
 {pki/dogtag => dogtag}/common-ui/build_dogtag      |    0
 .../common-ui/dogtag-pki-common-ui.spec            |    0
 .../admin/console/config/adminauthenticatepanel.vm |    0
 .../shared/admin/console/config/adminpanel.vm      |    0
 .../admin/console/config/agentauthenticatepanel.vm |    0
 .../admin/console/config/backupkeycertpanel.vm     |    0
 .../shared/admin/console/config/certchainpanel.vm  |    0
 .../admin/console/config/certprettyprintpanel.vm   |    0
 .../admin/console/config/certrequestpanel.vm       |    0
 .../shared/admin/console/config/config_addhsm.vm   |    0
 .../shared/admin/console/config/config_clone.vm    |    0
 .../shared/admin/console/config/config_db.vm       |    0
 .../shared/admin/console/config/config_hsm.vm      |    0
 .../admin/console/config/config_hsmloginpanel.vm   |    0
 .../shared/admin/console/config/config_join.vm     |    0
 .../shared/admin/console/config/config_rootca.vm   |    0
 .../admin/console/config/createsubsystempanel.vm   |    0
 .../shared/admin/console/config/databasepanel.vm   |    0
 .../admin/console/config/displaycertchainpanel.vm  |    0
 .../shared/admin/console/config/donepanel.vm       |    0
 .../shared/admin/console/config/footer.vm          |    0
 .../shared/admin/console/config/header.vm          |    0
 .../shared/admin/console/config/hierarchypanel.vm  |    0
 .../admin/console/config/importadmincertpanel.vm   |    0
 .../admin/console/config/importcachainpanel.vm     |    0
 .../common-ui/shared/admin/console/config/login.vm |    0
 .../shared/admin/console/config/modulepanel.vm     |    0
 .../shared/admin/console/config/namepanel.vm       |    0
 .../admin/console/config/restorekeycertpanel.vm    |    0
 .../shared/admin/console/config/savepkcs12panel.vm |    0
 .../console/config/securitydomainloginpanel.vm     |    0
 .../admin/console/config/securitydomainpanel.vm    |    0
 .../shared/admin/console/config/sidemenu.vm        |    0
 .../shared/admin/console/config/sizepanel.vm       |    0
 .../shared/admin/console/config/topmenu.vm         |    0
 .../shared/admin/console/config/welcomepanel.vm    |    0
 .../shared/admin/console/config/wizard.vm          |    0
 .../common-ui/shared/admin/console/config/xml.vm   |    0
 .../common-ui/shared/admin/console/img/badge.png   |  Bin 1635 -> 1635 bytes
 .../shared/admin/console/img/bigrotation2.gif      |  Bin 1787 -> 1787 bytes
 .../shared/admin/console/img/certificate.png       |  Bin 4663 -> 4663 bytes
 .../shared/admin/console/img/clearpixel.gif        |  Bin 43 -> 43 bytes
 .../common-ui/shared/admin/console/img/favicon.ico |  Bin 601 -> 601 bytes
 .../shared/admin/console/img/icon-software.gif     |  Bin 1146 -> 1146 bytes
 .../shared/admin/console/img/icon_crit_update.gif  |  Bin 337 -> 337 bytes
 .../common-ui/shared/admin/console/img/id.png      |  Bin 1604 -> 1604 bytes
 .../common-ui/shared/admin/console/img/idkey.png   |  Bin 1690 -> 1690 bytes
 .../common-ui/shared/admin/console/img/key.png     |  Bin 1753 -> 1753 bytes
 .../common-ui/shared/admin/console/img/lock.png    |  Bin 1453 -> 1453 bytes
 .../shared/admin/console/img/logo_header.gif       |  Bin 5833 -> 5833 bytes
 .../shared/admin/console/img/no-certificate.png    |  Bin 2342 -> 2342 bytes
 .../common-ui/shared/admin/console/img/rootca.gif  |  Bin 692 -> 692 bytes
 .../common-ui/shared/admin/console/img/sub.gif     |  Bin 705 -> 705 bytes
 .../common-ui/shared/admin/console/js/misc.js      |    0
 .../common-ui/shared/css/pki-360.css               |    0
 .../common-ui/shared/css/pki-base.css              |    0
 .../dogtag => dogtag}/common-ui/shared/css/pki.css |    0
 .../common-ui/shared/img/favicon.ico               |  Bin 601 -> 601 bytes
 .../common-ui/shared/img/logo_header.gif           |  Bin 5833 -> 5833 bytes
 {pki/dogtag => dogtag}/console-ui/CMakeLists.txt   |    0
 {pki/dogtag => dogtag}/console-ui/LICENSE          |    0
 {pki/dogtag => dogtag}/console-ui/build.xml        |    0
 {pki/dogtag => dogtag}/console-ui/build_dogtag     |    0
 .../console-ui/dogtag-pki-console-ui.spec          |    0
 .../console-ui/src/CMSAdminRS.properties           |    0
 .../console-ui/src/CMakeLists.txt                  |    0
 .../com/netscape/admin/certsrv/theme/certmgmt.gif  |  Bin 5565 -> 5565 bytes
 .../client/theme/images/ConsoleBanner.gif          |  Bin 5565 -> 5565 bytes
 .../management/client/theme/images/login.gif       |  Bin 20908 -> 20908 bytes
 .../management/client/theme/images/logo16.gif      |  Bin 994 -> 994 bytes
 .../management/client/theme/images/logo32.gif      |  Bin 1458 -> 1458 bytes
 .../management/client/theme/theme.properties       |    0
 {pki/dogtag => dogtag}/kra-ui/CMakeLists.txt       |    0
 {pki/dogtag => dogtag}/kra-ui/LICENSE              |    0
 {pki/dogtag => dogtag}/kra-ui/build.xml            |    0
 {pki/dogtag => dogtag}/kra-ui/build_dogtag         |    0
 .../kra-ui/dogtag-pki-kra-ui.spec                  |    0
 .../kra-ui/shared/webapps/kra/404.html             |    0
 .../kra-ui/shared/webapps/kra/500.html             |    0
 .../shared/webapps/kra/GenUnexpectedError.template |    0
 .../shared/webapps/kra/agent/GenError.template     |    0
 .../shared/webapps/kra/agent/GenPending.template   |    0
 .../shared/webapps/kra/agent/GenRejected.template  |    0
 .../shared/webapps/kra/agent/GenSuccess.template   |    0
 .../webapps/kra/agent/GenSvcPending.template       |    0
 .../webapps/kra/agent/GenUnauthorized.template     |    0
 .../webapps/kra/agent/GenUnexpectedError.template  |    0
 .../kra-ui/shared/webapps/kra/agent/cms-funcs.js   |    0
 .../kra-ui/shared/webapps/kra/agent/funcs.js       |    0
 .../webapps/kra/agent/graphics/dgLeftTab.gif       |  Bin 89 -> 89 bytes
 .../webapps/kra/agent/graphics/dgRightTab.gif      |  Bin 102 -> 102 bytes
 .../shared/webapps/kra/agent/graphics/favicon.ico  |  Bin 601 -> 601 bytes
 .../webapps/kra/agent/graphics/goto-tall.gif       |  Bin 86 -> 86 bytes
 .../shared/webapps/kra/agent/graphics/gray90.gif   |  Bin 66 -> 66 bytes
 .../shared/webapps/kra/agent/graphics/hr.gif       |  Bin 60 -> 60 bytes
 .../webapps/kra/agent/graphics/lgLeftTab.gif       |  Bin 89 -> 89 bytes
 .../webapps/kra/agent/graphics/lgRightTab.gif      |  Bin 102 -> 102 bytes
 .../webapps/kra/agent/graphics/logo_header.gif     |  Bin 5833 -> 5833 bytes
 .../shared/webapps/kra/agent/graphics/spacer.gif   |  Bin 43 -> 43 bytes
 .../shared/webapps/kra/agent/header.template       |    0
 .../kra-ui/shared/webapps/kra/agent/helpfun.js     |    0
 .../kra-ui/shared/webapps/kra/agent/index.html     |    0
 .../kra-ui/shared/webapps/kra/agent/index.template |    0
 .../webapps/kra/agent/kra/GrantRecovery.html       |    0
 .../shared/webapps/kra/agent/kra/ListRequests.html |    0
 .../shared/webapps/kra/agent/kra/SrchKey.html      |    0
 .../webapps/kra/agent/kra/SrchRecoverKey.html      |    0
 .../kra-ui/shared/webapps/kra/agent/kra/blank.html |    0
 .../webapps/kra/agent/kra/confirmRecover.html      |    0
 .../kra/agent/kra/confirmRecoverBySerial.template  |    0
 .../webapps/kra/agent/kra/displayBySerial.template |    0
 .../kra/agent/kra/displayBySerial2.template        |    0
 .../agent/kra/displayBySerialForRecovery.template  |    0
 .../webapps/kra/agent/kra/examineRecovery.template |    0
 .../kra/agent/kra/finishAsyncRecovery.template     |    0
 .../webapps/kra/agent/kra/finishRecovery.template  |    0
 .../shared/webapps/kra/agent/kra/frameGrant.html   |    0
 .../shared/webapps/kra/agent/kra/frameRecover.html |    0
 .../shared/webapps/kra/agent/kra/frameRequest.html |    0
 .../shared/webapps/kra/agent/kra/frameSearch.html  |    0
 .../shared/webapps/kra/agent/kra/frameStats.html   |    0
 .../kra/agent/kra/getApprovalStatus.template       |    0
 .../shared/webapps/kra/agent/kra/getStats.template |    0
 .../kra/agent/kra/grantAsyncRecovery.template      |    0
 .../webapps/kra/agent/kra/grantRecovery.template   |    0
 .../kra-ui/shared/webapps/kra/agent/kra/index.html |    0
 .../shared/webapps/kra/agent/kra/menuCheck.html    |    0
 .../shared/webapps/kra/agent/kra/menuGrant.html    |    0
 .../shared/webapps/kra/agent/kra/menuRecover.html  |    0
 .../shared/webapps/kra/agent/kra/menuRequest.html  |    0
 .../shared/webapps/kra/agent/kra/menuSearch.html   |    0
 .../shared/webapps/kra/agent/kra/menuStats.html    |    0
 .../shared/webapps/kra/agent/kra/monitor.template  |    0
 .../webapps/kra/agent/kra/processReq.template      |    0
 .../shared/webapps/kra/agent/kra/queryKey.template |    0
 .../kra/agent/kra/queryKeyForRecovery.template     |    0
 .../shared/webapps/kra/agent/kra/queryReq.template |    0
 .../webapps/kra/agent/kra/recoverBySerial.template |    0
 .../shared/webapps/kra/agent/kra/srchKey.template  |    0
 .../kra/agent/kra/srchKeyForRecovery.template      |    0
 .../kra-ui/shared/webapps/kra/agent/kra/top.html   |    0
 .../kra-ui/shared/webapps/kra/index.html           |    0
 .../kra-ui/shared/webapps/kra/services.template    |    0
 {pki/dogtag => dogtag}/ocsp-ui/CMakeLists.txt      |    0
 {pki/dogtag => dogtag}/ocsp-ui/LICENSE             |    0
 {pki/dogtag => dogtag}/ocsp-ui/build.xml           |    0
 {pki/dogtag => dogtag}/ocsp-ui/build_dogtag        |    0
 .../ocsp-ui/dogtag-pki-ocsp-ui.spec                |    0
 .../ocsp-ui/shared/webapps/ocsp/404.html           |    0
 .../ocsp-ui/shared/webapps/ocsp/500.html           |    0
 .../webapps/ocsp/GenUnexpectedError.template       |    0
 .../shared/webapps/ocsp/agent/GenError.template    |    0
 .../shared/webapps/ocsp/agent/GenPending.template  |    0
 .../shared/webapps/ocsp/agent/GenRejected.template |    0
 .../shared/webapps/ocsp/agent/GenSuccess.template  |    0
 .../webapps/ocsp/agent/GenSvcPending.template      |    0
 .../webapps/ocsp/agent/GenUnauthorized.template    |    0
 .../webapps/ocsp/agent/GenUnexpectedError.template |    0
 .../ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js |    0
 .../ocsp-ui/shared/webapps/ocsp/agent/funcs.js     |    0
 .../webapps/ocsp/agent/graphics/dgLeftTab.gif      |  Bin 89 -> 89 bytes
 .../webapps/ocsp/agent/graphics/dgRightTab.gif     |  Bin 102 -> 102 bytes
 .../shared/webapps/ocsp/agent/graphics/favicon.ico |  Bin 601 -> 601 bytes
 .../webapps/ocsp/agent/graphics/goto-tall.gif      |  Bin 86 -> 86 bytes
 .../shared/webapps/ocsp/agent/graphics/gray90.gif  |  Bin 66 -> 66 bytes
 .../shared/webapps/ocsp/agent/graphics/hr.gif      |  Bin 60 -> 60 bytes
 .../webapps/ocsp/agent/graphics/lgLeftTab.gif      |  Bin 89 -> 89 bytes
 .../webapps/ocsp/agent/graphics/lgRightTab.gif     |  Bin 102 -> 102 bytes
 .../webapps/ocsp/agent/graphics/logo_header.gif    |  Bin 5833 -> 5833 bytes
 .../shared/webapps/ocsp/agent/graphics/spacer.gif  |  Bin 43 -> 43 bytes
 .../shared/webapps/ocsp/agent/header.template      |    0
 .../ocsp-ui/shared/webapps/ocsp/agent/helpfun.js   |    0
 .../ocsp-ui/shared/webapps/ocsp/agent/index.html   |    0
 .../shared/webapps/ocsp/agent/index.template       |    0
 .../shared/webapps/ocsp/agent/ocsp/AddCA.html      |    0
 .../shared/webapps/ocsp/agent/ocsp/AddCRL.html     |    0
 .../shared/webapps/ocsp/agent/ocsp/CheckCert.html  |    0
 .../shared/webapps/ocsp/agent/ocsp/addCA.template  |    0
 .../shared/webapps/ocsp/agent/ocsp/addCRL.template |    0
 .../webapps/ocsp/agent/ocsp/checkCert.template     |    0
 .../shared/webapps/ocsp/agent/ocsp/frameAddCA.html |    0
 .../webapps/ocsp/agent/ocsp/frameAddCRL.html       |    0
 .../webapps/ocsp/agent/ocsp/frameCheckCert.html    |    0
 .../webapps/ocsp/agent/ocsp/frameListCA.html       |    0
 .../shared/webapps/ocsp/agent/ocsp/frameOCSP.html  |    0
 .../shared/webapps/ocsp/agent/ocsp/frameStats.html |    0
 .../webapps/ocsp/agent/ocsp/getOCSPInfo.template   |    0
 .../webapps/ocsp/agent/ocsp/getStats.template      |    0
 .../shared/webapps/ocsp/agent/ocsp/index.html      |    0
 .../webapps/ocsp/agent/ocsp/listCAs.template       |    0
 .../shared/webapps/ocsp/agent/ocsp/menuAddCA.html  |    0
 .../shared/webapps/ocsp/agent/ocsp/menuAddCRL.html |    0
 .../webapps/ocsp/agent/ocsp/menuCheckCert.html     |    0
 .../shared/webapps/ocsp/agent/ocsp/menuListCA.html |    0
 .../shared/webapps/ocsp/agent/ocsp/menuOCSP.html   |    0
 .../shared/webapps/ocsp/agent/ocsp/menuStats.html  |    0
 .../webapps/ocsp/agent/ocsp/removeCA.template      |    0
 .../shared/webapps/ocsp/agent/ports.template       |    0
 .../ocsp-ui/shared/webapps/ocsp/index.html         |    0
 .../ocsp-ui/shared/webapps/ocsp/services.template  |    0
 {pki/dogtag => dogtag}/ra-ui/CMakeLists.txt        |    0
 {pki/dogtag => dogtag}/ra-ui/LICENSE               |    0
 {pki/dogtag => dogtag}/ra-ui/build.xml             |    0
 {pki/dogtag => dogtag}/ra-ui/build_dogtag          |    0
 {pki/dogtag => dogtag}/ra-ui/dogtag-pki-ra-ui.spec |    0
 .../ra-ui/shared/docroot/404.html                  |    0
 .../ra-ui/shared/docroot/500.html                  |    0
 .../ra-ui/shared/docroot/admin/group/add_new.vm    |    0
 .../ra-ui/shared/docroot/admin/group/index.vm      |    0
 .../ra-ui/shared/docroot/admin/group/read.vm       |    0
 .../ra-ui/shared/docroot/admin/index.vm            |    0
 .../ra-ui/shared/docroot/admin/user/add_new.vm     |    0
 .../ra-ui/shared/docroot/admin/user/index.vm       |    0
 .../ra-ui/shared/docroot/admin/user/read.vm        |    0
 .../ra-ui/shared/docroot/agent/cert/index.vm       |    0
 .../ra-ui/shared/docroot/agent/cert/read.vm        |    0
 .../ra-ui/shared/docroot/agent/cert/revoke.vm      |    0
 .../ra-ui/shared/docroot/agent/cert/submit.vm      |    0
 .../ra-ui/shared/docroot/agent/error.vm            |    0
 .../ra-ui/shared/docroot/agent/index.vm            |    0
 .../ra-ui/shared/docroot/agent/request/index.vm    |    0
 .../ra-ui/shared/docroot/agent/request/op.vm       |    0
 .../ra-ui/shared/docroot/agent/request/read.vm     |    0
 .../ra-ui/shared/docroot/css/pki-360.css           |    0
 .../ra-ui/shared/docroot/css/pki-base.css          |    0
 .../ra-ui/shared/docroot/css/pki.css               |    0
 .../ra-ui/shared/docroot/ee/agent/enroll.vm        |    0
 .../ra-ui/shared/docroot/ee/agent/index.vm         |    0
 .../ra-ui/shared/docroot/ee/agent/new.vm           |    0
 .../ra-ui/shared/docroot/ee/agent/start.vm         |    0
 .../ra-ui/shared/docroot/ee/agent/submit.vm        |    0
 .../ra-ui/shared/docroot/ee/error.vm               |    0
 .../ra-ui/shared/docroot/ee/index.vm               |    0
 .../ra-ui/shared/docroot/ee/request/getcert.vm     |    0
 .../ra-ui/shared/docroot/ee/request/index.vm       |    0
 .../ra-ui/shared/docroot/ee/request/status.vm      |    0
 .../ra-ui/shared/docroot/ee/scep/enroll.vm         |    0
 .../ra-ui/shared/docroot/ee/scep/index.vm          |    0
 .../ra-ui/shared/docroot/ee/scep/installer.vm      |    0
 .../ra-ui/shared/docroot/ee/scep/manager.vm        |    0
 .../ra-ui/shared/docroot/ee/scep/submit.vm         |    0
 .../ra-ui/shared/docroot/ee/server/admin.vm        |    0
 .../ra-ui/shared/docroot/ee/server/index.vm        |    0
 .../ra-ui/shared/docroot/ee/server/submit.vm       |    0
 .../ra-ui/shared/docroot/ee/user/index.vm          |    0
 .../ra-ui/shared/docroot/ee/user/renew.vm          |    0
 .../ra-ui/shared/docroot/ee/user/renewal.vm        |    0
 .../ra-ui/shared/docroot/ee/user/submit.vm         |    0
 .../ra-ui/shared/docroot/ee/user/user.vm           |    0
 .../ra-ui/shared/docroot/footer.vm                 |    0
 .../ra-ui/shared/docroot/header.vm                 |    0
 .../ra-ui/shared/docroot/images/logo_header.gif    |  Bin 5833 -> 5833 bytes
 .../ra-ui/shared/docroot/images/pki-icon-help.gif  |  Bin 326 -> 326 bytes
 .../ra-ui/shared/docroot/images/pki-icon-home.gif  |  Bin 657 -> 657 bytes
 .../shared/docroot/images/pki-icon-software.gif    |  Bin 1146 -> 1146 bytes
 .../ra-ui/shared/docroot/index.vm                  |    0
 .../admin/console/config/adminauthenticatepanel.vm |    0
 .../docroot/ra/admin/console/config/adminpanel.vm  |    0
 .../admin/console/config/agentauthenticatepanel.vm |    0
 .../docroot/ra/admin/console/config/authdbpanel.vm |    0
 .../docroot/ra/admin/console/config/cainfopanel.vm |    0
 .../ra/admin/console/config/certchainpanel.vm      |    0
 .../admin/console/config/certprettyprintpanel.vm   |    0
 .../ra/admin/console/config/certrequestpanel.vm    |    0
 .../ra/admin/console/config/config_addhsm.vm       |    0
 .../docroot/ra/admin/console/config/config_db.vm   |    0
 .../docroot/ra/admin/console/config/config_hsm.vm  |    0
 .../admin/console/config/config_hsmloginpanel.vm   |    0
 .../docroot/ra/admin/console/config/config_join.vm |    0
 .../ra/admin/console/config/config_rootca.vm       |    0
 .../admin/console/config/createsubsystempanel.vm   |    0
 .../ra/admin/console/config/databasepanel.vm       |    0
 .../admin/console/config/displaycertchain2panel.vm |    0
 .../admin/console/config/displaycertchainpanel.vm  |    0
 .../docroot/ra/admin/console/config/donepanel.vm   |    0
 .../ra/admin/console/config/drminfopanel.vm        |    0
 .../docroot/ra/admin/console/config/footer.vm      |    0
 .../docroot/ra/admin/console/config/header.vm      |    0
 .../ra/admin/console/config/hierarchypanel.vm      |    0
 .../admin/console/config/importadmincertpanel.vm   |    0
 .../docroot/ra/admin/console/config/login.vm       |    0
 .../docroot/ra/admin/console/config/modulepanel.vm |    0
 .../docroot/ra/admin/console/config/namepanel.vm   |    0
 .../console/config/securitydomainloginpanel.vm     |    0
 .../ra/admin/console/config/securitydomainpanel.vm |    0
 .../docroot/ra/admin/console/config/sidemenu.vm    |    0
 .../docroot/ra/admin/console/config/sizepanel.vm   |    0
 .../ra/admin/console/config/tksinfopanel.vm        |    0
 .../docroot/ra/admin/console/config/topmenu.vm     |    0
 .../ra/admin/console/config/welcomepanel.vm        |    0
 .../docroot/ra/admin/console/config/wizard.vm      |    0
 .../shared/docroot/ra/admin/console/config/xml.vm  |    0
 .../shared/docroot/ra/admin/console/img/badge.png  |  Bin 1635 -> 1635 bytes
 .../docroot/ra/admin/console/img/bigrotation2.gif  |  Bin 1787 -> 1787 bytes
 .../docroot/ra/admin/console/img/button-clear.gif  |  Bin 647 -> 647 bytes
 .../docroot/ra/admin/console/img/button-manage.gif |  Bin 776 -> 776 bytes
 .../docroot/ra/admin/console/img/button-search.gif |  Bin 1293 -> 1293 bytes
 .../docroot/ra/admin/console/img/certificate.png   |  Bin 4663 -> 4663 bytes
 .../docroot/ra/admin/console/img/clearpixel.gif    |  Bin 43 -> 43 bytes
 .../docroot/ra/admin/console/img/favicon.ico       |  Bin 601 -> 601 bytes
 .../ra/admin/console/img/icon_crit_update.gif      |  Bin 337 -> 337 bytes
 .../shared/docroot/ra/admin/console/img/id.png     |  Bin 1604 -> 1604 bytes
 .../shared/docroot/ra/admin/console/img/idkey.png  |  Bin 1690 -> 1690 bytes
 .../shared/docroot/ra/admin/console/img/key.png    |  Bin 1753 -> 1753 bytes
 .../shared/docroot/ra/admin/console/img/lock.png   |  Bin 1453 -> 1453 bytes
 .../docroot/ra/admin/console/img/logo_header.gif   |  Bin 5833 -> 5833 bytes
 .../ra/admin/console/img/no-certificate.png        |  Bin 2342 -> 2342 bytes
 .../docroot/ra/admin/console/img/pki-icon-help.gif |  Bin 326 -> 326 bytes
 .../docroot/ra/admin/console/img/pki-icon-home.gif |  Bin 657 -> 657 bytes
 .../ra/admin/console/img/pki-icon-software.gif     |  Bin 1146 -> 1146 bytes
 .../shared/docroot/ra/admin/console/js/misc.js     |    0
 {pki/dogtag => dogtag}/tks-ui/CMakeLists.txt       |    0
 {pki/dogtag => dogtag}/tks-ui/LICENSE              |    0
 {pki/dogtag => dogtag}/tks-ui/build.xml            |    0
 {pki/dogtag => dogtag}/tks-ui/build_dogtag         |    0
 .../tks-ui/dogtag-pki-tks-ui.spec                  |    0
 .../tks-ui/shared/webapps/tks/404.html             |    0
 .../tks-ui/shared/webapps/tks/500.html             |    0
 .../shared/webapps/tks/GenUnexpectedError.template |    0
 .../shared/webapps/tks/agent/GenError.template     |    0
 .../shared/webapps/tks/agent/GenPending.template   |    0
 .../shared/webapps/tks/agent/GenRejected.template  |    0
 .../shared/webapps/tks/agent/GenSuccess.template   |    0
 .../webapps/tks/agent/GenSvcPending.template       |    0
 .../webapps/tks/agent/GenUnauthorized.template     |    0
 .../webapps/tks/agent/GenUnexpectedError.template  |    0
 .../tks-ui/shared/webapps/tks/agent/cms-funcs.js   |    0
 .../tks-ui/shared/webapps/tks/agent/funcs.js       |    0
 .../webapps/tks/agent/graphics/dgLeftTab.gif       |  Bin 89 -> 89 bytes
 .../webapps/tks/agent/graphics/dgRightTab.gif      |  Bin 102 -> 102 bytes
 .../shared/webapps/tks/agent/graphics/favicon.ico  |  Bin 601 -> 601 bytes
 .../webapps/tks/agent/graphics/goto-tall.gif       |  Bin 86 -> 86 bytes
 .../shared/webapps/tks/agent/graphics/gray90.gif   |  Bin 66 -> 66 bytes
 .../shared/webapps/tks/agent/graphics/hr.gif       |  Bin 60 -> 60 bytes
 .../webapps/tks/agent/graphics/lgLeftTab.gif       |  Bin 89 -> 89 bytes
 .../webapps/tks/agent/graphics/lgRightTab.gif      |  Bin 102 -> 102 bytes
 .../webapps/tks/agent/graphics/logo_header.gif     |  Bin 5833 -> 5833 bytes
 .../shared/webapps/tks/agent/graphics/spacer.gif   |  Bin 43 -> 43 bytes
 .../shared/webapps/tks/agent/header.template       |    0
 .../tks-ui/shared/webapps/tks/agent/helpfun.js     |    0
 .../tks-ui/shared/webapps/tks/agent/index.html     |    0
 .../tks-ui/shared/webapps/tks/agent/index.template |    0
 .../tks-ui/shared/webapps/tks/agent/ports.template |    0
 .../shared/webapps/tks/agent/tks/getStats.template |    0
 .../tks-ui/shared/webapps/tks/agent/tks/index.html |    0
 .../tks-ui/shared/webapps/tks/index.html           |    0
 .../tks-ui/shared/webapps/tks/services.template    |    0
 {pki/dogtag => dogtag}/tps-ui/CMakeLists.txt       |    0
 {pki/dogtag => dogtag}/tps-ui/LICENSE              |    0
 {pki/dogtag => dogtag}/tps-ui/build.xml            |    0
 {pki/dogtag => dogtag}/tps-ui/build_dogtag         |    0
 .../tps-ui/dogtag-pki-tps-ui.spec                  |    0
 .../tps-ui/shared/cgi-bin/demo/Enroll.html         |    0
 .../tps-ui/shared/cgi-bin/home/Enroll.html         |    0
 .../tps-ui/shared/cgi-bin/so/Enroll.html           |    0
 .../tps-ui/shared/cgi-bin/sow/cfg.pl               |    0
 .../tps-ui/shared/cgi-bin/sow/enroll.html          |    0
 .../tps-ui/shared/cgi-bin/sow/enroll_temp.html     |    0
 .../tps-ui/shared/cgi-bin/sow/format.html          |    0
 .../tps-ui/shared/cgi-bin/sow/formatso.html        |    0
 .../tps-ui/shared/cgi-bin/sow/main.html            |    0
 .../tps-ui/shared/cgi-bin/sow/noaccess.html        |    0
 .../tps-ui/shared/cgi-bin/sow/read.html            |    0
 .../tps-ui/shared/cgi-bin/sow/read_temp.html       |    0
 .../tps-ui/shared/cgi-bin/sow/search.html          |    0
 .../tps-ui/shared/cgi-bin/sow/search_temp.html     |    0
 .../tps-ui/shared/cgi-bin/sow/seturl.html          |    0
 .../tps-ui/shared/cgi-bin/sow/welcome.html         |    0
 .../tps-ui/shared/docroot/404.html                 |    0
 .../tps-ui/shared/docroot/500.html                 |    0
 .../tps-ui/shared/docroot/css/pki-360.css          |    0
 .../tps-ui/shared/docroot/css/pki-base.css         |    0
 .../tps-ui/shared/docroot/css/pki.css              |    0
 .../tps-ui/shared/docroot/esc/AdminEsc.html        |    0
 .../tps-ui/shared/docroot/esc/AdvancePopup.html    |    0
 .../tps-ui/shared/docroot/esc/EnrollPopup.html     |    0
 .../tps-ui/shared/docroot/esc/GenericAuth.html     |    0
 .../tps-ui/shared/docroot/esc/SettingsEsc.html     |    0
 .../tps-ui/shared/docroot/esc/TokenManager.html    |    0
 .../tps-ui/shared/docroot/esc/TokenPin.html        |    0
 .../shared/docroot/esc/demo/EnrollSuccess.html     |    0
 .../shared/docroot/esc/demo/GenericAuth.html       |    0
 .../tps-ui/shared/docroot/esc/demo/logo.jpg        |  Bin 429 -> 429 bytes
 .../tps-ui/shared/docroot/esc/demo/style.css       |    0
 .../tps-ui/shared/docroot/esc/demo/util.js         |    0
 .../shared/docroot/esc/home/EnrollSuccess.html     |    0
 .../shared/docroot/esc/home/GenericAuth.html       |    0
 .../tps-ui/shared/docroot/esc/home/logo.jpg        |  Bin 429 -> 429 bytes
 .../tps-ui/shared/docroot/esc/home/style.css       |    0
 .../tps-ui/shared/docroot/esc/home/util.js         |    0
 .../shared/docroot/esc/images/BannerBackground.gif |  Bin 335 -> 335 bytes
 .../shared/docroot/esc/images/CancelButton.gif     |  Bin 1337 -> 1337 bytes
 .../shared/docroot/esc/images/CloseButton.gif      |  Bin 1309 -> 1309 bytes
 .../shared/docroot/esc/images/ContinueButton.gif   |  Bin 1457 -> 1457 bytes
 .../shared/docroot/esc/images/HelpButton.gif       |  Bin 1279 -> 1279 bytes
 .../shared/docroot/esc/images/NetKey-Small.gif     |  Bin 135 -> 135 bytes
 .../shared/docroot/esc/images/NetKeyInsert.gif     |  Bin 1622 -> 1622 bytes
 .../shared/docroot/esc/images/NetKeyLogo.gif       |  Bin 426 -> 426 bytes
 .../shared/docroot/esc/images/NetKeyPair.gif       |  Bin 1451 -> 1451 bytes
 .../shared/docroot/esc/images/NetKeyProgress.gif   |  Bin 7018 -> 7018 bytes
 .../docroot/esc/images/NetKeyQuestionMark.gif      |  Bin 1707 -> 1707 bytes
 .../tps-ui/shared/docroot/esc/images/OKButton.gif  |  Bin 1237 -> 1237 bytes
 .../tps-ui/shared/docroot/esc/images/PadLock.gif   |  Bin 136 -> 136 bytes
 .../shared/docroot/esc/images/PurchaseButton.gif   |  Bin 1878 -> 1878 bytes
 .../shared/docroot/esc/images/ReactivateButton.gif |  Bin 1482 -> 1482 bytes
 .../shared/docroot/esc/images/ReleaseButton.gif    |  Bin 1413 -> 1413 bytes
 .../shared/docroot/esc/images/SecureButton.gif     |  Bin 1340 -> 1340 bytes
 .../shared/docroot/esc/images/SuspendButton.gif    |  Bin 1425 -> 1425 bytes
 .../shared/docroot/esc/images/TryAgainButton.gif   |  Bin 1441 -> 1441 bytes
 .../tps-ui/shared/docroot/esc/images/bg.jpg        |  Bin 519 -> 519 bytes
 .../tps-ui/shared/docroot/esc/images/logo.gif      |  Bin 2866 -> 2866 bytes
 .../shared/docroot/esc/so/EnrollSuccess.html       |    0
 .../tps-ui/shared/docroot/esc/so/GenericAuth.html  |    0
 .../shared/docroot/esc/so/images/indicator.gif     |  Bin 701 -> 701 bytes
 .../tps-ui/shared/docroot/esc/so/images/logo.gif   |  Bin 2866 -> 2866 bytes
 .../tps-ui/shared/docroot/esc/so/logo.jpg          |  Bin 429 -> 429 bytes
 .../tps-ui/shared/docroot/esc/so/style.css         |    0
 .../tps-ui/shared/docroot/esc/so/util.js           |    0
 .../shared/docroot/esc/sow/EnrollSuccess.html      |    0
 .../tps-ui/shared/docroot/esc/sow/GenericAuth.html |    0
 .../tps-ui/shared/docroot/esc/sow/css/style.css    |    0
 .../shared/docroot/esc/sow/images/indicator.gif    |  Bin 701 -> 701 bytes
 .../tps-ui/shared/docroot/esc/sow/images/logo.gif  |  Bin 2866 -> 2866 bytes
 .../shared/docroot/esc/sow/js/ajax-dynamic-list.js |    0
 .../tps-ui/shared/docroot/esc/sow/js/ajax.js       |    0
 .../tps-ui/shared/docroot/esc/sow/js/effects.js    |    0
 .../tps-ui/shared/docroot/esc/sow/js/lightbox.js   |    0
 .../tps-ui/shared/docroot/esc/sow/js/prototype.js  |    0
 .../shared/docroot/esc/sow/js/scriptaculous.js     |    0
 .../tps-ui/shared/docroot/esc/sow/logo.jpg         |  Bin 429 -> 429 bytes
 .../tps-ui/shared/docroot/esc/sow/style.css        |    0
 .../tps-ui/shared/docroot/esc/sow/util.js          |    0
 .../tps-ui/shared/docroot/esc/style.css            |    0
 .../tps-ui/shared/docroot/footer.vm                |    0
 .../tps-ui/shared/docroot/header.vm                |    0
 .../tps-ui/shared/docroot/index.vm                 |    0
 .../shared/docroot/tokendb/addConfig.template      |    0
 .../shared/docroot/tokendb/addResults.template     |    0
 .../docroot/tokendb/agentSelectConfig.template     |    0
 .../docroot/tokendb/agentViewConfig.template       |    0
 .../shared/docroot/tokendb/auditAdmin.template     |    0
 .../docroot/tokendb/confirmConfigChanges.template  |    0
 .../docroot/tokendb/confirmDeleteConfig.template   |    0
 .../tps-ui/shared/docroot/tokendb/delete.template  |    0
 .../shared/docroot/tokendb/deleteResults.template  |    0
 .../tps-ui/shared/docroot/tokendb/doToken.template |    0
 .../shared/docroot/tokendb/doTokenConfirm.template |    0
 .../tps-ui/shared/docroot/tokendb/edit.template    |    0
 .../shared/docroot/tokendb/editConfig.template     |    0
 .../shared/docroot/tokendb/editResults.template    |    0
 .../shared/docroot/tokendb/editUser.template       |    0
 .../tps-ui/shared/docroot/tokendb/error.template   |    0
 .../tps-ui/shared/docroot/tokendb/index.template   |    0
 .../shared/docroot/tokendb/indexAdmin.template     |    0
 .../shared/docroot/tokendb/indexOperator.template  |    0
 .../tps-ui/shared/docroot/tokendb/new.template     |    0
 .../tps-ui/shared/docroot/tokendb/newUser.template |    0
 .../tps-ui/shared/docroot/tokendb/revoke.template  |    0
 .../tps-ui/shared/docroot/tokendb/search.template  |    0
 .../shared/docroot/tokendb/searchActivity.template |    0
 .../docroot/tokendb/searchActivityAdmin.template   |    0
 .../tokendb/searchActivityAdminResults.template    |    0
 .../docroot/tokendb/searchActivityResults.template |    0
 .../shared/docroot/tokendb/searchAdmin.template    |    0
 .../docroot/tokendb/searchAdminResults.template    |    0
 .../docroot/tokendb/searchCertificate.template     |    0
 .../tokendb/searchCertificateResults.template      |    0
 .../shared/docroot/tokendb/searchResults.template  |    0
 .../shared/docroot/tokendb/searchUser.template     |    0
 .../docroot/tokendb/searchUserResults.template     |    0
 .../shared/docroot/tokendb/selectConfig.template   |    0
 .../shared/docroot/tokendb/selfTest.template       |    0
 .../docroot/tokendb/selfTestResults.template       |    0
 .../tps-ui/shared/docroot/tokendb/show.template    |    0
 .../shared/docroot/tokendb/showAdmin.template      |    0
 .../shared/docroot/tokendb/showCert.template       |    0
 .../shared/docroot/tokendb/userDelete.template     |    0
 .../admin/console/config/adminauthenticatepanel.vm |    0
 .../docroot/tps/admin/console/config/adminpanel.vm |    0
 .../admin/console/config/agentauthenticatepanel.vm |    0
 .../tps/admin/console/config/authdbpanel.vm        |    0
 .../tps/admin/console/config/cainfopanel.vm        |    0
 .../tps/admin/console/config/certchainpanel.vm     |    0
 .../admin/console/config/certprettyprintpanel.vm   |    0
 .../tps/admin/console/config/certrequestpanel.vm   |    0
 .../tps/admin/console/config/config_addhsm.vm      |    0
 .../docroot/tps/admin/console/config/config_db.vm  |    0
 .../docroot/tps/admin/console/config/config_hsm.vm |    0
 .../admin/console/config/config_hsmloginpanel.vm   |    0
 .../tps/admin/console/config/config_join.vm        |    0
 .../tps/admin/console/config/config_rootca.vm      |    0
 .../admin/console/config/createsubsystempanel.vm   |    0
 .../tps/admin/console/config/databasepanel.vm      |    0
 .../admin/console/config/displaycertchain2panel.vm |    0
 .../admin/console/config/displaycertchainpanel.vm  |    0
 .../docroot/tps/admin/console/config/donepanel.vm  |    0
 .../tps/admin/console/config/drminfopanel.vm       |    0
 .../docroot/tps/admin/console/config/footer.vm     |    0
 .../docroot/tps/admin/console/config/header.vm     |    0
 .../tps/admin/console/config/hierarchypanel.vm     |    0
 .../admin/console/config/importadmincertpanel.vm   |    0
 .../docroot/tps/admin/console/config/login.vm      |    0
 .../tps/admin/console/config/modulepanel.vm        |    0
 .../docroot/tps/admin/console/config/namepanel.vm  |    0
 .../console/config/securitydomainloginpanel.vm     |    0
 .../admin/console/config/securitydomainpanel.vm    |    0
 .../docroot/tps/admin/console/config/sidemenu.vm   |    0
 .../docroot/tps/admin/console/config/sizepanel.vm  |    0
 .../tps/admin/console/config/tksinfopanel.vm       |    0
 .../docroot/tps/admin/console/config/topmenu.vm    |    0
 .../tps/admin/console/config/welcomepanel.vm       |    0
 .../docroot/tps/admin/console/config/wizard.vm     |    0
 .../shared/docroot/tps/admin/console/config/xml.vm |    0
 .../shared/docroot/tps/admin/console/img/badge.png |  Bin 1635 -> 1635 bytes
 .../docroot/tps/admin/console/img/bigrotation2.gif |  Bin 1787 -> 1787 bytes
 .../docroot/tps/admin/console/img/button-clear.gif |  Bin 647 -> 647 bytes
 .../tps/admin/console/img/button-manage.gif        |  Bin 776 -> 776 bytes
 .../tps/admin/console/img/button-search.gif        |  Bin 1293 -> 1293 bytes
 .../docroot/tps/admin/console/img/certificate.png  |  Bin 4663 -> 4663 bytes
 .../docroot/tps/admin/console/img/clearpixel.gif   |  Bin 43 -> 43 bytes
 .../docroot/tps/admin/console/img/favicon.ico      |  Bin 601 -> 601 bytes
 .../docroot/tps/admin/console/img/icon_checkin.gif |  Bin 225 -> 225 bytes
 .../tps/admin/console/img/icon_crit_update.gif     |  Bin 337 -> 337 bytes
 .../docroot/tps/admin/console/img/icon_locked.gif  |  Bin 515 -> 515 bytes
 .../tps/admin/console/img/icon_reg_update.gif      |  Bin 307 -> 307 bytes
 .../docroot/tps/admin/console/img/icon_up2date.gif |  Bin 226 -> 226 bytes
 .../shared/docroot/tps/admin/console/img/id.png    |  Bin 1604 -> 1604 bytes
 .../shared/docroot/tps/admin/console/img/idkey.png |  Bin 1690 -> 1690 bytes
 .../shared/docroot/tps/admin/console/img/key.png   |  Bin 1753 -> 1753 bytes
 .../shared/docroot/tps/admin/console/img/lock.png  |  Bin 1453 -> 1453 bytes
 .../docroot/tps/admin/console/img/logo_header.gif  |  Bin 5833 -> 5833 bytes
 .../tps/admin/console/img/no-certificate.png       |  Bin 2342 -> 2342 bytes
 .../tps/admin/console/img/pki-icon-help.gif        |  Bin 326 -> 326 bytes
 .../tps/admin/console/img/pki-icon-home.gif        |  Bin 657 -> 657 bytes
 .../tps/admin/console/img/pki-icon-software.gif    |  Bin 1146 -> 1146 bytes
 .../shared/docroot/tps/admin/console/js/misc.js    |    0
 .../pki-core-selinux-Dogtag-9-f16.patch            |    0
 .../pki-core-selinux-Dogtag-9-f17.patch            |    0
 {pki/scripts => scripts}/build_dogtag_pki          |    0
 .../compose_dogtag_pki_meta_packages               |    0
 .../compose_dogtag_pki_theme_packages              |    0
 {pki/scripts => scripts}/compose_functions         |    0
 .../compose_ipa_pki_theme_packages                 |    0
 .../compose_pki_console_packages                   |    0
 {pki/scripts => scripts}/compose_pki_core_packages |    0
 {pki/scripts => scripts}/compose_pki_kra_packages  |    0
 .../compose_pki_migrate_packages                   |    0
 {pki/scripts => scripts}/compose_pki_ocsp_packages |    0
 {pki/scripts => scripts}/compose_pki_ra_packages   |    0
 {pki/scripts => scripts}/compose_pki_tks_packages  |    0
 {pki/scripts => scripts}/compose_pki_tps_packages  |    0
 {pki/scripts => scripts}/create_pki_yum_repos      |    0
 .../install_default_ca_instance                    |    0
 .../install_default_pki_instances                  |    0
 {pki/scripts => scripts}/pki_patch_maker           |    0
 {pki/scripts => scripts}/prepare_dogtag_pki        |    0
 .../remove_default_pki_instances                   |    0
 {pki/scripts => scripts}/remove_pki_components     |    0
 {pki/specs => specs}/dogtag-pki-theme.spec         |    0
 {pki/specs => specs}/dogtag-pki.spec               |    0
 {pki/specs => specs}/ipa-pki-theme.spec            |    0
 {pki/specs => specs}/pki-console.spec              |    0
 {pki/specs => specs}/pki-core.spec                 |    0
 {pki/specs => specs}/pki-kra.spec                  |    0
 {pki/specs => specs}/pki-migrate.spec              |    0
 {pki/specs => specs}/pki-ocsp.spec                 |    0
 {pki/specs => specs}/pki-ra.spec                   |    0
 {pki/specs => specs}/pki-tks.spec                  |    0
 {pki/specs => specs}/pki-tps.spec                  |    0
 {pki/tools => tools}/jar/README.jar-tools          |    0
 {pki/tools => tools}/jar/jar-query                 |    0
 {pki/tools => tools}/jar/java-imports              |    0
 3744 files changed, 0 insertions(+), 0 deletions(-)
 rename pki/.classpath => .classpath (100%)
 rename pki/.gitignore => .gitignore (100%)
 rename pki/.project => .project (100%)
 rename pki/CMakeLists.txt => CMakeLists.txt (100%)
 rename pki/COPYING => COPYING (100%)
 rename pki/CPackConfig.cmake => CPackConfig.cmake (100%)
 rename pki/ConfigureChecks.cmake => ConfigureChecks.cmake (100%)
 rename pki/DefineOptions.cmake => DefineOptions.cmake (100%)
 rename pki/README => README (100%)
 rename {pki/base => base}/CMakeLists.txt (100%)
 rename {pki/base => base}/ca/CMakeLists.txt (100%)
 rename {pki/base => base}/ca/LICENSE (100%)
 rename {pki/base => base}/ca/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/ca/setup/registry_instance (100%)
 rename {pki/base => base}/ca/shared/conf/CMakeLists.txt (100%)
 rename {pki/base => base}/ca/shared/conf/CS.cfg.in (100%)
 rename {pki/base => base}/ca/shared/conf/acl.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/adminCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/caAuditSigningCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/caCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/caOCSPCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/catalina.policy (100%)
 rename {pki/base => base}/ca/shared/conf/catalina.properties (100%)
 rename {pki/base => base}/ca/shared/conf/context.xml (100%)
 rename {pki/base => base}/ca/shared/conf/database.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/db.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/flatfile.txt (100%)
 rename {pki/base => base}/ca/shared/conf/index.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/jk2.manifest (100%)
 rename {pki/base => base}/ca/shared/conf/jk2.properties (100%)
 rename {pki/base => base}/ca/shared/conf/jkconf.ant.xml (100%)
 rename {pki/base => base}/ca/shared/conf/jkconfig.manifest (100%)
 rename {pki/base => base}/ca/shared/conf/logging.properties (100%)
 rename {pki/base => base}/ca/shared/conf/manager.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/proxy.conf (100%)
 rename {pki/base => base}/ca/shared/conf/registry.cfg (100%)
 rename {pki/base => base}/ca/shared/conf/schema.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/server-minimal.xml (100%)
 rename {pki/base => base}/ca/shared/conf/server.xml (100%)
 rename {pki/base => base}/ca/shared/conf/serverCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/serverCertNick.conf (100%)
 rename {pki/base => base}/ca/shared/conf/shm.manifest (100%)
 rename {pki/base => base}/ca/shared/conf/subsystemCert.profile (100%)
 rename {pki/base => base}/ca/shared/conf/tomcat-jk2.manifest (100%)
 rename {pki/base => base}/ca/shared/conf/tomcat-users.xml (100%)
 rename {pki/base => base}/ca/shared/conf/tomcat6.conf (100%)
 rename {pki/base => base}/ca/shared/conf/uriworkermap.properties (100%)
 rename {pki/base => base}/ca/shared/conf/vlv.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/vlvtasks.ldif (100%)
 rename {pki/base => base}/ca/shared/conf/web.xml (100%)
 rename {pki/base => base}/ca/shared/conf/workers.properties (100%)
 rename {pki/base => base}/ca/shared/conf/workers.properties.minimal (100%)
 rename {pki/base => base}/ca/shared/conf/workers2.properties (100%)
 rename {pki/base => base}/ca/shared/conf/workers2.properties.minimal (100%)
 rename {pki/base => base}/ca/shared/emails/ExpiredUnpublishJob (100%)
 rename {pki/base => base}/ca/shared/emails/ExpiredUnpublishJobItem (100%)
 rename {pki/base => base}/ca/shared/emails/certIssued_CA (100%)
 rename {pki/base => base}/ca/shared/emails/certIssued_CA.html (100%)
 rename {pki/base => base}/ca/shared/emails/certIssued_RA (100%)
 rename {pki/base => base}/ca/shared/emails/certIssued_RA.html (100%)
 rename {pki/base => base}/ca/shared/emails/certRequestRejected.html (100%)
 rename {pki/base => base}/ca/shared/emails/certRevoked_CA (100%)
 rename {pki/base => base}/ca/shared/emails/certRevoked_CA.html (100%)
 rename {pki/base => base}/ca/shared/emails/certRevoked_RA (100%)
 rename {pki/base => base}/ca/shared/emails/certRevoked_RA.html (100%)
 rename {pki/base => base}/ca/shared/emails/euJob1.html (100%)
 rename {pki/base => base}/ca/shared/emails/euJob1Item.html (100%)
 rename {pki/base => base}/ca/shared/emails/publishCerts.html (100%)
 rename {pki/base => base}/ca/shared/emails/publishCertsItem.html (100%)
 rename {pki/base => base}/ca/shared/emails/reqInQueue_CA (100%)
 rename {pki/base => base}/ca/shared/emails/reqInQueue_CA.html (100%)
 rename {pki/base => base}/ca/shared/emails/reqInQueue_RA (100%)
 rename {pki/base => base}/ca/shared/emails/reqInQueue_RA.html (100%)
 rename {pki/base => base}/ca/shared/emails/riq1Item.html (100%)
 rename {pki/base => base}/ca/shared/emails/riq1Summary.html (100%)
 rename {pki/base => base}/ca/shared/emails/rnJob1.txt (100%)
 rename {pki/base => base}/ca/shared/emails/rnJob1Item.txt (100%)
 rename {pki/base => base}/ca/shared/emails/rnJob1Summary.txt (100%)
 rename {pki/base => base}/ca/shared/etc/init.d/pki-cad (100%)
 rename {pki/base => base}/ca/shared/lib/systemd/system/pki-cad.target (100%)
 rename {pki/base => base}/ca/shared/lib/systemd/system/pki-cad@.service (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/DomainController.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caAdminCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caAgentFileSigning.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caAgentServerCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caCACert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caCMCUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caDirUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caDirUserRenewal.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caDualCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caDualRAuserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caECDualCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caECUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caEncECUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caEncUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caFullCMCUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caIPAserviceCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInstallCACert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthServerCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caJarSigningCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caManualRenewal.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caOCSPCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caOtherCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caRACert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caRARouterCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caRAagentCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caRAserverCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caRouterCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caServerCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caSignedLogCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTPSCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caTransportCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caUUIDdeviceCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caUserCert.cfg (100%)
 rename {pki/base => base}/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg (100%)
 rename {pki/base => base}/ca/shared/webapps/ROOT/WEB-INF/web.xml (100%)
 rename {pki/base => base}/ca/shared/webapps/ROOT/index.jsp (100%)
 rename {pki/base => base}/ca/shared/webapps/ca/WEB-INF/velocity.properties (100%)
 rename {pki/base => base}/ca/shared/webapps/ca/WEB-INF/web.xml (100%)
 rename {pki/base => base}/ca/src/CMakeLists.txt (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CAPolicy.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CAService.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CMSCRLExtensions.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CRLIssuingPoint.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CRLWithExpiredCerts.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/CertificateAuthority.java (100%)
 rename {pki/base => base}/ca/src/com/netscape/ca/SigningUnit.java (100%)
 rename {pki/base => base}/common/CMakeLists.txt (100%)
 rename {pki/base => base}/common/LICENSE (100%)
 rename {pki/base => base}/common/setup/CertServer.directory (100%)
 rename {pki/base => base}/common/setup/menu.xml (100%)
 rename {pki/base => base}/common/setup/web-app_2_3.dtd (100%)
 rename {pki/base => base}/common/src/CMakeLists.txt (100%)
 rename {pki/base => base}/common/src/LogMessages.properties (100%)
 rename {pki/base => base}/common/src/UserMessages.properties (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/ACL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/ACLEntry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/ACLsResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/EACLsException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/IACL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/acls/IACLEntry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/apps/CMS.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/apps/ICMSEngine.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/apps/ICommandQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/AuthCredentials.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/AuthResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/AuthToken.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EAuthException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EAuthUserError.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/EMissingCredential.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/IAuthManager.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/IAuthToken.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authentication/ISharedToken.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authority/IAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authority/ICertAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/AuthzResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/AuthzToken.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/IAuthzManager.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ASubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/AttributeNameHelper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/BaseResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/EBaseException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/EPropertyNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IArgBlock.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IAttrSet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IAuthInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IConfigStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IPluginImpl.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ISourceConfigStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ISubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ISubsystemSource.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/ITimeSource.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/KeyGenInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/MessageFormatter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/MetaAttributeDef.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/MetaInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/Nonces.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/PasswordResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/Plugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/base/SessionContext.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/CAResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ECAException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ICAService.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/client/IDataProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/client/connection/IConnection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/ConfigConstants.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/Constants.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/DestDef.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/NameValuePair.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/NameValuePairs.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/OpDef.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/PrefixDef.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/ScopeDef.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/common/TaskId.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IConnector.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IHttpConnection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IPKIMessage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IRequestEncoder.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/connector/IResender.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/DBResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/EDBException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBObj.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBRegistry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBSSession.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IElementProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/IFilterConverter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/Modification.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/ModificationSet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/repository/IRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/extensions/EExtensionsException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/extensions/ICMSExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/EJobsException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/IJob.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/IJobCron.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/JobPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/jobs/JobsResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/EKRAException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/IJoinShares.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/IKeyService.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/IProofOfArchival.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/IShare.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/KRAResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/kra/ProofOfArchival.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ELdapException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ldap/LdapResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/listeners/EListenersException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/listeners/ListenersResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/AuditEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/AuditFormat.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ConsoleError.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ConsoleLog.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ELogException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ELogNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogEventFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogEventListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/ILogger.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/LogPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/LogResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/logging/SystemEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/ENotificationException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/IEmailResolver.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/IEmailTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/IMailNotification.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/notification/NotificationResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ocsp/IDefStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ocsp/IOCSPService.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/password/EPasswordCheckException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/password/IPasswordCheck.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/pattern/Pattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/EPolicyException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IPolicyRule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IPolicySet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/policy/PolicyResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/CertInfoProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/EDeferException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/EProfileException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/ERejectException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IPolicyDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileContext.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileEx.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileOutput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfilePolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/profile/IProfileUpdater.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/property/Descriptor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/property/EPropertyException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/property/IConfigTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/property/IDescriptor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/property/PropertySet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/EMapperNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ERuleNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ICRLPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/ILdapRule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/MapperPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/MapperProxy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/PublisherPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/PublisherProxy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/publish/RulePlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ra/IRAService.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/registry/ERegistryException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/registry/IPluginInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/registry/IPluginRegistry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/ARequestNotifier.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/AgentApproval.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/AgentApprovals.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/INotify.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestNotifier.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestScheduler.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IRequestVirtualList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/IService.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/PolicyMessage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/PolicyResult.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/RequestId.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/RequestStatus.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/Credential.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/IEncryptionUnit.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/ISigningUnit.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/IToken.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/security/KeyCertData.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/ESelfTestException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/ISelfTest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/selftests/SelfTestResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/template/ArgList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/template/ArgSet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/template/ArgString.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/template/IArgValue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/tks/ITKSAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/Certificates.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IGroup.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IUser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/util/HttpInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/util/IStatsSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/certsrv/util/StatsEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/AVAPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/CMCAuth.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/Crypt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/DNPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/FlatFileAuth.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/HashAuthData.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/HashAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/PortalEnroll.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/RDNPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/SharedSecret.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/TokenAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authorization/AAclAuthz.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authorization/BasicAclAuthz.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/authorization/DirAclAuthz.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/jobs/AJobBase.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/jobs/PublishCertsJob.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/jobs/RequestInQueueJob.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/listeners/PinRemovalListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/listeners/RequestInQListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/logging/LogEntry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/logging/LogFile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/logging/RollingLogFile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/notification/MailNotification.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/ocsp/DefStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/ocsp/LDAPStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/password/PasswordChecker.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/APolicyRule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/PresenceExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/BasicProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/EnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/ProfileContext.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/ProfilePolicy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/NoConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/CAValidityDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/EnrollDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/GenericExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/ImageDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/NoDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/UserKeyDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/UserValidityDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/ValidityDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/CertReqInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/EnrollInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/FileSigningInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/GenericInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/ImageInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/KeyGenInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/SubjectDNInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/SubjectNameInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/output/CMMFOutput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/output/CertOutput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/output/EnrollOutput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/output/PKCS7Output.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/AVAPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/mappers/NoMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/publish/publishers/Utils.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/request/RequestScheduler.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ASelfTest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ca/CAPresence.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ca/CAValidity.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/kra/KRAPresence.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/ra/RAPresence.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/AdminResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/AdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/CMSServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/GetStats.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/IndexServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/PortsServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/ProxyServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/base/UserInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DoRevoke.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetBySerial.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetCAChain.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetCRL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/GetInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/ListCerts.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/Monitor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/SrchCerts.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/UpdateDir.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/AuthCredentials.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSFile.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSGWResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSGateway.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSRequest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/ECMSGWException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/IRawJS.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/RawJS.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/common/Utils.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/connector/CloneServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/Cert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/DisplayTransport.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/GetPk12.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/GrantRecovery.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/SrchKey.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/CertReqParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/CheckRequest.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/IReqParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/KeyReqParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/ProcessReq.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/QueryReq.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/ReqParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/request/SearchReqs.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/tks/TokenServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/shares/OldJoinShares.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cms/shares/OldShare.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/CMSEngine.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/CommandQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/PKIServerEvent.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/PKIServerListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/Setup.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/apps/Upgrade.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/NullAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/VerifiedCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/ArgBlock.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/FileConfigStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/PropConfigStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/SimpleProperties.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/SourceConfigStore.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/SubsystemLoader.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/base/SubsystemRegistry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CertDateCompare.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CertUtils.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CertificatePair.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/HttpConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/HttpConnection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/HttpConnector.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/LocalConnector.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/RemoteAuthority.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/RequestTransfer.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/connector/Resender.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/crmf/CRMFParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CRLRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CertDBSchema.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CertRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CertRecordList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/CertificateRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBRegistry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBSSession.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBSUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBSearchResults.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DBVirtualList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/DateMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/IntegerMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyRecordList.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/LongMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/Repository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/RepositorySchema.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/RevocationInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/StringMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/X500NameMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/extensions/KeyUsage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/jobs/CronItem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/jobs/CronRange.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/jobs/JobCron.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/jobs/JobsScheduler.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapConnModule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapRule.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/PublishObject.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/AuditEventFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/AuditFormat.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/LogQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/LogSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/Logger.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/logging/SystemEventFactory.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/notification/EmailTemplate.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/AndExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/OrExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/PolicySet.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/policy/SimpleExpression.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/registry/PluginInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/registry/PluginRegistry.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/ARequestQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/ARequestRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/CertRequestConstants.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/ExtDataHashtable.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/RequestAttr.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/RequestQueue.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/RequestRecord.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/RequestRepository.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/RequestSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/request/Schema.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/CASigningCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/CertificateInfo.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/JssSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/KRATransportCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/KeyCertUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/OCSPSigningCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/PWCBsdr.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/PWUtil.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/PWsdrCache.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/Provider.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/RASigningCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/SSLCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/security/SubsystemCert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/time/SimpleTimeSource.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/usrgrp/Group.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/usrgrp/User.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/Assert.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/AssertionException.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/Debug.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/ExceptionFormatter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/FileAsString.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/FileDialogFilter.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/OsSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/PFXUtils.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/ProfileSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/StatsSubsystem.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/UtilMessage.java (100%)
 rename {pki/base => base}/common/src/com/netscape/cmscore/util/UtilResources.java (100%)
 rename {pki/base => base}/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/RequestDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/RequestQueueTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/RequestRecordTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/request/RequestTest.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java (100%)
 rename {pki/base => base}/common/test/com/netscape/cmscore/test/TestHelper.java (100%)
 rename {pki/base => base}/console/CMakeLists.txt (100%)
 rename {pki/base => base}/console/LICENSE (100%)
 rename {pki/base => base}/console/src/CMakeLists.txt (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSAdmin.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSAdminResources.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSBasePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSMessageBox.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSPassword.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSResourceObject.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSResourcePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSServerInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSTaskModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSTaskObject.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CMSUIFramework.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CellEditorData.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/Console.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CustomComboBox.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/EAdminException.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/GenericCellEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/HourGlass.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IAttributeContent.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IConnectionListener.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IDataProcessor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IDisplayPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IEditorPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IFilterPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IMenuAction.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IRefreshTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/IUIMapper.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/certsrv-help.properties (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACIDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ACLPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CACertsTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ViewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WMNSelection.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/WarningDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/IConnection.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/Request.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/Response.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/UGobjs.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/acl.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/aclobj.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/aclplugin.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/alertl.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/alluser16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/auth.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/authobj.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/authplugin.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/cert24.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/cert41.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/cert42.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/cms-branding.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/error.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/genobject.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/jobobj.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/jobplugin.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/jobs.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/ldapub.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/messagel.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/notsecure.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/plug.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/plugin.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/rule-16.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/rulesobj.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/secure.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/servlet-16.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/images/servletobj.gif (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLTable.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertListTable.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CipherEntry.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/Comm.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/Message.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/MessageDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/Response.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/StatusPane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/security/WizardObservable.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/ILogParser.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/LogDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/status/StatusPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/AuthDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CGITask.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSRemove.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSRestart.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSStart.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSStatus.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CMSStop.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/KeyCert.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/task/StatusDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/GroupTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/UserEditor.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/ug/UserTab.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java (100%)
 rename {pki/base => base}/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/ConfigConstants.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/Constants.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/DestDef.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/NameValuePair.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/NameValuePairs.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/OpDef.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/PrefixDef.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/ScopeDef.java (100%)
 rename {pki/base => base}/console/src/com/netscape/certsrv/common/TaskId.java (100%)
 rename {pki/base => base}/console/templates/CMakeLists.txt (100%)
 rename {pki/base => base}/console/templates/pki_console_wrapper (100%)
 rename {pki/base => base}/java-tools/CMakeLists.txt (100%)
 rename {pki/base => base}/java-tools/LICENSE (100%)
 rename {pki/base => base}/java-tools/doc/README (100%)
 rename {pki/base => base}/java-tools/src/CMakeLists.txt (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/AtoB.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/AuditVerify.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/BtoA.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/CMCEnroll.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/CMCRequest.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/CMCResponse.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/CMCRevoke.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/CRMFPopClient.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/DRMTool.cfg (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/DRMTool.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/ExtJoiner.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/HttpClient.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/OCSPClient.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/PKCS10Client.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/PKCS12Export.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/PasswordCache.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/TestCRLSigning.java (100%)
 rename {pki/base => base}/java-tools/src/com/netscape/cmstools/TokenInfo.java (100%)
 rename {pki/base => base}/java-tools/templates/CMakeLists.txt (100%)
 rename {pki/base => base}/java-tools/templates/pki_java_command_wrapper.in (100%)
 rename {pki/base => base}/java-tools/templates/pretty_print_cert_command_wrapper.in (100%)
 rename {pki/base => base}/java-tools/templates/pretty_print_crl_command_wrapper.in (100%)
 rename {pki/base => base}/kra/CMakeLists.txt (100%)
 rename {pki/base => base}/kra/LICENSE (100%)
 rename {pki/base => base}/kra/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/kra/setup/registry_instance (100%)
 rename {pki/base => base}/kra/shared/conf/CMakeLists.txt (100%)
 rename {pki/base => base}/kra/shared/conf/CS.cfg.in (100%)
 rename {pki/base => base}/kra/shared/conf/acl.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/catalina.policy (100%)
 rename {pki/base => base}/kra/shared/conf/catalina.properties (100%)
 rename {pki/base => base}/kra/shared/conf/context.xml (100%)
 rename {pki/base => base}/kra/shared/conf/database.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/db.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/index.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/jk2.manifest (100%)
 rename {pki/base => base}/kra/shared/conf/jk2.properties (100%)
 rename {pki/base => base}/kra/shared/conf/jkconf.ant.xml (100%)
 rename {pki/base => base}/kra/shared/conf/jkconfig.manifest (100%)
 rename {pki/base => base}/kra/shared/conf/logging.properties (100%)
 rename {pki/base => base}/kra/shared/conf/manager.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/schema.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/server-minimal.xml (100%)
 rename {pki/base => base}/kra/shared/conf/server.xml (100%)
 rename {pki/base => base}/kra/shared/conf/serverCert.profile (100%)
 rename {pki/base => base}/kra/shared/conf/serverCertNick.conf (100%)
 rename {pki/base => base}/kra/shared/conf/shm.manifest (100%)
 rename {pki/base => base}/kra/shared/conf/storageCert.profile (100%)
 rename {pki/base => base}/kra/shared/conf/subsystemCert.profile (100%)
 rename {pki/base => base}/kra/shared/conf/tomcat-jk2.manifest (100%)
 rename {pki/base => base}/kra/shared/conf/tomcat-users.xml (100%)
 rename {pki/base => base}/kra/shared/conf/tomcat6.conf (100%)
 rename {pki/base => base}/kra/shared/conf/transportCert.profile (100%)
 rename {pki/base => base}/kra/shared/conf/uriworkermap.properties (100%)
 rename {pki/base => base}/kra/shared/conf/vlv.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/vlvtasks.ldif (100%)
 rename {pki/base => base}/kra/shared/conf/web.xml (100%)
 rename {pki/base => base}/kra/shared/conf/workers.properties (100%)
 rename {pki/base => base}/kra/shared/conf/workers.properties.minimal (100%)
 rename {pki/base => base}/kra/shared/conf/workers2.properties (100%)
 rename {pki/base => base}/kra/shared/conf/workers2.properties.minimal (100%)
 rename {pki/base => base}/kra/shared/etc/init.d/pki-krad (100%)
 rename {pki/base => base}/kra/shared/lib/systemd/system/pki-krad.target (100%)
 rename {pki/base => base}/kra/shared/lib/systemd/system/pki-krad@.service (100%)
 rename {pki/base => base}/kra/shared/webapps/ROOT/WEB-INF/web.xml (100%)
 rename {pki/base => base}/kra/shared/webapps/ROOT/index.jsp (100%)
 rename {pki/base => base}/kra/shared/webapps/kra/WEB-INF/velocity.properties (100%)
 rename {pki/base => base}/kra/shared/webapps/kra/WEB-INF/web.xml (100%)
 rename {pki/base => base}/kra/src/CMakeLists.txt (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/EncryptionUnit.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/EnrollmentService.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/KRANotify.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/KRAPolicy.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/KRAService.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/KeyRecoveryAuthority.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/NetkeyKeygenService.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/RecoveryService.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/StorageKeyUnit.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/TokenKeyRecoveryService.java (100%)
 rename {pki/base => base}/kra/src/com/netscape/kra/TransportKeyUnit.java (100%)
 rename {pki/base => base}/migrate/41ToTxt/classes/CMS41LdifParser.class (100%)
 rename {pki/base => base}/migrate/41ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/41ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/41ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/41ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/41ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/41ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/42SP2ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/42ToTxt/classes/CMS42LdifParser.class (100%)
 rename {pki/base => base}/migrate/42ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/42ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/42ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/42ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/42ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/42ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/45ToTxt/classes/CMS45LdifParser.class (100%)
 rename {pki/base => base}/migrate/45ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/45ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/45ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/45ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/45ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/45ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/47ToTxt/classes/CMS47LdifParser.class (100%)
 rename {pki/base => base}/migrate/47ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/47ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/47ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/47ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/47ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/47ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/60ToTxt/classes/CMS60LdifParser.class (100%)
 rename {pki/base => base}/migrate/60ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/60ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/60ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/60ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/60ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/60ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/61ToTxt/classes/CMS61LdifParser.class (100%)
 rename {pki/base => base}/migrate/61ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/61ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/61ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/61ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/61ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/61ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/62ToTxt/classes/CMS62LdifParser.class (100%)
 rename {pki/base => base}/migrate/62ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/62ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/62ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/62ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/62ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/62ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/63ToTxt/classes/CMS63LdifParser.class (100%)
 rename {pki/base => base}/migrate/63ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/63ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/63ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/63ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/63ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/63ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/70ToTxt/classes/CMS70LdifParser.class (100%)
 rename {pki/base => base}/migrate/70ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/70ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/70ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/70ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/70ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/70ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/71ToTxt/classes/CMS71LdifParser.class (100%)
 rename {pki/base => base}/migrate/71ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/71ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/71ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/71ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/71ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/71ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/72ToTxt/classes/CMS72LdifParser.class (100%)
 rename {pki/base => base}/migrate/72ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/72ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/72ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/72ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/72ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/72ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/73ToTxt/classes/CMS73LdifParser.class (100%)
 rename {pki/base => base}/migrate/73ToTxt/classes/Main.class (100%)
 rename {pki/base => base}/migrate/73ToTxt/run.bat (100%)
 rename {pki/base => base}/migrate/73ToTxt/run.sh (100%)
 rename {pki/base => base}/migrate/73ToTxt/src/Main.java (100%)
 rename {pki/base => base}/migrate/73ToTxt/src/compile.bat (100%)
 rename {pki/base => base}/migrate/73ToTxt/src/compile.sh (100%)
 rename {pki/base => base}/migrate/80/MigrateSecurityDomain.class (100%)
 rename {pki/base => base}/migrate/80/MigrateSecurityDomain.java (100%)
 rename {pki/base => base}/migrate/80/readme (100%)
 rename {pki/base => base}/migrate/80/schema-add.ldif (100%)
 rename {pki/base => base}/migrate/CMakeLists.txt (100%)
 rename {pki/base => base}/migrate/LICENSE (100%)
 rename {pki/base => base}/migrate/TpsTo80/Makefile (100%)
 rename {pki/base => base}/migrate/TpsTo80/linux/migrateTPSData.i386 (100%)
 rename {pki/base => base}/migrate/TpsTo80/linux/migrateTPSData.x86_64 (100%)
 rename {pki/base => base}/migrate/TpsTo80/migrateTPSData.c (100%)
 rename {pki/base => base}/migrate/TpsTo80/readme (100%)
 rename {pki/base => base}/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc (100%)
 rename {pki/base => base}/migrate/TxtTo60/classes/CMS60LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo60/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo60/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo60/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo60/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo60/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo60/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo60/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo61/classes/CMS61LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo61/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo61/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo61/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo61/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo61/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo61/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo61/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo62/classes/CMS62LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo62/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo62/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo62/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo62/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo62/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo62/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo62/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo70/classes/CMS70LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo70/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo70/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo70/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo70/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo70/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo70/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo70/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo71/classes/CMS71LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo71/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo71/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo71/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo71/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo71/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo71/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo71/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo72/classes/CMS72LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo72/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo72/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo72/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo72/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo72/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo72/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo72/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo73/classes/CMS73LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo73/classes/DummyAuthManager.class (100%)
 rename {pki/base => base}/migrate/TxtTo73/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo73/run.bat (100%)
 rename {pki/base => base}/migrate/TxtTo73/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo73/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo73/src/compile.bat (100%)
 rename {pki/base => base}/migrate/TxtTo73/src/compile.sh (100%)
 rename {pki/base => base}/migrate/TxtTo80/classes/CS80LdifParser.class (100%)
 rename {pki/base => base}/migrate/TxtTo80/classes/Main.class (100%)
 rename {pki/base => base}/migrate/TxtTo80/run.sh (100%)
 rename {pki/base => base}/migrate/TxtTo80/src/Main.java (100%)
 rename {pki/base => base}/migrate/TxtTo80/src/compile.sh (100%)
 rename {pki/base => base}/migrate/kra/RecoverKey.class (100%)
 rename {pki/base => base}/migrate/kra/RecoverKey.java (100%)
 rename {pki/base => base}/migrate/kra/RecoverPin.class (100%)
 rename {pki/base => base}/migrate/kra/RecoverPin.java (100%)
 rename {pki/base => base}/migrate/kra/readme.txt (100%)
 rename {pki/base => base}/native-tools/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/LICENSE (100%)
 rename {pki/base => base}/native-tools/doc/README (100%)
 rename {pki/base => base}/native-tools/src/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/bulkissuance/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/bulkissuance/bulkissuance.c (100%)
 rename {pki/base => base}/native-tools/src/bulkissuance/bulkissuance.data (100%)
 rename {pki/base => base}/native-tools/src/bulkissuance/getopt.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/p7tool/NSPRerrs.h (100%)
 rename {pki/base => base}/native-tools/src/p7tool/SECerrs.h (100%)
 rename {pki/base => base}/native-tools/src/p7tool/SSLerrs.h (100%)
 rename {pki/base => base}/native-tools/src/p7tool/p7tool.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/pppolicy.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/secerror.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/secerror.h (100%)
 rename {pki/base => base}/native-tools/src/p7tool/secpwd.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/secutil.c (100%)
 rename {pki/base => base}/native-tools/src/p7tool/secutil.h (100%)
 rename {pki/base => base}/native-tools/src/revoker/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/revoker/getopt.c (100%)
 rename {pki/base => base}/native-tools/src/revoker/revoker.c (100%)
 rename {pki/base => base}/native-tools/src/setpin/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/setpin/b64.c (100%)
 rename {pki/base => base}/native-tools/src/setpin/options.c (100%)
 rename {pki/base => base}/native-tools/src/setpin/options.h (100%)
 rename {pki/base => base}/native-tools/src/setpin/setpin.c (100%)
 rename {pki/base => base}/native-tools/src/setpin/setpin.conf (100%)
 rename {pki/base => base}/native-tools/src/setpin/setpin_options.c (100%)
 rename {pki/base => base}/native-tools/src/setpin/setpin_options.h (100%)
 rename {pki/base => base}/native-tools/src/sslget/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/sslget/getopt.c (100%)
 rename {pki/base => base}/native-tools/src/sslget/sslget.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/CMakeLists.txt (100%)
 rename {pki/base => base}/native-tools/src/tkstool/NSPRerrs.h (100%)
 rename {pki/base => base}/native-tools/src/tkstool/SECerrs.h (100%)
 rename {pki/base => base}/native-tools/src/tkstool/SSLerrs.h (100%)
 rename {pki/base => base}/native-tools/src/tkstool/delete.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/file.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/find.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/help.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/key.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/list.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/modules.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/pppolicy.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/random.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/retrieve.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/secerror.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/secpwd.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/secutil.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/secutil.h (100%)
 rename {pki/base => base}/native-tools/src/tkstool/tkstool.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/tkstool.h (100%)
 rename {pki/base => base}/native-tools/src/tkstool/util.c (100%)
 rename {pki/base => base}/native-tools/src/tkstool/version.c (100%)
 rename {pki/base => base}/ocsp/CMakeLists.txt (100%)
 rename {pki/base => base}/ocsp/LICENSE (100%)
 rename {pki/base => base}/ocsp/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/ocsp/setup/registry_instance (100%)
 rename {pki/base => base}/ocsp/shared/conf/CMakeLists.txt (100%)
 rename {pki/base => base}/ocsp/shared/conf/CS.cfg.in (100%)
 rename {pki/base => base}/ocsp/shared/conf/acl.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/catalina.policy (100%)
 rename {pki/base => base}/ocsp/shared/conf/catalina.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/context.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/database.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/db.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/index.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/jk2.manifest (100%)
 rename {pki/base => base}/ocsp/shared/conf/jk2.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/jkconf.ant.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/jkconfig.manifest (100%)
 rename {pki/base => base}/ocsp/shared/conf/logging.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/manager.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/schema.ldif (100%)
 rename {pki/base => base}/ocsp/shared/conf/server-minimal.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/server.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/serverCertNick.conf (100%)
 rename {pki/base => base}/ocsp/shared/conf/shm.manifest (100%)
 rename {pki/base => base}/ocsp/shared/conf/tomcat-jk2.manifest (100%)
 rename {pki/base => base}/ocsp/shared/conf/tomcat-users.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/tomcat6.conf (100%)
 rename {pki/base => base}/ocsp/shared/conf/uriworkermap.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/web.xml (100%)
 rename {pki/base => base}/ocsp/shared/conf/workers.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/workers.properties.minimal (100%)
 rename {pki/base => base}/ocsp/shared/conf/workers2.properties (100%)
 rename {pki/base => base}/ocsp/shared/conf/workers2.properties.minimal (100%)
 rename {pki/base => base}/ocsp/shared/etc/init.d/pki-ocspd (100%)
 rename {pki/base => base}/ocsp/shared/lib/systemd/system/pki-ocspd.target (100%)
 rename {pki/base => base}/ocsp/shared/lib/systemd/system/pki-ocspd@.service (100%)
 rename {pki/base => base}/ocsp/shared/webapps/ROOT/WEB-INF/web.xml (100%)
 rename {pki/base => base}/ocsp/shared/webapps/ROOT/index.jsp (100%)
 rename {pki/base => base}/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties (100%)
 rename {pki/base => base}/ocsp/shared/webapps/ocsp/WEB-INF/web.xml (100%)
 rename {pki/base => base}/ocsp/src/CMakeLists.txt (100%)
 rename {pki/base => base}/ocsp/src/com/netscape/ocsp/EOCSPException.java (100%)
 rename {pki/base => base}/ocsp/src/com/netscape/ocsp/OCSPAuthority.java (100%)
 rename {pki/base => base}/ocsp/src/com/netscape/ocsp/OCSPResources.java (100%)
 rename {pki/base => base}/ocsp/src/com/netscape/ocsp/SigningUnit.java (100%)
 rename {pki/base => base}/ra/CMakeLists.txt (100%)
 rename {pki/base => base}/ra/LICENSE (100%)
 rename {pki/base => base}/ra/apache/conf/httpd.conf (100%)
 rename {pki/base => base}/ra/apache/conf/magic (100%)
 rename {pki/base => base}/ra/apache/conf/mime.types (100%)
 rename {pki/base => base}/ra/apache/conf/nss.conf (100%)
 rename {pki/base => base}/ra/apache/conf/perl.conf (100%)
 rename {pki/base => base}/ra/doc/CMakeLists.txt (100%)
 rename {pki/base => base}/ra/doc/CS.cfg.in (100%)
 rename {pki/base => base}/ra/emails/mail_approve_request.vm (100%)
 rename {pki/base => base}/ra/emails/mail_create_request.vm (100%)
 rename {pki/base => base}/ra/etc/init.d/pki-rad (100%)
 rename {pki/base => base}/ra/forms/admin/group/add.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/add_member.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/add_new.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/delete.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/delete_member.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/index.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/group/read.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/index.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/user/add.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/user/add_new.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/user/delete.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/user/index.cgi (100%)
 rename {pki/base => base}/ra/forms/admin/user/read.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/cert/index.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/cert/read.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/cert/revoke.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/cert/submit.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/error.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/index.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/request/add_note.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/request/index.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/request/op.cgi (100%)
 rename {pki/base => base}/ra/forms/agent/request/read.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/agent/enroll.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/agent/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/agent/new.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/agent/start.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/agent/submit.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/error.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/request/getcert.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/request/importcert.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/request/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/request/status.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/enroll.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/installer.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/manager.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/pkiclient.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/scep/submit.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/server/admin.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/server/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/server/submit.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/user/index.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/user/renew.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/user/renewal.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/user/submit.cgi (100%)
 rename {pki/base => base}/ra/forms/ee/user/user.cgi (100%)
 rename {pki/base => base}/ra/forms/index.cgi (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/CertStore.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/Conf.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/PinStore.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/Registry.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/TimeTool.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/UserStore.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Base/Util.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Conn/CA.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/AdminAuthPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/AdminPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/AgentAuthPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/BasePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/CAInfoPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/CertInfo.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/CertRequestPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/Common.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/Config.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/DRMInfoPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/DatabasePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/DonePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/GlobalVar.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/Login.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/LoginPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/ModulePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/Modutil.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/NamePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/ReqCertInfo.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/SizePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/TKSInfoPanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/WelcomePanel.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/RA/wizard.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Request/Queue.pm (100%)
 rename {pki/base => base}/ra/lib/perl/PKI/Service/Op.pm (100%)
 rename {pki/base => base}/ra/lib/perl/Template/Velocity.pm (100%)
 rename {pki/base => base}/ra/scripts/nss_pcache (100%)
 rename {pki/base => base}/ra/scripts/schema.sql (100%)
 rename {pki/base => base}/ra/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/ra/setup/registry_instance (100%)
 rename {pki/base => base}/scripts/enable_cvs_keywords_in_svn (100%)
 rename {pki/base => base}/scripts/pkicheck (100%)
 rename {pki/base => base}/scripts/pkimanifest (100%)
 rename {pki/base => base}/selinux/CMakeLists.txt (100%)
 rename {pki/base => base}/selinux/LICENSE (100%)
 rename {pki/base => base}/selinux/src/CMakeLists.txt (100%)
 rename {pki/base => base}/selinux/src/Makefile (100%)
 rename {pki/base => base}/selinux/src/pki.fc (100%)
 rename {pki/base => base}/selinux/src/pki.if (100%)
 rename {pki/base => base}/selinux/src/pki.sh (100%)
 rename {pki/base => base}/selinux/src/pki.te (100%)
 rename {pki/base => base}/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/setup/LICENSE (100%)
 rename {pki/base => base}/setup/pki-setup-proxy (100%)
 rename {pki/base => base}/setup/pkicommon.pm (100%)
 rename {pki/base => base}/setup/pkicreate (100%)
 rename {pki/base => base}/setup/pkiremove (100%)
 rename {pki/base => base}/setup/scripts/functions (100%)
 rename {pki/base => base}/setup/scripts/pki_apache_initscript (100%)
 rename {pki/base => base}/setup/scripts/pkicontrol (100%)
 rename {pki/base => base}/silent/CMakeLists.txt (100%)
 rename {pki/base => base}/silent/LICENSE (100%)
 rename {pki/base => base}/silent/scripts/CMakeLists.txt (100%)
 rename {pki/base => base}/silent/scripts/pkisilent (100%)
 rename {pki/base => base}/silent/src/CMakeLists.txt (100%)
 rename {pki/base => base}/silent/src/argparser/ArgParseException.java (100%)
 rename {pki/base => base}/silent/src/argparser/ArgParser.java (100%)
 rename {pki/base => base}/silent/src/argparser/ArgParserTest.java (100%)
 rename {pki/base => base}/silent/src/argparser/BooleanHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/CharHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/DoubleHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/FloatHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/IntHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/LongHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/ObjectHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/SimpleExample.java (100%)
 rename {pki/base => base}/silent/src/argparser/StringHolder.java (100%)
 rename {pki/base => base}/silent/src/argparser/StringScanException.java (100%)
 rename {pki/base => base}/silent/src/argparser/StringScanner.java (100%)
 rename {pki/base => base}/silent/src/ca/ConfigureCA.java (100%)
 rename {pki/base => base}/silent/src/ca/DirEnroll.java (100%)
 rename {pki/base => base}/silent/src/ca/Request.java (100%)
 rename {pki/base => base}/silent/src/ca/UserEnroll.java (100%)
 rename {pki/base => base}/silent/src/ca/checkRequest.java (100%)
 rename {pki/base => base}/silent/src/common/AutoInstaller.java (100%)
 rename {pki/base => base}/silent/src/common/BaseState.java (100%)
 rename {pki/base => base}/silent/src/common/CMSConfig.java (100%)
 rename {pki/base => base}/silent/src/common/CMSInstance.java (100%)
 rename {pki/base => base}/silent/src/common/CMSLDAP.java (100%)
 rename {pki/base => base}/silent/src/common/CMSProperties.java (100%)
 rename {pki/base => base}/silent/src/common/CMSTask.java (100%)
 rename {pki/base => base}/silent/src/common/Certificate_Record.java (100%)
 rename {pki/base => base}/silent/src/common/ComCrypto.java (100%)
 rename {pki/base => base}/silent/src/common/Con2Agent.java (100%)
 rename {pki/base => base}/silent/src/common/ParseXML.java (100%)
 rename {pki/base => base}/silent/src/common/PostQuery.java (100%)
 rename {pki/base => base}/silent/src/common/ServerInfo.java (100%)
 rename {pki/base => base}/silent/src/common/TestClient.java (100%)
 rename {pki/base => base}/silent/src/common/Utilities.java (100%)
 rename {pki/base => base}/silent/src/common/createinstance.java (100%)
 rename {pki/base => base}/silent/src/drm/ConfigureDRM.java (100%)
 rename {pki/base => base}/silent/src/http/CertSelection.java (100%)
 rename {pki/base => base}/silent/src/http/HTMLDocument.java (100%)
 rename {pki/base => base}/silent/src/http/HTTPClient.java (100%)
 rename {pki/base => base}/silent/src/http/HTTPResponse.java (100%)
 rename {pki/base => base}/silent/src/ocsp/ConfigureOCSP.java (100%)
 rename {pki/base => base}/silent/src/ra/ConfigureRA.java (100%)
 rename {pki/base => base}/silent/src/subca/ConfigureSubCA.java (100%)
 rename {pki/base => base}/silent/src/tks/ConfigureTKS.java (100%)
 rename {pki/base => base}/silent/src/tps/ConfigureTPS.java (100%)
 rename {pki/base => base}/silent/templates/pki_silent.template (100%)
 rename {pki/base => base}/silent/templates/subca_silent.template (100%)
 rename {pki/base => base}/symkey/CMakeLists.txt (100%)
 rename {pki/base => base}/symkey/LICENSE (100%)
 rename {pki/base => base}/symkey/src/CMakeLists.txt (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/Base.h (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/Buffer.cpp (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/Buffer.h (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/CMakeLists.txt (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/EncryptData.cpp (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/SessionKey.cpp (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/SessionKey.java (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/SymKey.cpp (100%)
 rename {pki/base => base}/symkey/src/com/netscape/symkey/SymKey.h (100%)
 rename {pki/base => base}/tks/CMakeLists.txt (100%)
 rename {pki/base => base}/tks/LICENSE (100%)
 rename {pki/base => base}/tks/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/tks/setup/registry_instance (100%)
 rename {pki/base => base}/tks/shared/conf/CMakeLists.txt (100%)
 rename {pki/base => base}/tks/shared/conf/CS.cfg.in (100%)
 rename {pki/base => base}/tks/shared/conf/acl.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/catalina.policy (100%)
 rename {pki/base => base}/tks/shared/conf/catalina.properties (100%)
 rename {pki/base => base}/tks/shared/conf/context.xml (100%)
 rename {pki/base => base}/tks/shared/conf/database.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/db.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/index.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/jk2.manifest (100%)
 rename {pki/base => base}/tks/shared/conf/jk2.properties (100%)
 rename {pki/base => base}/tks/shared/conf/jkconf.ant.xml (100%)
 rename {pki/base => base}/tks/shared/conf/jkconfig.manifest (100%)
 rename {pki/base => base}/tks/shared/conf/logging.properties (100%)
 rename {pki/base => base}/tks/shared/conf/manager.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/schema.ldif (100%)
 rename {pki/base => base}/tks/shared/conf/server-minimal.xml (100%)
 rename {pki/base => base}/tks/shared/conf/server.xml (100%)
 rename {pki/base => base}/tks/shared/conf/serverCertNick.conf (100%)
 rename {pki/base => base}/tks/shared/conf/shm.manifest (100%)
 rename {pki/base => base}/tks/shared/conf/tomcat-jk2.manifest (100%)
 rename {pki/base => base}/tks/shared/conf/tomcat-users.xml (100%)
 rename {pki/base => base}/tks/shared/conf/tomcat6.conf (100%)
 rename {pki/base => base}/tks/shared/conf/uriworkermap.properties (100%)
 rename {pki/base => base}/tks/shared/conf/web.xml (100%)
 rename {pki/base => base}/tks/shared/conf/workers.properties (100%)
 rename {pki/base => base}/tks/shared/conf/workers.properties.minimal (100%)
 rename {pki/base => base}/tks/shared/conf/workers2.properties (100%)
 rename {pki/base => base}/tks/shared/conf/workers2.properties.minimal (100%)
 rename {pki/base => base}/tks/shared/etc/init.d/pki-tksd (100%)
 rename {pki/base => base}/tks/shared/lib/systemd/system/pki-tksd.target (100%)
 rename {pki/base => base}/tks/shared/lib/systemd/system/pki-tksd@.service (100%)
 rename {pki/base => base}/tks/shared/webapps/ROOT/WEB-INF/web.xml (100%)
 rename {pki/base => base}/tks/shared/webapps/ROOT/index.jsp (100%)
 rename {pki/base => base}/tks/shared/webapps/tks/WEB-INF/velocity.properties (100%)
 rename {pki/base => base}/tks/shared/webapps/tks/WEB-INF/web.xml (100%)
 rename {pki/base => base}/tks/src/CMakeLists.txt (100%)
 rename {pki/base => base}/tks/src/com/netscape/tks/TKSAuthority.java (100%)
 rename {pki/base => base}/tps/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/LICENSE (100%)
 rename {pki/base => base}/tps/apache/LICENSE-2.0 (100%)
 rename {pki/base => base}/tps/apache/conf/httpd.conf (100%)
 rename {pki/base => base}/tps/apache/conf/magic (100%)
 rename {pki/base => base}/tps/apache/conf/mime.types (100%)
 rename {pki/base => base}/tps/apache/conf/nss.conf (100%)
 rename {pki/base => base}/tps/apache/conf/perl.conf (100%)
 rename {pki/base => base}/tps/apache/pki_instance_command_wrapper (100%)
 rename {pki/base => base}/tps/apache/pki_subsystem_command_wrapper (100%)
 rename {pki/base => base}/tps/apache/readme.html (100%)
 rename {pki/base => base}/tps/applets/1.2.4122DFB4.ijc (100%)
 rename {pki/base => base}/tps/applets/1.2.416DA155.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.42260AFA.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.4255CC01.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.42659461.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.427BDDB8.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.44724DDE.ijc (100%)
 rename {pki/base => base}/tps/applets/1.3.45787308.ijc (100%)
 rename {pki/base => base}/tps/applets/1.4.499dc06c.ijc (100%)
 rename {pki/base => base}/tps/applets/1.4.4d40a449.ijc (100%)
 rename {pki/base => base}/tps/applets/3FD00877.ijc (100%)
 rename {pki/base => base}/tps/applets/4003196C.ijc (100%)
 rename {pki/base => base}/tps/applets/402428AD.ijc (100%)
 rename {pki/base => base}/tps/applets/404E4697.ijc (100%)
 rename {pki/base => base}/tps/applets/4122DFB4.ijc (100%)
 rename {pki/base => base}/tps/applets/listappletdates (100%)
 rename {pki/base => base}/tps/applets/readme.txt (100%)
 rename {pki/base => base}/tps/doc/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/doc/CS.cfg.in (100%)
 rename {pki/base => base}/tps/etc/init.d/pki-tpsd (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/demo/enroll.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/demo/index.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/home/cachain.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/home/enroll.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/home/index.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/so/enroll.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/so/index.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/ajax-list.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/cfg.pl (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/enroll.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/format.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/formatso.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/index.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/is_agent.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/is_user.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/main.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/noaccess.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/read.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/read_temp.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/search.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/search_temp.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/seturl.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/cgi-bin/sow/welcome.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/esc.cgi (100%)
 rename {pki/base => base}/tps/forms/esc/home.cgi (100%)
 rename {pki/base => base}/tps/forms/index.cgi (100%)
 rename {pki/base => base}/tps/forms/index.html (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/Base/Conf.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/Base/Registry.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/Service/Op.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/AdminPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/AuthDBPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/BasePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/CAInfoPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/CertInfo.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/CertRequestPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/Common.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/Config.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/DatabasePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/DonePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/GlobalVar.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/Login.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/LoginPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/ModulePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/Modutil.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/NamePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/ReqCertInfo.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/SizePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/WelcomePanel.pm (100%)
 rename {pki/base => base}/tps/lib/perl/PKI/TPS/wizard.pm (100%)
 rename {pki/base => base}/tps/lib/perl/Template/Velocity.pm (100%)
 rename {pki/base => base}/tps/scripts/addAgents.ldif (100%)
 rename {pki/base => base}/tps/scripts/addIndexes.ldif (100%)
 rename {pki/base => base}/tps/scripts/addTokens.ldif (100%)
 rename {pki/base => base}/tps/scripts/addVLVIndexes.ldif (100%)
 rename {pki/base => base}/tps/scripts/database.ldif (100%)
 rename {pki/base => base}/tps/scripts/nss_pcache (100%)
 rename {pki/base => base}/tps/scripts/schemaMods.ldif (100%)
 rename {pki/base => base}/tps/scripts/vlvtasks.ldif (100%)
 rename {pki/base => base}/tps/setup/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/setup/create.pl (100%)
 rename {pki/base => base}/tps/setup/registry_instance (100%)
 rename {pki/base => base}/tps/src/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/apdu/APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/APDU_Response.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Create_Object_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Create_Pin_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Delete_File_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/External_Authenticate_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Format_Muscle_Applet_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Generate_Key_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Get_Data_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Get_IssuerInfo_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Get_Status_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Get_Version_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Import_Key_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Import_Key_Enc_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Initialize_Update_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Install_Applet_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Install_Load_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Lifecycle_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/List_Objects_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/List_Pins_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Load_File_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Put_Key_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Read_Buffer_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Read_Object_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Select_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Set_IssuerInfo_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Set_Pin_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Unblock_Pin_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/apdu/Write_Object_APDU.cpp (100%)
 rename {pki/base => base}/tps/src/authentication/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/authentication/LDAP_Authentication.cpp (100%)
 rename {pki/base => base}/tps/src/channel/Channel.cpp (100%)
 rename {pki/base => base}/tps/src/channel/Secure_Channel.cpp (100%)
 rename {pki/base => base}/tps/src/cms/CertEnroll.cpp (100%)
 rename {pki/base => base}/tps/src/cms/ConnectionInfo.cpp (100%)
 rename {pki/base => base}/tps/src/cms/HttpConnection.cpp (100%)
 rename {pki/base => base}/tps/src/engine/RA.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/Cache.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/engine.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/http.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/httpClient.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/nscperror.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/request.cpp (100%)
 rename {pki/base => base}/tps/src/httpClient/response.cpp (100%)
 rename {pki/base => base}/tps/src/include/apdu/APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/APDU_Response.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Create_Object_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Create_Pin_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Delete_File_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/External_Authenticate_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Format_Muscle_Applet_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Generate_Key_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Get_Data_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Get_IssuerInfo_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Get_Status_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Get_Version_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Import_Key_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Import_Key_Enc_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Initialize_Update_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Install_Applet_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Install_Load_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Lifecycle_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/List_Objects_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/List_Pins_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Load_File_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Put_Key_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Read_Buffer_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Read_Object_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Select_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Set_IssuerInfo_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Set_Pin_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Unblock_Pin_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/apdu/Write_Object_APDU.h (100%)
 rename {pki/base => base}/tps/src/include/authentication/AuthParams.h (100%)
 rename {pki/base => base}/tps/src/include/authentication/Authentication.h (100%)
 rename {pki/base => base}/tps/src/include/authentication/LDAP_Authentication.h (100%)
 rename {pki/base => base}/tps/src/include/channel/Channel.h (100%)
 rename {pki/base => base}/tps/src/include/channel/Secure_Channel.h (100%)
 rename {pki/base => base}/tps/src/include/cms/CertEnroll.h (100%)
 rename {pki/base => base}/tps/src/include/cms/ConnectionInfo.h (100%)
 rename {pki/base => base}/tps/src/include/cms/HttpConnection.h (100%)
 rename {pki/base => base}/tps/src/include/engine/RA.h (100%)
 rename {pki/base => base}/tps/src/include/engine/audit.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/AccessLogger.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Auth.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ByteBuffer.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/CERTUtil.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Cache.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Connection.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ConnectionListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/DebugLogger.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Defines.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ErrorLogger.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Iterator.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/LogRotationTask.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Logger.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/NSPRerrs.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSBuddy.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSBuddyCache.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSBuddyList.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSBuddyListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSBuddyService.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSCertExtension.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSCommonLib.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSConfig.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSConfigManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSConfigReader.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSCrypt.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSDataSourceListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSDataSourceManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSGroup.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSGroupCache.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSHelper.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSPRUtil.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSPlugin.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSPluginManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServer.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServerLib.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServerListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServerManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServiceListener.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSServiceManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSUser.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PSWaspLib.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Pool.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PresenceManager.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PresenceServer.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/PresenceServerImpl.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SECerrs.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SSLServerSocket.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SSLSocket.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SSLerrs.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ScheduledTask.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Scheduler.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SecurityHeaders.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ServerConnection.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ServerSocket.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/Socket.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SocketINC.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/SocketLib.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/StringList.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/StringUtil.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/TaskList.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/ThreadPool.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/URLUtil.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/engine.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/http.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/request.h (100%)
 rename {pki/base => base}/tps/src/include/httpClient/httpc/response.h (100%)
 rename {pki/base => base}/tps/src/include/main/AttributeSpec.h (100%)
 rename {pki/base => base}/tps/src/include/main/AuthenticationEntry.h (100%)
 rename {pki/base => base}/tps/src/include/main/Base.h (100%)
 rename {pki/base => base}/tps/src/include/main/Buffer.h (100%)
 rename {pki/base => base}/tps/src/include/main/ConfigStore.h (100%)
 rename {pki/base => base}/tps/src/include/main/LogFile.h (100%)
 rename {pki/base => base}/tps/src/include/main/Login.h (100%)
 rename {pki/base => base}/tps/src/include/main/Memory.h (100%)
 rename {pki/base => base}/tps/src/include/main/MemoryMgr.h (100%)
 rename {pki/base => base}/tps/src/include/main/NameValueSet.h (100%)
 rename {pki/base => base}/tps/src/include/main/ObjectSpec.h (100%)
 rename {pki/base => base}/tps/src/include/main/PKCS11Obj.h (100%)
 rename {pki/base => base}/tps/src/include/main/PublishEntry.h (100%)
 rename {pki/base => base}/tps/src/include/main/RA_Context.h (100%)
 rename {pki/base => base}/tps/src/include/main/RA_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/main/RA_Session.h (100%)
 rename {pki/base => base}/tps/src/include/main/RA_pblock.h (100%)
 rename {pki/base => base}/tps/src/include/main/RollingLogFile.h (100%)
 rename {pki/base => base}/tps/src/include/main/SecureId.h (100%)
 rename {pki/base => base}/tps/src/include/main/Util.h (100%)
 rename {pki/base => base}/tps/src/include/modules/tps/AP_Context.h (100%)
 rename {pki/base => base}/tps/src/include/modules/tps/AP_Session.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_ASQ_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_ASQ_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Begin_Op_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_End_Op_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Extended_Login_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Extended_Login_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Login_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Login_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_New_Pin_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_New_Pin_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_SecureId_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_SecureId_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Status_Update_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Status_Update_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Token_PDU_Request_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/msg/RA_Token_PDU_Response_Msg.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Enroll_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Format_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Pin_Reset_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Renew_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/processor/RA_Unblock_Processor.h (100%)
 rename {pki/base => base}/tps/src/include/publisher/IConnector.h (100%)
 rename {pki/base => base}/tps/src/include/publisher/IPublish_Data.h (100%)
 rename {pki/base => base}/tps/src/include/publisher/IPublisher.h (100%)
 rename {pki/base => base}/tps/src/include/publisher/NetkeyPublisher.h (100%)
 rename {pki/base => base}/tps/src/include/selftests/SelfTest.h (100%)
 rename {pki/base => base}/tps/src/include/selftests/TPSPresence.h (100%)
 rename {pki/base => base}/tps/src/include/selftests/TPSSystemCertsVerification.h (100%)
 rename {pki/base => base}/tps/src/include/selftests/TPSValidity.h (100%)
 rename {pki/base => base}/tps/src/include/service/NK_Context.h (100%)
 rename {pki/base => base}/tps/src/include/service/NK_Session.h (100%)
 rename {pki/base => base}/tps/src/include/tus/tus_db.h (100%)
 rename {pki/base => base}/tps/src/main/AttributeSpec.cpp (100%)
 rename {pki/base => base}/tps/src/main/AuthParams.cpp (100%)
 rename {pki/base => base}/tps/src/main/Authentication.cpp (100%)
 rename {pki/base => base}/tps/src/main/AuthenticationEntry.cpp (100%)
 rename {pki/base => base}/tps/src/main/Buffer.cpp (100%)
 rename {pki/base => base}/tps/src/main/ConfigStore.cpp (100%)
 rename {pki/base => base}/tps/src/main/LogFile.cpp (100%)
 rename {pki/base => base}/tps/src/main/Login.cpp (100%)
 rename {pki/base => base}/tps/src/main/Memory.cpp (100%)
 rename {pki/base => base}/tps/src/main/NameValueSet.cpp (100%)
 rename {pki/base => base}/tps/src/main/ObjectSpec.cpp (100%)
 rename {pki/base => base}/tps/src/main/PKCS11Obj.cpp (100%)
 rename {pki/base => base}/tps/src/main/RA_Context.cpp (100%)
 rename {pki/base => base}/tps/src/main/RA_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/main/RA_Session.cpp (100%)
 rename {pki/base => base}/tps/src/main/RA_pblock.cpp (100%)
 rename {pki/base => base}/tps/src/main/RollingLogFile.cpp (100%)
 rename {pki/base => base}/tps/src/main/SecureId.cpp (100%)
 rename {pki/base => base}/tps/src/main/Util.cpp (100%)
 rename {pki/base => base}/tps/src/modules/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/modules/tokendb/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/modules/tokendb/mod_tokendb.cpp (100%)
 rename {pki/base => base}/tps/src/modules/tps/AP_Context.cpp (100%)
 rename {pki/base => base}/tps/src/modules/tps/AP_Session.cpp (100%)
 rename {pki/base => base}/tps/src/modules/tps/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/modules/tps/mod_tps.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_ASQ_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_ASQ_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Begin_Op_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_End_Op_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Extended_Login_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Extended_Login_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Login_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Login_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_New_Pin_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_New_Pin_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_SecureId_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_SecureId_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Status_Update_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Status_Update_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Token_PDU_Request_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/msg/RA_Token_PDU_Response_Msg.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Enroll_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Format_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Pin_Reset_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Renew_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/processor/RA_Unblock_Processor.cpp (100%)
 rename {pki/base => base}/tps/src/selftests/SelfTest.cpp (100%)
 rename {pki/base => base}/tps/src/selftests/TPSPresence.cpp (100%)
 rename {pki/base => base}/tps/src/selftests/TPSSystemCertsVerification.cpp (100%)
 rename {pki/base => base}/tps/src/selftests/TPSValidity.cpp (100%)
 rename {pki/base => base}/tps/src/test/Test_ConfigStore.cfg (100%)
 rename {pki/base => base}/tps/src/test/Test_ConfigStore.cpp (100%)
 rename {pki/base => base}/tps/src/tus/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/src/tus/tus_db.c (100%)
 rename {pki/base => base}/tps/stubs/modules/nss/mod_nss_stub.c (100%)
 rename {pki/base => base}/tps/tools/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/tools/raclient/CMakeLists.txt (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Client.cpp (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Client.h (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Conn.cpp (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Conn.h (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Token.cpp (100%)
 rename {pki/base => base}/tps/tools/raclient/RA_Token.h (100%)
 rename {pki/base => base}/tps/tools/raclient/enroll.tps (100%)
 rename {pki/base => base}/tps/tools/raclient/enroll1.test (100%)
 rename {pki/base => base}/tps/tools/raclient/format.tps (100%)
 rename {pki/base => base}/tps/tools/raclient/nt_enroll.test (100%)
 rename {pki/base => base}/tps/tools/raclient/readme.txt (100%)
 rename {pki/base => base}/tps/tools/raclient/reset_pin.tps (100%)
 rename {pki/base => base}/tps/tools/raclient/reset_pin1.test (100%)
 rename {pki/base => base}/tps/tools/raclient/reset_pin2.test (100%)
 rename {pki/base => base}/tps/tools/tus/add.c (100%)
 rename {pki/base => base}/tps/tools/tus/test.c (100%)
 rename {pki/base => base}/tps/ui/perl/Velocity.pm (100%)
 rename {pki/base => base}/tps/wrappers/tpsclient.in (100%)
 rename {pki/base => base}/util/CMakeLists.txt (100%)
 rename {pki/base => base}/util/LICENSE (100%)
 rename {pki/base => base}/util/src/CMakeLists.txt (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/crypto/Module.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/crypto/Token.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/ConnectAsync.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/Http.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpClient.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpEofException.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpMessage.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpProtocolException.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpRequest.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/HttpResponse.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/net/ISocketFactory.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/CertID.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/CertStatus.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/NameID.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/Request.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/ResponderID.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/Response.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/ResponseData.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/Signature.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/IPasswordReader.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/IPasswordStore.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/IPasswordWriter.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AccessAccept.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AccessChallenge.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AccessReject.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AccessRequest.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/Attribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AttributeFactory.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/AttributeSet.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/Authenticator.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ChallengeException.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/GenericAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASPacket.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/Packet.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/PacketFactory.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/RadiusConn.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/RejectException.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ServerPacket.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/StateAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/util/Cert.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/util/Fmt.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/util/HMACDigest.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/util/Utils.java (100%)
 rename {pki/base => base}/util/src/com/netscape/cmsutil/xml/XMLObject.java (100%)
 rename {pki/base => base}/util/src/netscape/net/NetworkClient.java (100%)
 rename {pki/base => base}/util/src/netscape/net/TransferProtocolClient.java (100%)
 rename {pki/base => base}/util/src/netscape/net/smtp/SmtpClient.java (100%)
 rename {pki/base => base}/util/src/netscape/net/smtp/SmtpProtocolException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/AclEntryImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/AclImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/AllPermissionsImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/GroupImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/OwnerImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/PermissionImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/PrincipalImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/acl/WorldGroupImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/AccessDescription.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/AuthInfoAccessExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/CertInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/CertificateScopeEntry.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/GenericASN1Extension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/KerberosName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/NSCertTypeExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/OCSPNoCheckExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/PresenceServerExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/ContentInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/EncodingException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS10.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS10Attribute.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS10Attributes.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS7.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS8Key.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS9Attribute.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/PKCS9Attributes.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/ParsingException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/pkcs/SignerInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/CMS.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSA.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAKeyFactory.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAKeyPairGenerator.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAParameterGenerator.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAParameters.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAPrivateKey.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/DSAPublicKey.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/MD5.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/RSAPublicKey.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/SHA.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/Sun.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/SystemIdentity.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/SystemSigner.java (100%)
 rename {pki/base => base}/util/src/netscape/security/provider/X509CertificateFactory.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ASN1CharStrConvMap.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ArraySet.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/BigInt.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/BitArray.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteArrayLexOrder.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteArrayTagOrder.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteToCharIA5String.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteToCharPrintable.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteToCharUnicode.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ByteToCharUniversalString.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/CertPrettyPrint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/CharToByteIA5String.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/CharToBytePrintable.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/CharToByteUniversalString.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/CrlPrettyPrint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/DerEncoder.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/DerInputBuffer.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/DerInputStream.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/DerOutputStream.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/DerValue.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ExtPrettyPrint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/ObjectIdentifier.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/PrettyPrintFormat.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/PrettyPrintResources.java (100%)
 rename {pki/base => base}/util/src/netscape/security/util/PubKeyPrettyPrint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/ACertAttrSet.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AVA.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AVAValueConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AlgIdDSA.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AlgorithmId.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/Attribute.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AttributeNameEnumeration.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/BasicConstraintsExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CPSuri.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CRLDistributionPoint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CRLDistributionPointsExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CRLExtensions.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CRLNumberExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CRLReasonExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertAndKeyGen.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertAttrSet.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertParseError.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateAlgorithmId.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateChain.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateExtensions.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateIssuerExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateIssuerName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificatePoliciesExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificatePolicyId.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificatePolicyInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificatePolicyMap.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificatePolicySet.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateSerialNumber.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateSubjectName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateValidity.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateVersion.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/CertificateX509Key.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/DNSName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/DirStrConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/DisplayText.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/EDIPartyName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/Extension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/Extensions.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/FreshestCRLExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralNameInterface.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralNames.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralNamesException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralSubtree.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GeneralSubtrees.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/GenericValueConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/HoldInstructionExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/IA5StringConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/IPAddressName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/InvalidIPAddressException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/InvalidityDateExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/IssuingDistributionPoint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/IssuingDistributionPointExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/KeyIdentifier.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/KeyUsageExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/LdapDNStrConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/LdapV3DNStrConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/NSCCommentExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/NameConstraintsExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/NoticeReference.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/OIDMap.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/OIDName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/OtherName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PKIXExtensions.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PolicyConstraint.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PolicyConstraintsExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PolicyMappingsExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PolicyQualifierInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PolicyQualifiers.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PrintableConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/PrivateKeyUsageExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/Qualifier.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RDN.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RFC1779StrConverter.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RFC822Name.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/ReasonFlags.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RevocationReason.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RevokedCertImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/RevokedCertificate.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/SerialNumber.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/SubjectDirAttributesExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/URIName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/UniqueIdentity.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/UserNotice.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X500Name.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X500NameAttrMap.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X500Signer.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509AttributeName.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509CRLImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509Cert.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509CertImpl.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509CertInfo.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509ExtensionException.java (100%)
 rename {pki/base => base}/util/src/netscape/security/x509/X509Key.java (100%)
 rename {pki/cmake => cmake}/Modules/CMakeDetermineJavaCompiler.cmake (100%)
 rename {pki/cmake => cmake}/Modules/CMakeJavaCompiler.cmake.in (100%)
 rename {pki/cmake => cmake}/Modules/CMakeJavaInformation.cmake (100%)
 rename {pki/cmake => cmake}/Modules/CMakeTestJavaCompiler.cmake (100%)
 rename {pki/cmake => cmake}/Modules/COPYING-CMAKE-SCRIPTS (100%)
 rename {pki/cmake => cmake}/Modules/DefineCMakeDefaults.cmake (100%)
 rename {pki/cmake => cmake}/Modules/DefineCompilerFlags.cmake (100%)
 rename {pki/cmake => cmake}/Modules/DefineInstallationPaths.cmake (100%)
 rename {pki/cmake => cmake}/Modules/DefinePlatformDefaults.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindAPR.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindJNI.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindJava.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindLdap.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindMozLDAP.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindNSPR.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindNSS.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindOpenSSL.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindSvrcore.cmake (100%)
 rename {pki/cmake => cmake}/Modules/FindZLIB.cmake (100%)
 rename {pki/cmake => cmake}/Modules/MacroCheckCCompilerFlagSSP.cmake (100%)
 rename {pki/cmake => cmake}/Modules/MacroCopyFile.cmake (100%)
 rename {pki/cmake => cmake}/Modules/MacroEnsureOutOfSourceBuild.cmake (100%)
 rename {pki/cmake => cmake}/Modules/UseJava.cmake (100%)
 rename {pki/cmake => cmake}/Modules/UseJavaClassFilelist.cmake (100%)
 rename {pki/cmake => cmake}/Modules/UseJavaSymlinks.cmake (100%)
 rename pki/cmake_uninstall.cmake.in => cmake_uninstall.cmake.in (100%)
 rename pki/config.h.cmake => config.h.cmake (100%)
 rename {pki/dogtag => dogtag}/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/ca-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/ca-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/404.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/500.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/admin/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenPending.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenRejected.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenSvcPending.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/blank.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/error.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameDir.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameList.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/frameStats.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/getStats.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuDir.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuList.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/menuStats.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/monitor.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/monitor.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/processReq.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/queryCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/queryCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/queryReq.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/srchCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/top.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ca/updateDir.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/funcs.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/header.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/index.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/ports.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/agent/xenroll.dll (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenPending.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenRejected.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenSvcPending.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/bench2k.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/queryCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/queryCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/srchCert.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/srchCert.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/tabs.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/delete.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/error.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/folder.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/ee/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/index.html (100%)
 rename {pki/dogtag => dogtag}/ca-ui/shared/webapps/ca/services.template (100%)
 rename {pki/dogtag => dogtag}/common-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/common-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/common-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/common-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/common-ui/dogtag-pki-common-ui.spec (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/adminauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/adminpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/agentauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/backupkeycertpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/certchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/certprettyprintpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/certrequestpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_addhsm.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_clone.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_db.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_hsm.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_hsmloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_join.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/config_rootca.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/createsubsystempanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/databasepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/displaycertchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/donepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/footer.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/header.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/hierarchypanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/importadmincertpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/importcachainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/login.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/modulepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/namepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/restorekeycertpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/savepkcs12panel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/securitydomainloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/securitydomainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/sidemenu.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/sizepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/topmenu.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/welcomepanel.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/wizard.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/config/xml.vm (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/badge.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/bigrotation2.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/certificate.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/clearpixel.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/icon-software.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/icon_crit_update.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/id.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/idkey.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/key.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/lock.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/no-certificate.png (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/rootca.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/img/sub.gif (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/admin/console/js/misc.js (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/css/pki-360.css (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/css/pki-base.css (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/css/pki.css (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/img/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/common-ui/shared/img/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/console-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/console-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/console-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/console-ui/dogtag-pki-console-ui.spec (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/CMSAdminRS.properties (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/management/client/theme/images/login.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/management/client/theme/images/logo16.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/management/client/theme/images/logo32.gif (100%)
 rename {pki/dogtag => dogtag}/console-ui/src/com/netscape/management/client/theme/theme.properties (100%)
 rename {pki/dogtag => dogtag}/kra-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/kra-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/kra-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/kra-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/kra-ui/dogtag-pki-kra-ui.spec (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/404.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/500.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenError.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenPending.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenRejected.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenSuccess.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenSvcPending.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/funcs.js (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/header.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/index.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/index.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/blank.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/frameStats.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/getStats.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/index.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/menuStats.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/monitor.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/processReq.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/queryKey.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/queryReq.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/srchKey.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/agent/kra/top.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/index.html (100%)
 rename {pki/dogtag => dogtag}/kra-ui/shared/webapps/kra/services.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/dogtag-pki-ocsp-ui.spec (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/404.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/500.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenError.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/funcs.js (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/header.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/index.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/index.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/agent/ports.template (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/index.html (100%)
 rename {pki/dogtag => dogtag}/ocsp-ui/shared/webapps/ocsp/services.template (100%)
 rename {pki/dogtag => dogtag}/ra-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/ra-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/ra-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/ra-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/ra-ui/dogtag-pki-ra-ui.spec (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/404.html (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/500.html (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/group/add_new.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/group/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/group/read.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/user/add_new.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/user/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/admin/user/read.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/cert/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/cert/read.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/cert/revoke.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/cert/submit.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/error.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/request/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/request/op.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/agent/request/read.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/css/pki-360.css (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/css/pki-base.css (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/css/pki.css (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/agent/enroll.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/agent/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/agent/new.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/agent/start.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/agent/submit.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/error.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/request/getcert.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/request/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/request/status.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/scep/enroll.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/scep/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/scep/installer.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/scep/manager.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/scep/submit.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/server/admin.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/server/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/server/submit.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/user/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/user/renew.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/user/renewal.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/user/submit.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ee/user/user.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/footer.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/header.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/images/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/images/pki-icon-help.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/images/pki-icon-home.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/images/pki-icon-software.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/index.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/footer.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/header.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/login.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/config/xml.vm (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/badge.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/certificate.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/id.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/idkey.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/key.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/lock.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif (100%)
 rename {pki/dogtag => dogtag}/ra-ui/shared/docroot/ra/admin/console/js/misc.js (100%)
 rename {pki/dogtag => dogtag}/tks-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/tks-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/tks-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/tks-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/tks-ui/dogtag-pki-tks-ui.spec (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/404.html (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/500.html (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenError.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenPending.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenRejected.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenSuccess.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenSvcPending.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/cms-funcs.js (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/funcs.js (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/hr.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/header.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/helpfun.js (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/index.html (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/index.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/ports.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/tks/getStats.template (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/agent/tks/index.html (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/index.html (100%)
 rename {pki/dogtag => dogtag}/tks-ui/shared/webapps/tks/services.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/CMakeLists.txt (100%)
 rename {pki/dogtag => dogtag}/tps-ui/LICENSE (100%)
 rename {pki/dogtag => dogtag}/tps-ui/build.xml (100%)
 rename {pki/dogtag => dogtag}/tps-ui/build_dogtag (100%)
 rename {pki/dogtag => dogtag}/tps-ui/dogtag-pki-tps-ui.spec (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/demo/Enroll.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/home/Enroll.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/so/Enroll.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/cfg.pl (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/enroll.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/enroll_temp.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/format.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/formatso.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/main.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/noaccess.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/read.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/read_temp.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/search.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/search_temp.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/seturl.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/cgi-bin/sow/welcome.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/404.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/500.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/css/pki-360.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/css/pki-base.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/css/pki.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/AdminEsc.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/AdvancePopup.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/EnrollPopup.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/GenericAuth.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/SettingsEsc.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/TokenManager.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/TokenPin.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/demo/GenericAuth.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/demo/logo.jpg (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/demo/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/demo/util.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/home/EnrollSuccess.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/home/GenericAuth.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/home/logo.jpg (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/home/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/home/util.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/BannerBackground.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/CancelButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/CloseButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/ContinueButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/HelpButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKey-Small.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKeyPair.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/OKButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/PadLock.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/PurchaseButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/ReactivateButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/ReleaseButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/SecureButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/SuspendButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/TryAgainButton.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/bg.jpg (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/images/logo.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/EnrollSuccess.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/GenericAuth.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/images/indicator.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/images/logo.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/logo.jpg (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/so/util.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/GenericAuth.html (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/css/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/images/indicator.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/images/logo.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/ajax.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/effects.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/lightbox.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/prototype.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/logo.jpg (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/sow/util.js (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/esc/style.css (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/footer.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/header.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/index.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/addConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/addResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/agentSelectConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/agentViewConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/auditAdmin.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/delete.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/deleteResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/doToken.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/doTokenConfirm.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/edit.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/editConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/editResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/editUser.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/error.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/index.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/indexAdmin.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/indexOperator.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/new.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/newUser.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/revoke.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/search.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchActivity.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchActivityResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchAdmin.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchAdminResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchCertificate.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchCertificateResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchUser.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/searchUserResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/selectConfig.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/selfTest.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/selfTestResults.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/show.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/showAdmin.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/showCert.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tokendb/userDelete.template (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/footer.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/header.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/login.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/config/xml.vm (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/badge.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/certificate.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/id.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/idkey.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/key.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/lock.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif (100%)
 rename {pki/dogtag => dogtag}/tps-ui/shared/docroot/tps/admin/console/js/misc.js (100%)
 rename {pki/patches => patches}/pki-core-selinux-Dogtag-9-f16.patch (100%)
 rename {pki/patches => patches}/pki-core-selinux-Dogtag-9-f17.patch (100%)
 rename {pki/scripts => scripts}/build_dogtag_pki (100%)
 rename {pki/scripts => scripts}/compose_dogtag_pki_meta_packages (100%)
 rename {pki/scripts => scripts}/compose_dogtag_pki_theme_packages (100%)
 rename {pki/scripts => scripts}/compose_functions (100%)
 rename {pki/scripts => scripts}/compose_ipa_pki_theme_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_console_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_core_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_kra_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_migrate_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_ocsp_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_ra_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_tks_packages (100%)
 rename {pki/scripts => scripts}/compose_pki_tps_packages (100%)
 rename {pki/scripts => scripts}/create_pki_yum_repos (100%)
 rename {pki/scripts => scripts}/install_default_ca_instance (100%)
 rename {pki/scripts => scripts}/install_default_pki_instances (100%)
 rename {pki/scripts => scripts}/pki_patch_maker (100%)
 rename {pki/scripts => scripts}/prepare_dogtag_pki (100%)
 rename {pki/scripts => scripts}/remove_default_pki_instances (100%)
 rename {pki/scripts => scripts}/remove_pki_components (100%)
 rename {pki/specs => specs}/dogtag-pki-theme.spec (100%)
 rename {pki/specs => specs}/dogtag-pki.spec (100%)
 rename {pki/specs => specs}/ipa-pki-theme.spec (100%)
 rename {pki/specs => specs}/pki-console.spec (100%)
 rename {pki/specs => specs}/pki-core.spec (100%)
 rename {pki/specs => specs}/pki-kra.spec (100%)
 rename {pki/specs => specs}/pki-migrate.spec (100%)
 rename {pki/specs => specs}/pki-ocsp.spec (100%)
 rename {pki/specs => specs}/pki-ra.spec (100%)
 rename {pki/specs => specs}/pki-tks.spec (100%)
 rename {pki/specs => specs}/pki-tps.spec (100%)
 rename {pki/tools => tools}/jar/README.jar-tools (100%)
 rename {pki/tools => tools}/jar/jar-query (100%)
 rename {pki/tools => tools}/jar/java-imports (100%)

diff --git a/pki/.classpath b/.classpath
similarity index 100%
rename from pki/.classpath
rename to .classpath
diff --git a/pki/.gitignore b/.gitignore
similarity index 100%
rename from pki/.gitignore
rename to .gitignore
diff --git a/pki/.project b/.project
similarity index 100%
rename from pki/.project
rename to .project
diff --git a/pki/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from pki/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/pki/COPYING b/COPYING
similarity index 100%
rename from pki/COPYING
rename to COPYING
diff --git a/pki/CPackConfig.cmake b/CPackConfig.cmake
similarity index 100%
rename from pki/CPackConfig.cmake
rename to CPackConfig.cmake
diff --git a/pki/ConfigureChecks.cmake b/ConfigureChecks.cmake
similarity index 100%
rename from pki/ConfigureChecks.cmake
rename to ConfigureChecks.cmake
diff --git a/pki/DefineOptions.cmake b/DefineOptions.cmake
similarity index 100%
rename from pki/DefineOptions.cmake
rename to DefineOptions.cmake
diff --git a/pki/README b/README
similarity index 100%
rename from pki/README
rename to README
diff --git a/pki/base/CMakeLists.txt b/base/CMakeLists.txt
similarity index 100%
rename from pki/base/CMakeLists.txt
rename to base/CMakeLists.txt
diff --git a/pki/base/ca/CMakeLists.txt b/base/ca/CMakeLists.txt
similarity index 100%
rename from pki/base/ca/CMakeLists.txt
rename to base/ca/CMakeLists.txt
diff --git a/pki/base/ca/LICENSE b/base/ca/LICENSE
similarity index 100%
rename from pki/base/ca/LICENSE
rename to base/ca/LICENSE
diff --git a/pki/base/ca/setup/CMakeLists.txt b/base/ca/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/ca/setup/CMakeLists.txt
rename to base/ca/setup/CMakeLists.txt
diff --git a/pki/base/ca/setup/registry_instance b/base/ca/setup/registry_instance
similarity index 100%
rename from pki/base/ca/setup/registry_instance
rename to base/ca/setup/registry_instance
diff --git a/pki/base/ca/shared/conf/CMakeLists.txt b/base/ca/shared/conf/CMakeLists.txt
similarity index 100%
rename from pki/base/ca/shared/conf/CMakeLists.txt
rename to base/ca/shared/conf/CMakeLists.txt
diff --git a/pki/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
similarity index 100%
rename from pki/base/ca/shared/conf/CS.cfg.in
rename to base/ca/shared/conf/CS.cfg.in
diff --git a/pki/base/ca/shared/conf/acl.ldif b/base/ca/shared/conf/acl.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/acl.ldif
rename to base/ca/shared/conf/acl.ldif
diff --git a/pki/base/ca/shared/conf/adminCert.profile b/base/ca/shared/conf/adminCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/adminCert.profile
rename to base/ca/shared/conf/adminCert.profile
diff --git a/pki/base/ca/shared/conf/caAuditSigningCert.profile b/base/ca/shared/conf/caAuditSigningCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/caAuditSigningCert.profile
rename to base/ca/shared/conf/caAuditSigningCert.profile
diff --git a/pki/base/ca/shared/conf/caCert.profile b/base/ca/shared/conf/caCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/caCert.profile
rename to base/ca/shared/conf/caCert.profile
diff --git a/pki/base/ca/shared/conf/caOCSPCert.profile b/base/ca/shared/conf/caOCSPCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/caOCSPCert.profile
rename to base/ca/shared/conf/caOCSPCert.profile
diff --git a/pki/base/ca/shared/conf/catalina.policy b/base/ca/shared/conf/catalina.policy
similarity index 100%
rename from pki/base/ca/shared/conf/catalina.policy
rename to base/ca/shared/conf/catalina.policy
diff --git a/pki/base/ca/shared/conf/catalina.properties b/base/ca/shared/conf/catalina.properties
similarity index 100%
rename from pki/base/ca/shared/conf/catalina.properties
rename to base/ca/shared/conf/catalina.properties
diff --git a/pki/base/ca/shared/conf/context.xml b/base/ca/shared/conf/context.xml
similarity index 100%
rename from pki/base/ca/shared/conf/context.xml
rename to base/ca/shared/conf/context.xml
diff --git a/pki/base/ca/shared/conf/database.ldif b/base/ca/shared/conf/database.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/database.ldif
rename to base/ca/shared/conf/database.ldif
diff --git a/pki/base/ca/shared/conf/db.ldif b/base/ca/shared/conf/db.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/db.ldif
rename to base/ca/shared/conf/db.ldif
diff --git a/pki/base/ca/shared/conf/flatfile.txt b/base/ca/shared/conf/flatfile.txt
similarity index 100%
rename from pki/base/ca/shared/conf/flatfile.txt
rename to base/ca/shared/conf/flatfile.txt
diff --git a/pki/base/ca/shared/conf/index.ldif b/base/ca/shared/conf/index.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/index.ldif
rename to base/ca/shared/conf/index.ldif
diff --git a/pki/base/ca/shared/conf/jk2.manifest b/base/ca/shared/conf/jk2.manifest
similarity index 100%
rename from pki/base/ca/shared/conf/jk2.manifest
rename to base/ca/shared/conf/jk2.manifest
diff --git a/pki/base/ca/shared/conf/jk2.properties b/base/ca/shared/conf/jk2.properties
similarity index 100%
rename from pki/base/ca/shared/conf/jk2.properties
rename to base/ca/shared/conf/jk2.properties
diff --git a/pki/base/ca/shared/conf/jkconf.ant.xml b/base/ca/shared/conf/jkconf.ant.xml
similarity index 100%
rename from pki/base/ca/shared/conf/jkconf.ant.xml
rename to base/ca/shared/conf/jkconf.ant.xml
diff --git a/pki/base/ca/shared/conf/jkconfig.manifest b/base/ca/shared/conf/jkconfig.manifest
similarity index 100%
rename from pki/base/ca/shared/conf/jkconfig.manifest
rename to base/ca/shared/conf/jkconfig.manifest
diff --git a/pki/base/ca/shared/conf/logging.properties b/base/ca/shared/conf/logging.properties
similarity index 100%
rename from pki/base/ca/shared/conf/logging.properties
rename to base/ca/shared/conf/logging.properties
diff --git a/pki/base/ca/shared/conf/manager.ldif b/base/ca/shared/conf/manager.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/manager.ldif
rename to base/ca/shared/conf/manager.ldif
diff --git a/pki/base/ca/shared/conf/proxy.conf b/base/ca/shared/conf/proxy.conf
similarity index 100%
rename from pki/base/ca/shared/conf/proxy.conf
rename to base/ca/shared/conf/proxy.conf
diff --git a/pki/base/ca/shared/conf/registry.cfg b/base/ca/shared/conf/registry.cfg
similarity index 100%
rename from pki/base/ca/shared/conf/registry.cfg
rename to base/ca/shared/conf/registry.cfg
diff --git a/pki/base/ca/shared/conf/schema.ldif b/base/ca/shared/conf/schema.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/schema.ldif
rename to base/ca/shared/conf/schema.ldif
diff --git a/pki/base/ca/shared/conf/server-minimal.xml b/base/ca/shared/conf/server-minimal.xml
similarity index 100%
rename from pki/base/ca/shared/conf/server-minimal.xml
rename to base/ca/shared/conf/server-minimal.xml
diff --git a/pki/base/ca/shared/conf/server.xml b/base/ca/shared/conf/server.xml
similarity index 100%
rename from pki/base/ca/shared/conf/server.xml
rename to base/ca/shared/conf/server.xml
diff --git a/pki/base/ca/shared/conf/serverCert.profile b/base/ca/shared/conf/serverCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/serverCert.profile
rename to base/ca/shared/conf/serverCert.profile
diff --git a/pki/base/ca/shared/conf/serverCertNick.conf b/base/ca/shared/conf/serverCertNick.conf
similarity index 100%
rename from pki/base/ca/shared/conf/serverCertNick.conf
rename to base/ca/shared/conf/serverCertNick.conf
diff --git a/pki/base/ca/shared/conf/shm.manifest b/base/ca/shared/conf/shm.manifest
similarity index 100%
rename from pki/base/ca/shared/conf/shm.manifest
rename to base/ca/shared/conf/shm.manifest
diff --git a/pki/base/ca/shared/conf/subsystemCert.profile b/base/ca/shared/conf/subsystemCert.profile
similarity index 100%
rename from pki/base/ca/shared/conf/subsystemCert.profile
rename to base/ca/shared/conf/subsystemCert.profile
diff --git a/pki/base/ca/shared/conf/tomcat-jk2.manifest b/base/ca/shared/conf/tomcat-jk2.manifest
similarity index 100%
rename from pki/base/ca/shared/conf/tomcat-jk2.manifest
rename to base/ca/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/ca/shared/conf/tomcat-users.xml b/base/ca/shared/conf/tomcat-users.xml
similarity index 100%
rename from pki/base/ca/shared/conf/tomcat-users.xml
rename to base/ca/shared/conf/tomcat-users.xml
diff --git a/pki/base/ca/shared/conf/tomcat6.conf b/base/ca/shared/conf/tomcat6.conf
similarity index 100%
rename from pki/base/ca/shared/conf/tomcat6.conf
rename to base/ca/shared/conf/tomcat6.conf
diff --git a/pki/base/ca/shared/conf/uriworkermap.properties b/base/ca/shared/conf/uriworkermap.properties
similarity index 100%
rename from pki/base/ca/shared/conf/uriworkermap.properties
rename to base/ca/shared/conf/uriworkermap.properties
diff --git a/pki/base/ca/shared/conf/vlv.ldif b/base/ca/shared/conf/vlv.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/vlv.ldif
rename to base/ca/shared/conf/vlv.ldif
diff --git a/pki/base/ca/shared/conf/vlvtasks.ldif b/base/ca/shared/conf/vlvtasks.ldif
similarity index 100%
rename from pki/base/ca/shared/conf/vlvtasks.ldif
rename to base/ca/shared/conf/vlvtasks.ldif
diff --git a/pki/base/ca/shared/conf/web.xml b/base/ca/shared/conf/web.xml
similarity index 100%
rename from pki/base/ca/shared/conf/web.xml
rename to base/ca/shared/conf/web.xml
diff --git a/pki/base/ca/shared/conf/workers.properties b/base/ca/shared/conf/workers.properties
similarity index 100%
rename from pki/base/ca/shared/conf/workers.properties
rename to base/ca/shared/conf/workers.properties
diff --git a/pki/base/ca/shared/conf/workers.properties.minimal b/base/ca/shared/conf/workers.properties.minimal
similarity index 100%
rename from pki/base/ca/shared/conf/workers.properties.minimal
rename to base/ca/shared/conf/workers.properties.minimal
diff --git a/pki/base/ca/shared/conf/workers2.properties b/base/ca/shared/conf/workers2.properties
similarity index 100%
rename from pki/base/ca/shared/conf/workers2.properties
rename to base/ca/shared/conf/workers2.properties
diff --git a/pki/base/ca/shared/conf/workers2.properties.minimal b/base/ca/shared/conf/workers2.properties.minimal
similarity index 100%
rename from pki/base/ca/shared/conf/workers2.properties.minimal
rename to base/ca/shared/conf/workers2.properties.minimal
diff --git a/pki/base/ca/shared/emails/ExpiredUnpublishJob b/base/ca/shared/emails/ExpiredUnpublishJob
similarity index 100%
rename from pki/base/ca/shared/emails/ExpiredUnpublishJob
rename to base/ca/shared/emails/ExpiredUnpublishJob
diff --git a/pki/base/ca/shared/emails/ExpiredUnpublishJobItem b/base/ca/shared/emails/ExpiredUnpublishJobItem
similarity index 100%
rename from pki/base/ca/shared/emails/ExpiredUnpublishJobItem
rename to base/ca/shared/emails/ExpiredUnpublishJobItem
diff --git a/pki/base/ca/shared/emails/certIssued_CA b/base/ca/shared/emails/certIssued_CA
similarity index 100%
rename from pki/base/ca/shared/emails/certIssued_CA
rename to base/ca/shared/emails/certIssued_CA
diff --git a/pki/base/ca/shared/emails/certIssued_CA.html b/base/ca/shared/emails/certIssued_CA.html
similarity index 100%
rename from pki/base/ca/shared/emails/certIssued_CA.html
rename to base/ca/shared/emails/certIssued_CA.html
diff --git a/pki/base/ca/shared/emails/certIssued_RA b/base/ca/shared/emails/certIssued_RA
similarity index 100%
rename from pki/base/ca/shared/emails/certIssued_RA
rename to base/ca/shared/emails/certIssued_RA
diff --git a/pki/base/ca/shared/emails/certIssued_RA.html b/base/ca/shared/emails/certIssued_RA.html
similarity index 100%
rename from pki/base/ca/shared/emails/certIssued_RA.html
rename to base/ca/shared/emails/certIssued_RA.html
diff --git a/pki/base/ca/shared/emails/certRequestRejected.html b/base/ca/shared/emails/certRequestRejected.html
similarity index 100%
rename from pki/base/ca/shared/emails/certRequestRejected.html
rename to base/ca/shared/emails/certRequestRejected.html
diff --git a/pki/base/ca/shared/emails/certRevoked_CA b/base/ca/shared/emails/certRevoked_CA
similarity index 100%
rename from pki/base/ca/shared/emails/certRevoked_CA
rename to base/ca/shared/emails/certRevoked_CA
diff --git a/pki/base/ca/shared/emails/certRevoked_CA.html b/base/ca/shared/emails/certRevoked_CA.html
similarity index 100%
rename from pki/base/ca/shared/emails/certRevoked_CA.html
rename to base/ca/shared/emails/certRevoked_CA.html
diff --git a/pki/base/ca/shared/emails/certRevoked_RA b/base/ca/shared/emails/certRevoked_RA
similarity index 100%
rename from pki/base/ca/shared/emails/certRevoked_RA
rename to base/ca/shared/emails/certRevoked_RA
diff --git a/pki/base/ca/shared/emails/certRevoked_RA.html b/base/ca/shared/emails/certRevoked_RA.html
similarity index 100%
rename from pki/base/ca/shared/emails/certRevoked_RA.html
rename to base/ca/shared/emails/certRevoked_RA.html
diff --git a/pki/base/ca/shared/emails/euJob1.html b/base/ca/shared/emails/euJob1.html
similarity index 100%
rename from pki/base/ca/shared/emails/euJob1.html
rename to base/ca/shared/emails/euJob1.html
diff --git a/pki/base/ca/shared/emails/euJob1Item.html b/base/ca/shared/emails/euJob1Item.html
similarity index 100%
rename from pki/base/ca/shared/emails/euJob1Item.html
rename to base/ca/shared/emails/euJob1Item.html
diff --git a/pki/base/ca/shared/emails/publishCerts.html b/base/ca/shared/emails/publishCerts.html
similarity index 100%
rename from pki/base/ca/shared/emails/publishCerts.html
rename to base/ca/shared/emails/publishCerts.html
diff --git a/pki/base/ca/shared/emails/publishCertsItem.html b/base/ca/shared/emails/publishCertsItem.html
similarity index 100%
rename from pki/base/ca/shared/emails/publishCertsItem.html
rename to base/ca/shared/emails/publishCertsItem.html
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA b/base/ca/shared/emails/reqInQueue_CA
similarity index 100%
rename from pki/base/ca/shared/emails/reqInQueue_CA
rename to base/ca/shared/emails/reqInQueue_CA
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA.html b/base/ca/shared/emails/reqInQueue_CA.html
similarity index 100%
rename from pki/base/ca/shared/emails/reqInQueue_CA.html
rename to base/ca/shared/emails/reqInQueue_CA.html
diff --git a/pki/base/ca/shared/emails/reqInQueue_RA b/base/ca/shared/emails/reqInQueue_RA
similarity index 100%
rename from pki/base/ca/shared/emails/reqInQueue_RA
rename to base/ca/shared/emails/reqInQueue_RA
diff --git a/pki/base/ca/shared/emails/reqInQueue_RA.html b/base/ca/shared/emails/reqInQueue_RA.html
similarity index 100%
rename from pki/base/ca/shared/emails/reqInQueue_RA.html
rename to base/ca/shared/emails/reqInQueue_RA.html
diff --git a/pki/base/ca/shared/emails/riq1Item.html b/base/ca/shared/emails/riq1Item.html
similarity index 100%
rename from pki/base/ca/shared/emails/riq1Item.html
rename to base/ca/shared/emails/riq1Item.html
diff --git a/pki/base/ca/shared/emails/riq1Summary.html b/base/ca/shared/emails/riq1Summary.html
similarity index 100%
rename from pki/base/ca/shared/emails/riq1Summary.html
rename to base/ca/shared/emails/riq1Summary.html
diff --git a/pki/base/ca/shared/emails/rnJob1.txt b/base/ca/shared/emails/rnJob1.txt
similarity index 100%
rename from pki/base/ca/shared/emails/rnJob1.txt
rename to base/ca/shared/emails/rnJob1.txt
diff --git a/pki/base/ca/shared/emails/rnJob1Item.txt b/base/ca/shared/emails/rnJob1Item.txt
similarity index 100%
rename from pki/base/ca/shared/emails/rnJob1Item.txt
rename to base/ca/shared/emails/rnJob1Item.txt
diff --git a/pki/base/ca/shared/emails/rnJob1Summary.txt b/base/ca/shared/emails/rnJob1Summary.txt
similarity index 100%
rename from pki/base/ca/shared/emails/rnJob1Summary.txt
rename to base/ca/shared/emails/rnJob1Summary.txt
diff --git a/pki/base/ca/shared/etc/init.d/pki-cad b/base/ca/shared/etc/init.d/pki-cad
similarity index 100%
rename from pki/base/ca/shared/etc/init.d/pki-cad
rename to base/ca/shared/etc/init.d/pki-cad
diff --git a/pki/base/ca/shared/lib/systemd/system/pki-cad.target b/base/ca/shared/lib/systemd/system/pki-cad.target
similarity index 100%
rename from pki/base/ca/shared/lib/systemd/system/pki-cad.target
rename to base/ca/shared/lib/systemd/system/pki-cad.target
diff --git a/pki/base/ca/shared/lib/systemd/system/pki-cad@.service b/base/ca/shared/lib/systemd/system/pki-cad@.service
similarity index 100%
rename from pki/base/ca/shared/lib/systemd/system/pki-cad@.service
rename to base/ca/shared/lib/systemd/system/pki-cad@.service
diff --git a/pki/base/ca/shared/profiles/ca/DomainController.cfg b/base/ca/shared/profiles/ca/DomainController.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/DomainController.cfg
rename to base/ca/shared/profiles/ca/DomainController.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAdminCert.cfg b/base/ca/shared/profiles/ca/caAdminCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caAdminCert.cfg
rename to base/ca/shared/profiles/ca/caAdminCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAgentFileSigning.cfg b/base/ca/shared/profiles/ca/caAgentFileSigning.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caAgentFileSigning.cfg
rename to base/ca/shared/profiles/ca/caAgentFileSigning.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAgentServerCert.cfg b/base/ca/shared/profiles/ca/caAgentServerCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caAgentServerCert.cfg
rename to base/ca/shared/profiles/ca/caAgentServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caCACert.cfg b/base/ca/shared/profiles/ca/caCACert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caCACert.cfg
rename to base/ca/shared/profiles/ca/caCACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caCMCUserCert.cfg b/base/ca/shared/profiles/ca/caCMCUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caCMCUserCert.cfg
rename to base/ca/shared/profiles/ca/caCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDirUserCert.cfg b/base/ca/shared/profiles/ca/caDirUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caDirUserCert.cfg
rename to base/ca/shared/profiles/ca/caDirUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDirUserRenewal.cfg b/base/ca/shared/profiles/ca/caDirUserRenewal.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caDirUserRenewal.cfg
rename to base/ca/shared/profiles/ca/caDirUserRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDualCert.cfg b/base/ca/shared/profiles/ca/caDualCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caDualCert.cfg
rename to base/ca/shared/profiles/ca/caDualCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDualRAuserCert.cfg b/base/ca/shared/profiles/ca/caDualRAuserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caDualRAuserCert.cfg
rename to base/ca/shared/profiles/ca/caDualRAuserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caECDualCert.cfg b/base/ca/shared/profiles/ca/caECDualCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caECDualCert.cfg
rename to base/ca/shared/profiles/ca/caECDualCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caECUserCert.cfg b/base/ca/shared/profiles/ca/caECUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caECUserCert.cfg
rename to base/ca/shared/profiles/ca/caECUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg b/base/ca/shared/profiles/ca/caEncECUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg
rename to base/ca/shared/profiles/ca/caEncECUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caEncUserCert.cfg b/base/ca/shared/profiles/ca/caEncUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caEncUserCert.cfg
rename to base/ca/shared/profiles/ca/caEncUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg b/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
rename to base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caIPAserviceCert.cfg b/base/ca/shared/profiles/ca/caIPAserviceCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caIPAserviceCert.cfg
rename to base/ca/shared/profiles/ca/caIPAserviceCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInstallCACert.cfg b/base/ca/shared/profiles/ca/caInstallCACert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInstallCACert.cfg
rename to base/ca/shared/profiles/ca/caInstallCACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
rename to base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caJarSigningCert.cfg b/base/ca/shared/profiles/ca/caJarSigningCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caJarSigningCert.cfg
rename to base/ca/shared/profiles/ca/caJarSigningCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caManualRenewal.cfg b/base/ca/shared/profiles/ca/caManualRenewal.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caManualRenewal.cfg
rename to base/ca/shared/profiles/ca/caManualRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caOCSPCert.cfg b/base/ca/shared/profiles/ca/caOCSPCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caOCSPCert.cfg
rename to base/ca/shared/profiles/ca/caOCSPCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caOtherCert.cfg b/base/ca/shared/profiles/ca/caOtherCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caOtherCert.cfg
rename to base/ca/shared/profiles/ca/caOtherCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRACert.cfg b/base/ca/shared/profiles/ca/caRACert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caRACert.cfg
rename to base/ca/shared/profiles/ca/caRACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRARouterCert.cfg b/base/ca/shared/profiles/ca/caRARouterCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caRARouterCert.cfg
rename to base/ca/shared/profiles/ca/caRARouterCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRAagentCert.cfg b/base/ca/shared/profiles/ca/caRAagentCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caRAagentCert.cfg
rename to base/ca/shared/profiles/ca/caRAagentCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRAserverCert.cfg b/base/ca/shared/profiles/ca/caRAserverCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caRAserverCert.cfg
rename to base/ca/shared/profiles/ca/caRAserverCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRouterCert.cfg b/base/ca/shared/profiles/ca/caRouterCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caRouterCert.cfg
rename to base/ca/shared/profiles/ca/caRouterCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg b/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
rename to base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caServerCert.cfg b/base/ca/shared/profiles/ca/caServerCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caServerCert.cfg
rename to base/ca/shared/profiles/ca/caServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSignedLogCert.cfg b/base/ca/shared/profiles/ca/caSignedLogCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caSignedLogCert.cfg
rename to base/ca/shared/profiles/ca/caSignedLogCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg b/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
rename to base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTPSCert.cfg b/base/ca/shared/profiles/ca/caTPSCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTPSCert.cfg
rename to base/ca/shared/profiles/ca/caTPSCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
rename to base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
rename to base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg b/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
rename to base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTransportCert.cfg b/base/ca/shared/profiles/ca/caTransportCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caTransportCert.cfg
rename to base/ca/shared/profiles/ca/caTransportCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg b/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
rename to base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUserCert.cfg b/base/ca/shared/profiles/ca/caUserCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caUserCert.cfg
rename to base/ca/shared/profiles/ca/caUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg b/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
similarity index 100%
rename from pki/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
rename to base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
diff --git a/pki/base/ca/shared/webapps/ROOT/WEB-INF/web.xml b/base/ca/shared/webapps/ROOT/WEB-INF/web.xml
similarity index 100%
rename from pki/base/ca/shared/webapps/ROOT/WEB-INF/web.xml
rename to base/ca/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/ca/shared/webapps/ROOT/index.jsp b/base/ca/shared/webapps/ROOT/index.jsp
similarity index 100%
rename from pki/base/ca/shared/webapps/ROOT/index.jsp
rename to base/ca/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/ca/shared/webapps/ca/WEB-INF/velocity.properties b/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
similarity index 100%
rename from pki/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
rename to base/ca/shared/webapps/ca/WEB-INF/velocity.properties
diff --git a/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
similarity index 100%
rename from pki/base/ca/shared/webapps/ca/WEB-INF/web.xml
rename to base/ca/shared/webapps/ca/WEB-INF/web.xml
diff --git a/pki/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
similarity index 100%
rename from pki/base/ca/src/CMakeLists.txt
rename to base/ca/src/CMakeLists.txt
diff --git a/pki/base/ca/src/com/netscape/ca/CAPolicy.java b/base/ca/src/com/netscape/ca/CAPolicy.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CAPolicy.java
rename to base/ca/src/com/netscape/ca/CAPolicy.java
diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CAService.java
rename to base/ca/src/com/netscape/ca/CAService.java
diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
rename to base/ca/src/com/netscape/ca/CMSCRLExtensions.java
diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
rename to base/ca/src/com/netscape/ca/CRLIssuingPoint.java
diff --git a/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java b/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
rename to base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/CertificateAuthority.java
rename to base/ca/src/com/netscape/ca/CertificateAuthority.java
diff --git a/pki/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java
similarity index 100%
rename from pki/base/ca/src/com/netscape/ca/SigningUnit.java
rename to base/ca/src/com/netscape/ca/SigningUnit.java
diff --git a/pki/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
similarity index 100%
rename from pki/base/common/CMakeLists.txt
rename to base/common/CMakeLists.txt
diff --git a/pki/base/common/LICENSE b/base/common/LICENSE
similarity index 100%
rename from pki/base/common/LICENSE
rename to base/common/LICENSE
diff --git a/pki/base/common/setup/CertServer.directory b/base/common/setup/CertServer.directory
similarity index 100%
rename from pki/base/common/setup/CertServer.directory
rename to base/common/setup/CertServer.directory
diff --git a/pki/base/common/setup/menu.xml b/base/common/setup/menu.xml
similarity index 100%
rename from pki/base/common/setup/menu.xml
rename to base/common/setup/menu.xml
diff --git a/pki/base/common/setup/web-app_2_3.dtd b/base/common/setup/web-app_2_3.dtd
similarity index 100%
rename from pki/base/common/setup/web-app_2_3.dtd
rename to base/common/setup/web-app_2_3.dtd
diff --git a/pki/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
similarity index 100%
rename from pki/base/common/src/CMakeLists.txt
rename to base/common/src/CMakeLists.txt
diff --git a/pki/base/common/src/LogMessages.properties b/base/common/src/LogMessages.properties
similarity index 100%
rename from pki/base/common/src/LogMessages.properties
rename to base/common/src/LogMessages.properties
diff --git a/pki/base/common/src/UserMessages.properties b/base/common/src/UserMessages.properties
similarity index 100%
rename from pki/base/common/src/UserMessages.properties
rename to base/common/src/UserMessages.properties
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java b/base/common/src/com/netscape/certsrv/acls/ACL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/ACL.java
rename to base/common/src/com/netscape/certsrv/acls/ACL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/base/common/src/com/netscape/certsrv/acls/ACLEntry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java
rename to base/common/src/com/netscape/certsrv/acls/ACLEntry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java
rename to base/common/src/com/netscape/certsrv/acls/ACLsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/base/common/src/com/netscape/certsrv/acls/EACLsException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java
rename to base/common/src/com/netscape/certsrv/acls/EACLsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java b/base/common/src/com/netscape/certsrv/acls/IACL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/IACL.java
rename to base/common/src/com/netscape/certsrv/acls/IACL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java b/base/common/src/com/netscape/certsrv/acls/IACLEntry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java
rename to base/common/src/com/netscape/certsrv/acls/IACLEntry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/apps/CMS.java
rename to base/common/src/com/netscape/certsrv/apps/CMS.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
rename to base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
rename to base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
rename to base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java b/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
rename to base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
rename to base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java
rename to base/common/src/com/netscape/certsrv/authentication/AuthResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
rename to base/common/src/com/netscape/certsrv/authentication/AuthToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthException.java b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EAuthException.java
rename to base/common/src/com/netscape/certsrv/authentication/EAuthException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
rename to base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
rename to base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
rename to base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
rename to base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
rename to base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java b/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
rename to base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java b/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
rename to base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java b/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
rename to base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
rename to base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java b/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
rename to base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
rename to base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
rename to base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java b/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
rename to base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java b/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
rename to base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java b/base/common/src/com/netscape/certsrv/authority/IAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java
rename to base/common/src/com/netscape/certsrv/authority/IAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java b/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
rename to base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java b/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
rename to base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java b/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
rename to base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
rename to base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java b/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
rename to base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
rename to base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
rename to base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
rename to base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ASubsystem.java b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ASubsystem.java
rename to base/common/src/com/netscape/certsrv/base/ASubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java b/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
rename to base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java b/base/common/src/com/netscape/certsrv/base/BaseResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/BaseResources.java
rename to base/common/src/com/netscape/certsrv/base/BaseResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java b/base/common/src/com/netscape/certsrv/base/EBaseException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/EBaseException.java
rename to base/common/src/com/netscape/certsrv/base/EBaseException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
rename to base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
rename to base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
rename to base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/base/common/src/com/netscape/certsrv/base/IArgBlock.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java
rename to base/common/src/com/netscape/certsrv/base/IArgBlock.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java b/base/common/src/com/netscape/certsrv/base/IAttrSet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java
rename to base/common/src/com/netscape/certsrv/base/IAttrSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java b/base/common/src/com/netscape/certsrv/base/IAuthInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java
rename to base/common/src/com/netscape/certsrv/base/IAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
rename to base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
rename to base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/base/common/src/com/netscape/certsrv/base/IConfigStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java
rename to base/common/src/com/netscape/certsrv/base/IConfigStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java b/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
rename to base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
rename to base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
rename to base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java b/base/common/src/com/netscape/certsrv/base/IPluginImpl.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java
rename to base/common/src/com/netscape/certsrv/base/IPluginImpl.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java b/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
rename to base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
rename to base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
rename to base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java b/base/common/src/com/netscape/certsrv/base/ISubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java
rename to base/common/src/com/netscape/certsrv/base/ISubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java b/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
rename to base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java b/base/common/src/com/netscape/certsrv/base/ITimeSource.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java
rename to base/common/src/com/netscape/certsrv/base/ITimeSource.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
rename to base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
rename to base/common/src/com/netscape/certsrv/base/MessageFormatter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
rename to base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/base/common/src/com/netscape/certsrv/base/MetaInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java
rename to base/common/src/com/netscape/certsrv/base/MetaInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/base/common/src/com/netscape/certsrv/base/Nonces.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/Nonces.java
rename to base/common/src/com/netscape/certsrv/base/Nonces.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java b/base/common/src/com/netscape/certsrv/base/PasswordResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java
rename to base/common/src/com/netscape/certsrv/base/PasswordResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java b/base/common/src/com/netscape/certsrv/base/Plugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/Plugin.java
rename to base/common/src/com/netscape/certsrv/base/Plugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/base/common/src/com/netscape/certsrv/base/SessionContext.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/base/SessionContext.java
rename to base/common/src/com/netscape/certsrv/base/SessionContext.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java b/base/common/src/com/netscape/certsrv/ca/CAResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/CAResources.java
rename to base/common/src/com/netscape/certsrv/ca/CAResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java b/base/common/src/com/netscape/certsrv/ca/ECAException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ECAException.java
rename to base/common/src/com/netscape/certsrv/ca/ECAException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java b/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
rename to base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java b/base/common/src/com/netscape/certsrv/ca/ICAService.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ICAService.java
rename to base/common/src/com/netscape/certsrv/ca/ICAService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
rename to base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
rename to base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
rename to base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
rename to base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java b/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
rename to base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/IDataProcessor.java b/base/common/src/com/netscape/certsrv/client/IDataProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/client/IDataProcessor.java
rename to base/common/src/com/netscape/certsrv/client/IDataProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java b/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
rename to base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnection.java b/base/common/src/com/netscape/certsrv/client/connection/IConnection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/client/connection/IConnection.java
rename to base/common/src/com/netscape/certsrv/client/connection/IConnection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java b/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
rename to base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
rename to base/common/src/com/netscape/certsrv/common/ConfigConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/Constants.java b/base/common/src/com/netscape/certsrv/common/Constants.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/Constants.java
rename to base/common/src/com/netscape/certsrv/common/Constants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/DestDef.java b/base/common/src/com/netscape/certsrv/common/DestDef.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/DestDef.java
rename to base/common/src/com/netscape/certsrv/common/DestDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java b/base/common/src/com/netscape/certsrv/common/NameValuePair.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java
rename to base/common/src/com/netscape/certsrv/common/NameValuePair.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
rename to base/common/src/com/netscape/certsrv/common/NameValuePairs.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/OpDef.java b/base/common/src/com/netscape/certsrv/common/OpDef.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/OpDef.java
rename to base/common/src/com/netscape/certsrv/common/OpDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java b/base/common/src/com/netscape/certsrv/common/PrefixDef.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java
rename to base/common/src/com/netscape/certsrv/common/PrefixDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java b/base/common/src/com/netscape/certsrv/common/ScopeDef.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java
rename to base/common/src/com/netscape/certsrv/common/ScopeDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/TaskId.java b/base/common/src/com/netscape/certsrv/common/TaskId.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/common/TaskId.java
rename to base/common/src/com/netscape/certsrv/common/TaskId.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java b/base/common/src/com/netscape/certsrv/connector/IConnector.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IConnector.java
rename to base/common/src/com/netscape/certsrv/connector/IConnector.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
rename to base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
rename to base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
rename to base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
rename to base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java b/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
rename to base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java b/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
rename to base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java b/base/common/src/com/netscape/certsrv/connector/IResender.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/connector/IResender.java
rename to base/common/src/com/netscape/certsrv/connector/IResender.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/base/common/src/com/netscape/certsrv/dbs/DBResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java
rename to base/common/src/com/netscape/certsrv/dbs/DBResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/base/common/src/com/netscape/certsrv/dbs/EDBException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java
rename to base/common/src/com/netscape/certsrv/dbs/EDBException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java b/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
rename to base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java b/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
rename to base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBObj.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
rename to base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
rename to base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
rename to base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java b/base/common/src/com/netscape/certsrv/dbs/Modification.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/Modification.java
rename to base/common/src/com/netscape/certsrv/dbs/Modification.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
rename to base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
rename to base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
rename to base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
rename to base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
rename to base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
rename to base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
rename to base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
rename to base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
rename to base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
rename to base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
rename to base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
rename to base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
rename to base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
rename to base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java b/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
rename to base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java b/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
rename to base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java b/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
rename to base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java b/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
rename to base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java b/base/common/src/com/netscape/certsrv/jobs/EJobsException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java
rename to base/common/src/com/netscape/certsrv/jobs/EJobsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java b/base/common/src/com/netscape/certsrv/jobs/IJob.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/IJob.java
rename to base/common/src/com/netscape/certsrv/jobs/IJob.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java b/base/common/src/com/netscape/certsrv/jobs/IJobCron.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java
rename to base/common/src/com/netscape/certsrv/jobs/IJobCron.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
rename to base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java b/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
rename to base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java b/base/common/src/com/netscape/certsrv/jobs/JobsResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java
rename to base/common/src/com/netscape/certsrv/jobs/JobsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java b/base/common/src/com/netscape/certsrv/kra/EKRAException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java
rename to base/common/src/com/netscape/certsrv/kra/EKRAException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IJoinShares.java b/base/common/src/com/netscape/certsrv/kra/IJoinShares.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/IJoinShares.java
rename to base/common/src/com/netscape/certsrv/kra/IJoinShares.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
rename to base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/base/common/src/com/netscape/certsrv/kra/IKeyService.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java
rename to base/common/src/com/netscape/certsrv/kra/IKeyService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
rename to base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IShare.java b/base/common/src/com/netscape/certsrv/kra/IShare.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/IShare.java
rename to base/common/src/com/netscape/certsrv/kra/IShare.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java b/base/common/src/com/netscape/certsrv/kra/KRAResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java
rename to base/common/src/com/netscape/certsrv/kra/KRAResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
rename to base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java
rename to base/common/src/com/netscape/certsrv/ldap/ELdapException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
rename to base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
rename to base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
rename to base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
rename to base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
rename to base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
rename to base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java b/base/common/src/com/netscape/certsrv/ldap/LdapResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java
rename to base/common/src/com/netscape/certsrv/ldap/LdapResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java b/base/common/src/com/netscape/certsrv/listeners/EListenersException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java
rename to base/common/src/com/netscape/certsrv/listeners/EListenersException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java b/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
rename to base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java b/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
rename to base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
rename to base/common/src/com/netscape/certsrv/logging/AuditEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditFormat.java b/base/common/src/com/netscape/certsrv/logging/AuditFormat.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/AuditFormat.java
rename to base/common/src/com/netscape/certsrv/logging/AuditFormat.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java b/base/common/src/com/netscape/certsrv/logging/ConsoleError.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java
rename to base/common/src/com/netscape/certsrv/logging/ConsoleError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java b/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
rename to base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java b/base/common/src/com/netscape/certsrv/logging/ELogException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ELogException.java
rename to base/common/src/com/netscape/certsrv/logging/ELogException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
rename to base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
rename to base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java b/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
rename to base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEvent.java b/base/common/src/com/netscape/certsrv/logging/ILogEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogEvent.java
rename to base/common/src/com/netscape/certsrv/logging/ILogEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java b/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
rename to base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java b/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
rename to base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java b/base/common/src/com/netscape/certsrv/logging/ILogQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java
rename to base/common/src/com/netscape/certsrv/logging/ILogQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java b/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
rename to base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java b/base/common/src/com/netscape/certsrv/logging/ILogger.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/ILogger.java
rename to base/common/src/com/netscape/certsrv/logging/ILogger.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java b/base/common/src/com/netscape/certsrv/logging/LogPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java
rename to base/common/src/com/netscape/certsrv/logging/LogPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java b/base/common/src/com/netscape/certsrv/logging/LogResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/LogResources.java
rename to base/common/src/com/netscape/certsrv/logging/LogResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
rename to base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java b/base/common/src/com/netscape/certsrv/logging/SystemEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java
rename to base/common/src/com/netscape/certsrv/logging/SystemEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java b/base/common/src/com/netscape/certsrv/notification/ENotificationException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java
rename to base/common/src/com/netscape/certsrv/notification/ENotificationException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
rename to base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
rename to base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
rename to base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java b/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
rename to base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/base/common/src/com/netscape/certsrv/notification/IMailNotification.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java
rename to base/common/src/com/netscape/certsrv/notification/IMailNotification.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java b/base/common/src/com/netscape/certsrv/notification/NotificationResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java
rename to base/common/src/com/netscape/certsrv/notification/NotificationResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java b/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
rename to base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
rename to base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
rename to base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
rename to base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java b/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
rename to base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
rename to base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
rename to base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
rename to base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/base/common/src/com/netscape/certsrv/pattern/Pattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java
rename to base/common/src/com/netscape/certsrv/pattern/Pattern.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java
rename to base/common/src/com/netscape/certsrv/policy/EPolicyException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
rename to base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java b/base/common/src/com/netscape/certsrv/policy/IExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IExpression.java
rename to base/common/src/com/netscape/certsrv/policy/IExpression.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
rename to base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
rename to base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
rename to base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
rename to base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
rename to base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
rename to base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
rename to base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
rename to base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
rename to base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
rename to base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
rename to base/common/src/com/netscape/certsrv/policy/IPolicySet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
rename to base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
rename to base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
rename to base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java
rename to base/common/src/com/netscape/certsrv/policy/PolicyResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
rename to base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java b/base/common/src/com/netscape/certsrv/profile/EDeferException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java
rename to base/common/src/com/netscape/certsrv/profile/EDeferException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java b/base/common/src/com/netscape/certsrv/profile/EProfileException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java
rename to base/common/src/com/netscape/certsrv/profile/EProfileException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java b/base/common/src/com/netscape/certsrv/profile/ERejectException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java
rename to base/common/src/com/netscape/certsrv/profile/ERejectException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java b/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
rename to base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java b/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
rename to base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java b/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
rename to base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
rename to base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java b/base/common/src/com/netscape/certsrv/profile/IProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfile.java
rename to base/common/src/com/netscape/certsrv/profile/IProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java b/base/common/src/com/netscape/certsrv/profile/IProfileContext.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileContext.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java b/base/common/src/com/netscape/certsrv/profile/IProfileEx.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileEx.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileInput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java b/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
rename to base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java b/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
rename to base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java b/base/common/src/com/netscape/certsrv/property/Descriptor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/property/Descriptor.java
rename to base/common/src/com/netscape/certsrv/property/Descriptor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java b/base/common/src/com/netscape/certsrv/property/EPropertyException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java
rename to base/common/src/com/netscape/certsrv/property/EPropertyException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
rename to base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java b/base/common/src/com/netscape/certsrv/property/IDescriptor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java
rename to base/common/src/com/netscape/certsrv/property/IDescriptor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java b/base/common/src/com/netscape/certsrv/property/PropertySet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/property/PropertySet.java
rename to base/common/src/com/netscape/certsrv/property/PropertySet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
rename to base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
rename to base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java b/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
rename to base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java b/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java b/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java b/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
rename to base/common/src/com/netscape/certsrv/publish/ILdapRule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java b/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
rename to base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
rename to base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
rename to base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java b/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
rename to base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java b/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
rename to base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java b/base/common/src/com/netscape/certsrv/publish/MapperProxy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java
rename to base/common/src/com/netscape/certsrv/publish/MapperProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java b/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
rename to base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java b/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
rename to base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java b/base/common/src/com/netscape/certsrv/publish/RulePlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java
rename to base/common/src/com/netscape/certsrv/publish/RulePlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java b/base/common/src/com/netscape/certsrv/ra/IRAService.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ra/IRAService.java
rename to base/common/src/com/netscape/certsrv/ra/IRAService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
rename to base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java b/base/common/src/com/netscape/certsrv/registry/ERegistryException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java
rename to base/common/src/com/netscape/certsrv/registry/ERegistryException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java b/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
rename to base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
rename to base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
rename to base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java b/base/common/src/com/netscape/certsrv/request/AgentApproval.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java
rename to base/common/src/com/netscape/certsrv/request/AgentApproval.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java
rename to base/common/src/com/netscape/certsrv/request/AgentApprovals.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java b/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
rename to base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/INotify.java b/base/common/src/com/netscape/certsrv/request/INotify.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/INotify.java
rename to base/common/src/com/netscape/certsrv/request/INotify.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IPolicy.java b/base/common/src/com/netscape/certsrv/request/IPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IPolicy.java
rename to base/common/src/com/netscape/certsrv/request/IPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequest.java
rename to base/common/src/com/netscape/certsrv/request/IRequest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestList.java b/base/common/src/com/netscape/certsrv/request/IRequestList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestList.java
rename to base/common/src/com/netscape/certsrv/request/IRequestList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java b/base/common/src/com/netscape/certsrv/request/IRequestListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java
rename to base/common/src/com/netscape/certsrv/request/IRequestListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
rename to base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java b/base/common/src/com/netscape/certsrv/request/IRequestQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java
rename to base/common/src/com/netscape/certsrv/request/IRequestQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
rename to base/common/src/com/netscape/certsrv/request/IRequestRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java b/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
rename to base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java b/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
rename to base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java b/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
rename to base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IService.java b/base/common/src/com/netscape/certsrv/request/IService.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/IService.java
rename to base/common/src/com/netscape/certsrv/request/IService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/PolicyMessage.java b/base/common/src/com/netscape/certsrv/request/PolicyMessage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/PolicyMessage.java
rename to base/common/src/com/netscape/certsrv/request/PolicyMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/PolicyResult.java b/base/common/src/com/netscape/certsrv/request/PolicyResult.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/PolicyResult.java
rename to base/common/src/com/netscape/certsrv/request/PolicyResult.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/RequestId.java b/base/common/src/com/netscape/certsrv/request/RequestId.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/RequestId.java
rename to base/common/src/com/netscape/certsrv/request/RequestId.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/RequestStatus.java
rename to base/common/src/com/netscape/certsrv/request/RequestStatus.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java b/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
rename to base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/Credential.java b/base/common/src/com/netscape/certsrv/security/Credential.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/Credential.java
rename to base/common/src/com/netscape/certsrv/security/Credential.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
rename to base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
rename to base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
rename to base/common/src/com/netscape/certsrv/security/ISigningUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
rename to base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IToken.java b/base/common/src/com/netscape/certsrv/security/IToken.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/IToken.java
rename to base/common/src/com/netscape/certsrv/security/IToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
rename to base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/base/common/src/com/netscape/certsrv/security/KeyCertData.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java
rename to base/common/src/com/netscape/certsrv/security/KeyCertData.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
rename to base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
rename to base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
rename to base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
rename to base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
rename to base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
rename to base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java b/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
rename to base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java b/base/common/src/com/netscape/certsrv/template/ArgList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/template/ArgList.java
rename to base/common/src/com/netscape/certsrv/template/ArgList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java b/base/common/src/com/netscape/certsrv/template/ArgSet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/template/ArgSet.java
rename to base/common/src/com/netscape/certsrv/template/ArgSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java b/base/common/src/com/netscape/certsrv/template/ArgString.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/template/ArgString.java
rename to base/common/src/com/netscape/certsrv/template/ArgString.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/IArgValue.java b/base/common/src/com/netscape/certsrv/template/IArgValue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/template/IArgValue.java
rename to base/common/src/com/netscape/certsrv/template/IArgValue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java b/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
rename to base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java b/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
rename to base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
rename to base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java b/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
rename to base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java b/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java b/base/common/src/com/netscape/certsrv/usrgrp/IUser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IUser.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
rename to base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
rename to base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/base/common/src/com/netscape/certsrv/util/HttpInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
rename to base/common/src/com/netscape/certsrv/util/HttpInput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java b/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
rename to base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/base/common/src/com/netscape/certsrv/util/StatsEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java
rename to base/common/src/com/netscape/certsrv/util/StatsEvent.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java
rename to base/common/src/com/netscape/cms/authentication/AVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/base/common/src/com/netscape/cms/authentication/CMCAuth.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
rename to base/common/src/com/netscape/cms/authentication/CMCAuth.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/Crypt.java b/base/common/src/com/netscape/cms/authentication/Crypt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/Crypt.java
rename to base/common/src/com/netscape/cms/authentication/Crypt.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/DNPattern.java
rename to base/common/src/com/netscape/cms/authentication/DNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
rename to base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/common/src/com/netscape/cms/authentication/HashAuthData.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java
rename to base/common/src/com/netscape/cms/authentication/HashAuthData.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/HashAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
rename to base/common/src/com/netscape/cms/authentication/PortalEnroll.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java
rename to base/common/src/com/netscape/cms/authentication/RDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/base/common/src/com/netscape/cms/authentication/SharedSecret.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java
rename to base/common/src/com/netscape/cms/authentication/SharedSecret.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
rename to base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
rename to base/common/src/com/netscape/cms/authorization/AAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
rename to base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
rename to base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
rename to base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
rename to base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
rename to base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
rename to base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
rename to base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/common/src/com/netscape/cms/jobs/AJobBase.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/jobs/AJobBase.java
rename to base/common/src/com/netscape/cms/jobs/AJobBase.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
rename to base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
rename to base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
rename to base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
rename to base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
rename to base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
rename to base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
rename to base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
rename to base/common/src/com/netscape/cms/listeners/RequestInQListener.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/common/src/com/netscape/cms/logging/LogEntry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/logging/LogEntry.java
rename to base/common/src/com/netscape/cms/logging/LogEntry.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/logging/LogFile.java
rename to base/common/src/com/netscape/cms/logging/LogFile.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java
rename to base/common/src/com/netscape/cms/logging/RollingLogFile.java
diff --git a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/common/src/com/netscape/cms/notification/MailNotification.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/notification/MailNotification.java
rename to base/common/src/com/netscape/cms/notification/MailNotification.java
diff --git a/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/ocsp/DefStore.java
rename to base/common/src/com/netscape/cms/ocsp/DefStore.java
diff --git a/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
rename to base/common/src/com/netscape/cms/ocsp/LDAPStore.java
diff --git a/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/common/src/com/netscape/cms/password/PasswordChecker.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/password/PasswordChecker.java
rename to base/common/src/com/netscape/cms/password/PasswordChecker.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/common/src/com/netscape/cms/policy/APolicyRule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/APolicyRule.java
rename to base/common/src/com/netscape/cms/policy/APolicyRule.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
rename to base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
rename to base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
rename to base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
rename to base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
rename to base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
rename to base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
rename to base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
rename to base/common/src/com/netscape/cms/profile/common/BasicProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
rename to base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
rename to base/common/src/com/netscape/cms/profile/common/ProfileContext.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
rename to base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
rename to base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
rename to base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
rename to base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
rename to base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
rename to base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
rename to base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
rename to base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
rename to base/common/src/com/netscape/cms/profile/def/ImageDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/common/src/com/netscape/cms/profile/def/NoDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java
rename to base/common/src/com/netscape/cms/profile/def/NoDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
rename to base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
rename to base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
rename to base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
rename to base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
rename to base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
rename to base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
rename to base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
rename to base/common/src/com/netscape/cms/profile/input/CertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
rename to base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
rename to base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
rename to base/common/src/com/netscape/cms/profile/input/EnrollInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
rename to base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/common/src/com/netscape/cms/profile/input/GenericInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java
rename to base/common/src/com/netscape/cms/profile/input/GenericInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/common/src/com/netscape/cms/profile/input/ImageInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java
rename to base/common/src/com/netscape/cms/profile/input/ImageInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
rename to base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
rename to base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
rename to base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
rename to base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
rename to base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
rename to base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
rename to base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
rename to base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
rename to base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/common/src/com/netscape/cms/profile/output/CertOutput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java
rename to base/common/src/com/netscape/cms/profile/output/CertOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
rename to base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
rename to base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
rename to base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
rename to base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
rename to base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
rename to base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
rename to base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
rename to base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
rename to base/common/src/com/netscape/cms/publish/mappers/NoMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
rename to base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java b/base/common/src/com/netscape/cms/publish/publishers/Utils.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java
rename to base/common/src/com/netscape/cms/publish/publishers/Utils.java
diff --git a/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/request/RequestScheduler.java
rename to base/common/src/com/netscape/cms/request/RequestScheduler.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java
rename to base/common/src/com/netscape/cms/selftests/ASelfTest.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
rename to base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
rename to base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
rename to base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
rename to base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
rename to base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
rename to base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
rename to base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
rename to base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
rename to base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
rename to base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
rename to base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/common/src/com/netscape/cms/servlet/base/GetStats.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java
rename to base/common/src/com/netscape/cms/servlet/base/GetStats.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
rename to base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
rename to base/common/src/com/netscape/cms/servlet/base/UserInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
rename to base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
rename to base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
rename to base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
rename to base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
rename to base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
rename to base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
rename to base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
rename to base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
rename to base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
rename to base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
rename to base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
rename to base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
rename to base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
rename to base/common/src/com/netscape/cms/servlet/cert/Monitor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
rename to base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
rename to base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
rename to base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
rename to base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
rename to base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
rename to base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
rename to base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
rename to base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
rename to base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
rename to base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
rename to base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSFile.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
rename to base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
rename to base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
rename to base/common/src/com/netscape/cms/servlet/common/IRawJS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
rename to base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/common/src/com/netscape/cms/servlet/common/RawJS.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/RawJS.java
rename to base/common/src/com/netscape/cms/servlet/common/RawJS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java b/base/common/src/com/netscape/cms/servlet/common/Utils.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/common/Utils.java
rename to base/common/src/com/netscape/cms/servlet/common/Utils.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
rename to base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
rename to base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
rename to base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
rename to base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java b/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
rename to base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
rename to base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
rename to base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
rename to base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
rename to base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
rename to base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
rename to base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
rename to base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
rename to base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
rename to base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
rename to base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
rename to base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
rename to base/common/src/com/netscape/cms/servlet/key/GetPk12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
rename to base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
rename to base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
rename to base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
rename to base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
rename to base/common/src/com/netscape/cms/servlet/key/SrchKey.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
rename to base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
rename to base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
rename to base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
rename to base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
rename to base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
rename to base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
rename to base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
rename to base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
rename to base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
rename to base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
rename to base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
rename to base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
rename to base/common/src/com/netscape/cms/servlet/request/IReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
rename to base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
rename to base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
rename to base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
rename to base/common/src/com/netscape/cms/servlet/request/QueryReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
rename to base/common/src/com/netscape/cms/servlet/request/ReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
rename to base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
rename to base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java b/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
rename to base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
rename to base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/common/src/com/netscape/cms/shares/OldJoinShares.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java
rename to base/common/src/com/netscape/cms/shares/OldJoinShares.java
diff --git a/pki/base/common/src/com/netscape/cms/shares/OldShare.java b/base/common/src/com/netscape/cms/shares/OldShare.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cms/shares/OldShare.java
rename to base/common/src/com/netscape/cms/shares/OldShare.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
rename to base/common/src/com/netscape/cmscore/apps/CMSEngine.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
rename to base/common/src/com/netscape/cmscore/apps/CommandQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java b/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
rename to base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java b/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
rename to base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java b/base/common/src/com/netscape/cmscore/apps/Setup.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/Setup.java
rename to base/common/src/com/netscape/cmscore/apps/Setup.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/base/common/src/com/netscape/cmscore/apps/Upgrade.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java
rename to base/common/src/com/netscape/cmscore/apps/Upgrade.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
rename to base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
rename to base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
rename to base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
rename to base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
rename to base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
rename to base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
rename to base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
rename to base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
rename to base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/base/common/src/com/netscape/cmscore/base/ArgBlock.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java
rename to base/common/src/com/netscape/cmscore/base/ArgBlock.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
rename to base/common/src/com/netscape/cmscore/base/FileConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
rename to base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
rename to base/common/src/com/netscape/cmscore/base/PropConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
rename to base/common/src/com/netscape/cmscore/base/SimpleProperties.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
rename to base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
rename to base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
rename to base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
rename to base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
rename to base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/base/common/src/com/netscape/cmscore/cert/CertUtils.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
rename to base/common/src/com/netscape/cmscore/cert/CertUtils.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
rename to base/common/src/com/netscape/cmscore/cert/CertificatePair.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
rename to base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
rename to base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
rename to base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
rename to base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
rename to base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
rename to base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
rename to base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
rename to base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
rename to base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
rename to base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
rename to base/common/src/com/netscape/cmscore/connector/HttpConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
rename to base/common/src/com/netscape/cmscore/connector/HttpConnector.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
rename to base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
rename to base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
rename to base/common/src/com/netscape/cmscore/connector/LocalConnector.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
rename to base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
rename to base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/connector/Resender.java
rename to base/common/src/com/netscape/cmscore/connector/Resender.java
diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
rename to base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
rename to base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
rename to base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
rename to base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
rename to base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
rename to base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
rename to base/common/src/com/netscape/cmscore/dbs/CertRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
rename to base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
rename to base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
rename to base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
rename to base/common/src/com/netscape/cmscore/dbs/DBSSession.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
rename to base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
rename to base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
rename to base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
rename to base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/DateMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
rename to base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/LongMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
rename to base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/common/src/com/netscape/cmscore/dbs/Repository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/Repository.java
rename to base/common/src/com/netscape/cmscore/dbs/Repository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
rename to base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
rename to base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
rename to base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/StringMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
rename to base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
rename to base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
rename to base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/common/src/com/netscape/cmscore/jobs/CronItem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java
rename to base/common/src/com/netscape/cmscore/jobs/CronItem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/base/common/src/com/netscape/cmscore/jobs/CronRange.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java
rename to base/common/src/com/netscape/cmscore/jobs/CronRange.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/base/common/src/com/netscape/cmscore/jobs/JobCron.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java
rename to base/common/src/com/netscape/cmscore/jobs/JobCron.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
rename to base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapRule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
rename to base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
rename to base/common/src/com/netscape/cmscore/ldap/PublishObject.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
rename to base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
rename to base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
rename to base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
rename to base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
rename to base/common/src/com/netscape/cmscore/logging/AuditFormat.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/common/src/com/netscape/cmscore/logging/LogQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java
rename to base/common/src/com/netscape/cmscore/logging/LogQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
rename to base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/common/src/com/netscape/cmscore/logging/Logger.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/Logger.java
rename to base/common/src/com/netscape/cmscore/logging/Logger.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
rename to base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
rename to base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
rename to base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
rename to base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
rename to base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
rename to base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
rename to base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
rename to base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/base/common/src/com/netscape/cmscore/policy/AndExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java
rename to base/common/src/com/netscape/cmscore/policy/AndExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
rename to base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
rename to base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
rename to base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/base/common/src/com/netscape/cmscore/policy/OrExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java
rename to base/common/src/com/netscape/cmscore/policy/OrExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
rename to base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/common/src/com/netscape/cmscore/policy/PolicySet.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java
rename to base/common/src/com/netscape/cmscore/policy/PolicySet.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
rename to base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
rename to base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
rename to base/common/src/com/netscape/cmscore/registry/PluginInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
rename to base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
rename to base/common/src/com/netscape/cmscore/request/ARequestQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
rename to base/common/src/com/netscape/cmscore/request/ARequestRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
rename to base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
rename to base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/common/src/com/netscape/cmscore/request/RequestAttr.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java
rename to base/common/src/com/netscape/cmscore/request/RequestAttr.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/common/src/com/netscape/cmscore/request/RequestQueue.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java
rename to base/common/src/com/netscape/cmscore/request/RequestQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/common/src/com/netscape/cmscore/request/RequestRecord.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java
rename to base/common/src/com/netscape/cmscore/request/RequestRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/common/src/com/netscape/cmscore/request/RequestRepository.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java
rename to base/common/src/com/netscape/cmscore/request/RequestRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
rename to base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/Schema.java b/base/common/src/com/netscape/cmscore/request/Schema.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/request/Schema.java
rename to base/common/src/com/netscape/cmscore/request/Schema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/common/src/com/netscape/cmscore/security/CASigningCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java
rename to base/common/src/com/netscape/cmscore/security/CASigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
rename to base/common/src/com/netscape/cmscore/security/CertificateInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
rename to base/common/src/com/netscape/cmscore/security/JssSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
rename to base/common/src/com/netscape/cmscore/security/KRATransportCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
rename to base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
rename to base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
rename to base/common/src/com/netscape/cmscore/security/PWCBsdr.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/base/common/src/com/netscape/cmscore/security/PWUtil.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/PWUtil.java
rename to base/common/src/com/netscape/cmscore/security/PWUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
rename to base/common/src/com/netscape/cmscore/security/PWsdrCache.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/Provider.java b/base/common/src/com/netscape/cmscore/security/Provider.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/Provider.java
rename to base/common/src/com/netscape/cmscore/security/Provider.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java
rename to base/common/src/com/netscape/cmscore/security/RASigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/common/src/com/netscape/cmscore/security/SSLCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/SSLCert.java
rename to base/common/src/com/netscape/cmscore/security/SSLCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
rename to base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
rename to base/common/src/com/netscape/cmscore/security/SubsystemCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
rename to base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
rename to base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
rename to base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
rename to base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
rename to base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java
rename to base/common/src/com/netscape/cmscore/usrgrp/Group.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
rename to base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/common/src/com/netscape/cmscore/usrgrp/User.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/usrgrp/User.java
rename to base/common/src/com/netscape/cmscore/usrgrp/User.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/Assert.java b/base/common/src/com/netscape/cmscore/util/Assert.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/Assert.java
rename to base/common/src/com/netscape/cmscore/util/Assert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/AssertionException.java b/base/common/src/com/netscape/cmscore/util/AssertionException.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/AssertionException.java
rename to base/common/src/com/netscape/cmscore/util/AssertionException.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/base/common/src/com/netscape/cmscore/util/Debug.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/Debug.java
rename to base/common/src/com/netscape/cmscore/util/Debug.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
rename to base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/base/common/src/com/netscape/cmscore/util/FileAsString.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/FileAsString.java
rename to base/common/src/com/netscape/cmscore/util/FileAsString.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
rename to base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java b/base/common/src/com/netscape/cmscore/util/OsSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java
rename to base/common/src/com/netscape/cmscore/util/OsSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/base/common/src/com/netscape/cmscore/util/PFXUtils.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java
rename to base/common/src/com/netscape/cmscore/util/PFXUtils.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
rename to base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
rename to base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/base/common/src/com/netscape/cmscore/util/UtilMessage.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java
rename to base/common/src/com/netscape/cmscore/util/UtilMessage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java b/base/common/src/com/netscape/cmscore/util/UtilResources.java
similarity index 100%
rename from pki/base/common/src/com/netscape/cmscore/util/UtilResources.java
rename to base/common/src/com/netscape/cmscore/util/UtilResources.java
diff --git a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
rename to base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
rename to base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
diff --git a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java b/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
rename to base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java b/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
rename to base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
rename to base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
rename to base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
rename to base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
rename to base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
rename to base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
rename to base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
rename to base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java b/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
rename to base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
rename to base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java b/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
rename to base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
rename to base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
rename to base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
rename to base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
rename to base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/request/RequestTest.java
rename to base/common/test/com/netscape/cmscore/request/RequestTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java b/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
rename to base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
diff --git a/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java b/base/common/test/com/netscape/cmscore/test/TestHelper.java
similarity index 100%
rename from pki/base/common/test/com/netscape/cmscore/test/TestHelper.java
rename to base/common/test/com/netscape/cmscore/test/TestHelper.java
diff --git a/pki/base/console/CMakeLists.txt b/base/console/CMakeLists.txt
similarity index 100%
rename from pki/base/console/CMakeLists.txt
rename to base/console/CMakeLists.txt
diff --git a/pki/base/console/LICENSE b/base/console/LICENSE
similarity index 100%
rename from pki/base/console/LICENSE
rename to base/console/LICENSE
diff --git a/pki/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt
similarity index 100%
rename from pki/base/console/src/CMakeLists.txt
rename to base/console/src/CMakeLists.txt
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
rename to base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
rename to base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
rename to base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
rename to base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
rename to base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
rename to base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
rename to base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
rename to base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
rename to base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
rename to base/console/src/com/netscape/admin/certsrv/CMSPassword.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
rename to base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
rename to base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
rename to base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
rename to base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
rename to base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
rename to base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
rename to base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CellEditorData.java b/base/console/src/com/netscape/admin/certsrv/CellEditorData.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CellEditorData.java
rename to base/console/src/com/netscape/admin/certsrv/CellEditorData.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/Console.java b/base/console/src/com/netscape/admin/certsrv/Console.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/Console.java
rename to base/console/src/com/netscape/admin/certsrv/Console.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
rename to base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
rename to base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java b/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
rename to base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/EAdminException.java b/base/console/src/com/netscape/admin/certsrv/EAdminException.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/EAdminException.java
rename to base/console/src/com/netscape/admin/certsrv/EAdminException.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
rename to base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
rename to base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/HourGlass.java b/base/console/src/com/netscape/admin/certsrv/HourGlass.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/HourGlass.java
rename to base/console/src/com/netscape/admin/certsrv/HourGlass.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java b/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
rename to base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java b/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
rename to base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java b/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
rename to base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
rename to base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java b/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
rename to base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java b/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
rename to base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IMenuAction.java b/base/console/src/com/netscape/admin/certsrv/IMenuAction.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IMenuAction.java
rename to base/console/src/com/netscape/admin/certsrv/IMenuAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
rename to base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
rename to base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java b/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
rename to base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java b/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
rename to base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IUIMapper.java b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
rename to base/console/src/com/netscape/admin/certsrv/IUIMapper.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
rename to base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java b/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
rename to base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
rename to base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java b/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
rename to base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
rename to base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties b/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
rename to base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
rename to base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
rename to base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java b/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
rename to base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
rename to base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
rename to base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
rename to base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
rename to base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java b/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
rename to base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
rename to base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
rename to base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
rename to base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
rename to base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
rename to base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
rename to base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
rename to base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
rename to base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
rename to base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
rename to base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
rename to base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/Request.java b/base/console/src/com/netscape/admin/certsrv/connection/Request.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/Request.java
rename to base/console/src/com/netscape/admin/certsrv/connection/Request.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/Response.java b/base/console/src/com/netscape/admin/certsrv/connection/Response.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/Response.java
rename to base/console/src/com/netscape/admin/certsrv/connection/Response.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
rename to base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif b/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
rename to base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif b/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
rename to base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif b/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
rename to base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif b/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
rename to base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/acl.gif b/base/console/src/com/netscape/admin/certsrv/images/acl.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/acl.gif
rename to base/console/src/com/netscape/admin/certsrv/images/acl.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif b/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
rename to base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
rename to base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alertl.gif b/base/console/src/com/netscape/admin/certsrv/images/alertl.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/alertl.gif
rename to base/console/src/com/netscape/admin/certsrv/images/alertl.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif b/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif b/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
rename to base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/auth.gif b/base/console/src/com/netscape/admin/certsrv/images/auth.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/auth.gif
rename to base/console/src/com/netscape/admin/certsrv/images/auth.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/authobj.gif b/base/console/src/com/netscape/admin/certsrv/images/authobj.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/authobj.gif
rename to base/console/src/com/netscape/admin/certsrv/images/authobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
rename to base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert24.gif b/base/console/src/com/netscape/admin/certsrv/images/cert24.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/cert24.gif
rename to base/console/src/com/netscape/admin/certsrv/images/cert24.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert41.gif b/base/console/src/com/netscape/admin/certsrv/images/cert41.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/cert41.gif
rename to base/console/src/com/netscape/admin/certsrv/images/cert41.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert42.gif b/base/console/src/com/netscape/admin/certsrv/images/cert42.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/cert42.gif
rename to base/console/src/com/netscape/admin/certsrv/images/cert42.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif b/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
rename to base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/error.gif b/base/console/src/com/netscape/admin/certsrv/images/error.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/error.gif
rename to base/console/src/com/netscape/admin/certsrv/images/error.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/genobject.gif b/base/console/src/com/netscape/admin/certsrv/images/genobject.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/genobject.gif
rename to base/console/src/com/netscape/admin/certsrv/images/genobject.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif b/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
rename to base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
rename to base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobs.gif b/base/console/src/com/netscape/admin/certsrv/images/jobs.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/jobs.gif
rename to base/console/src/com/netscape/admin/certsrv/images/jobs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif b/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
rename to base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/messagel.gif b/base/console/src/com/netscape/admin/certsrv/images/messagel.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/messagel.gif
rename to base/console/src/com/netscape/admin/certsrv/images/messagel.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif b/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
rename to base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/plug.gif b/base/console/src/com/netscape/admin/certsrv/images/plug.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/plug.gif
rename to base/console/src/com/netscape/admin/certsrv/images/plug.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/plugin.gif b/base/console/src/com/netscape/admin/certsrv/images/plugin.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/plugin.gif
rename to base/console/src/com/netscape/admin/certsrv/images/plugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif b/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
rename to base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif b/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
rename to base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif b/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
rename to base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif b/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
rename to base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif b/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
rename to base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif b/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
rename to base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/secure.gif b/base/console/src/com/netscape/admin/certsrv/images/secure.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/secure.gif
rename to base/console/src/com/netscape/admin/certsrv/images/secure.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif b/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
rename to base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif b/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
rename to base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif b/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
rename to base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
rename to base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
rename to base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
rename to base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
rename to base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java b/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
rename to base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java b/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
rename to base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java b/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
rename to base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
rename to base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java b/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
rename to base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
rename to base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
rename to base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
rename to base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
rename to base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
rename to base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java b/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java b/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java b/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java b/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java b/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java b/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java b/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
rename to base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java b/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
rename to base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Comm.java b/base/console/src/com/netscape/admin/certsrv/security/Comm.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/Comm.java
rename to base/console/src/com/netscape/admin/certsrv/security/Comm.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java b/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
rename to base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java b/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
rename to base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java b/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
rename to base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
rename to base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
rename to base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
rename to base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
rename to base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Message.java b/base/console/src/com/netscape/admin/certsrv/security/Message.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/Message.java
rename to base/console/src/com/netscape/admin/certsrv/security/Message.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java b/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java b/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
rename to base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Response.java b/base/console/src/com/netscape/admin/certsrv/security/Response.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/Response.java
rename to base/console/src/com/netscape/admin/certsrv/security/Response.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
rename to base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
rename to base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
rename to base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
rename to base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java b/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
rename to base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
rename to base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java b/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
rename to base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
rename to base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java b/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
rename to base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java b/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
rename to base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
rename to base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
rename to base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java b/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
rename to base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CGITask.java b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
rename to base/console/src/com/netscape/admin/certsrv/task/CGITask.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
rename to base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java b/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
rename to base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java b/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
rename to base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
rename to base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java b/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java b/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
rename to base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
rename to base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
rename to base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
rename to base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
rename to base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
rename to base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java b/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
similarity index 100%
rename from pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
rename to base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/ConfigConstants.java b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
rename to base/console/src/com/netscape/certsrv/common/ConfigConstants.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/Constants.java b/base/console/src/com/netscape/certsrv/common/Constants.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/Constants.java
rename to base/console/src/com/netscape/certsrv/common/Constants.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/DestDef.java b/base/console/src/com/netscape/certsrv/common/DestDef.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/DestDef.java
rename to base/console/src/com/netscape/certsrv/common/DestDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/NameValuePair.java b/base/console/src/com/netscape/certsrv/common/NameValuePair.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/NameValuePair.java
rename to base/console/src/com/netscape/certsrv/common/NameValuePair.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/NameValuePairs.java b/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
rename to base/console/src/com/netscape/certsrv/common/NameValuePairs.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/OpDef.java b/base/console/src/com/netscape/certsrv/common/OpDef.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/OpDef.java
rename to base/console/src/com/netscape/certsrv/common/OpDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/PrefixDef.java b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/PrefixDef.java
rename to base/console/src/com/netscape/certsrv/common/PrefixDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/ScopeDef.java b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/ScopeDef.java
rename to base/console/src/com/netscape/certsrv/common/ScopeDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/TaskId.java b/base/console/src/com/netscape/certsrv/common/TaskId.java
similarity index 100%
rename from pki/base/console/src/com/netscape/certsrv/common/TaskId.java
rename to base/console/src/com/netscape/certsrv/common/TaskId.java
diff --git a/pki/base/console/templates/CMakeLists.txt b/base/console/templates/CMakeLists.txt
similarity index 100%
rename from pki/base/console/templates/CMakeLists.txt
rename to base/console/templates/CMakeLists.txt
diff --git a/pki/base/console/templates/pki_console_wrapper b/base/console/templates/pki_console_wrapper
similarity index 100%
rename from pki/base/console/templates/pki_console_wrapper
rename to base/console/templates/pki_console_wrapper
diff --git a/pki/base/java-tools/CMakeLists.txt b/base/java-tools/CMakeLists.txt
similarity index 100%
rename from pki/base/java-tools/CMakeLists.txt
rename to base/java-tools/CMakeLists.txt
diff --git a/pki/base/java-tools/LICENSE b/base/java-tools/LICENSE
similarity index 100%
rename from pki/base/java-tools/LICENSE
rename to base/java-tools/LICENSE
diff --git a/pki/base/java-tools/doc/README b/base/java-tools/doc/README
similarity index 100%
rename from pki/base/java-tools/doc/README
rename to base/java-tools/doc/README
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
similarity index 100%
rename from pki/base/java-tools/src/CMakeLists.txt
rename to base/java-tools/src/CMakeLists.txt
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java b/base/java-tools/src/com/netscape/cmstools/AtoB.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/AtoB.java
rename to base/java-tools/src/com/netscape/cmstools/AtoB.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
rename to base/java-tools/src/com/netscape/cmstools/AuditVerify.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java b/base/java-tools/src/com/netscape/cmstools/BtoA.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/BtoA.java
rename to base/java-tools/src/com/netscape/cmstools/BtoA.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
rename to base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
rename to base/java-tools/src/com/netscape/cmstools/CMCRequest.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java b/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
rename to base/java-tools/src/com/netscape/cmstools/CMCResponse.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
rename to base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
rename to base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg b/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
rename to base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java
rename to base/java-tools/src/com/netscape/cmstools/DRMTool.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
rename to base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
rename to base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
rename to base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
rename to base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java
rename to base/java-tools/src/com/netscape/cmstools/HttpClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
rename to base/java-tools/src/com/netscape/cmstools/OCSPClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
rename to base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
rename to base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
rename to base/java-tools/src/com/netscape/cmstools/PasswordCache.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
rename to base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
rename to base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
rename to base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java b/base/java-tools/src/com/netscape/cmstools/TokenInfo.java
similarity index 100%
rename from pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java
rename to base/java-tools/src/com/netscape/cmstools/TokenInfo.java
diff --git a/pki/base/java-tools/templates/CMakeLists.txt b/base/java-tools/templates/CMakeLists.txt
similarity index 100%
rename from pki/base/java-tools/templates/CMakeLists.txt
rename to base/java-tools/templates/CMakeLists.txt
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
similarity index 100%
rename from pki/base/java-tools/templates/pki_java_command_wrapper.in
rename to base/java-tools/templates/pki_java_command_wrapper.in
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
similarity index 100%
rename from pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
rename to base/java-tools/templates/pretty_print_cert_command_wrapper.in
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
similarity index 100%
rename from pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
rename to base/java-tools/templates/pretty_print_crl_command_wrapper.in
diff --git a/pki/base/kra/CMakeLists.txt b/base/kra/CMakeLists.txt
similarity index 100%
rename from pki/base/kra/CMakeLists.txt
rename to base/kra/CMakeLists.txt
diff --git a/pki/base/kra/LICENSE b/base/kra/LICENSE
similarity index 100%
rename from pki/base/kra/LICENSE
rename to base/kra/LICENSE
diff --git a/pki/base/kra/setup/CMakeLists.txt b/base/kra/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/kra/setup/CMakeLists.txt
rename to base/kra/setup/CMakeLists.txt
diff --git a/pki/base/kra/setup/registry_instance b/base/kra/setup/registry_instance
similarity index 100%
rename from pki/base/kra/setup/registry_instance
rename to base/kra/setup/registry_instance
diff --git a/pki/base/kra/shared/conf/CMakeLists.txt b/base/kra/shared/conf/CMakeLists.txt
similarity index 100%
rename from pki/base/kra/shared/conf/CMakeLists.txt
rename to base/kra/shared/conf/CMakeLists.txt
diff --git a/pki/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in
similarity index 100%
rename from pki/base/kra/shared/conf/CS.cfg.in
rename to base/kra/shared/conf/CS.cfg.in
diff --git a/pki/base/kra/shared/conf/acl.ldif b/base/kra/shared/conf/acl.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/acl.ldif
rename to base/kra/shared/conf/acl.ldif
diff --git a/pki/base/kra/shared/conf/catalina.policy b/base/kra/shared/conf/catalina.policy
similarity index 100%
rename from pki/base/kra/shared/conf/catalina.policy
rename to base/kra/shared/conf/catalina.policy
diff --git a/pki/base/kra/shared/conf/catalina.properties b/base/kra/shared/conf/catalina.properties
similarity index 100%
rename from pki/base/kra/shared/conf/catalina.properties
rename to base/kra/shared/conf/catalina.properties
diff --git a/pki/base/kra/shared/conf/context.xml b/base/kra/shared/conf/context.xml
similarity index 100%
rename from pki/base/kra/shared/conf/context.xml
rename to base/kra/shared/conf/context.xml
diff --git a/pki/base/kra/shared/conf/database.ldif b/base/kra/shared/conf/database.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/database.ldif
rename to base/kra/shared/conf/database.ldif
diff --git a/pki/base/kra/shared/conf/db.ldif b/base/kra/shared/conf/db.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/db.ldif
rename to base/kra/shared/conf/db.ldif
diff --git a/pki/base/kra/shared/conf/index.ldif b/base/kra/shared/conf/index.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/index.ldif
rename to base/kra/shared/conf/index.ldif
diff --git a/pki/base/kra/shared/conf/jk2.manifest b/base/kra/shared/conf/jk2.manifest
similarity index 100%
rename from pki/base/kra/shared/conf/jk2.manifest
rename to base/kra/shared/conf/jk2.manifest
diff --git a/pki/base/kra/shared/conf/jk2.properties b/base/kra/shared/conf/jk2.properties
similarity index 100%
rename from pki/base/kra/shared/conf/jk2.properties
rename to base/kra/shared/conf/jk2.properties
diff --git a/pki/base/kra/shared/conf/jkconf.ant.xml b/base/kra/shared/conf/jkconf.ant.xml
similarity index 100%
rename from pki/base/kra/shared/conf/jkconf.ant.xml
rename to base/kra/shared/conf/jkconf.ant.xml
diff --git a/pki/base/kra/shared/conf/jkconfig.manifest b/base/kra/shared/conf/jkconfig.manifest
similarity index 100%
rename from pki/base/kra/shared/conf/jkconfig.manifest
rename to base/kra/shared/conf/jkconfig.manifest
diff --git a/pki/base/kra/shared/conf/logging.properties b/base/kra/shared/conf/logging.properties
similarity index 100%
rename from pki/base/kra/shared/conf/logging.properties
rename to base/kra/shared/conf/logging.properties
diff --git a/pki/base/kra/shared/conf/manager.ldif b/base/kra/shared/conf/manager.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/manager.ldif
rename to base/kra/shared/conf/manager.ldif
diff --git a/pki/base/kra/shared/conf/schema.ldif b/base/kra/shared/conf/schema.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/schema.ldif
rename to base/kra/shared/conf/schema.ldif
diff --git a/pki/base/kra/shared/conf/server-minimal.xml b/base/kra/shared/conf/server-minimal.xml
similarity index 100%
rename from pki/base/kra/shared/conf/server-minimal.xml
rename to base/kra/shared/conf/server-minimal.xml
diff --git a/pki/base/kra/shared/conf/server.xml b/base/kra/shared/conf/server.xml
similarity index 100%
rename from pki/base/kra/shared/conf/server.xml
rename to base/kra/shared/conf/server.xml
diff --git a/pki/base/kra/shared/conf/serverCert.profile b/base/kra/shared/conf/serverCert.profile
similarity index 100%
rename from pki/base/kra/shared/conf/serverCert.profile
rename to base/kra/shared/conf/serverCert.profile
diff --git a/pki/base/kra/shared/conf/serverCertNick.conf b/base/kra/shared/conf/serverCertNick.conf
similarity index 100%
rename from pki/base/kra/shared/conf/serverCertNick.conf
rename to base/kra/shared/conf/serverCertNick.conf
diff --git a/pki/base/kra/shared/conf/shm.manifest b/base/kra/shared/conf/shm.manifest
similarity index 100%
rename from pki/base/kra/shared/conf/shm.manifest
rename to base/kra/shared/conf/shm.manifest
diff --git a/pki/base/kra/shared/conf/storageCert.profile b/base/kra/shared/conf/storageCert.profile
similarity index 100%
rename from pki/base/kra/shared/conf/storageCert.profile
rename to base/kra/shared/conf/storageCert.profile
diff --git a/pki/base/kra/shared/conf/subsystemCert.profile b/base/kra/shared/conf/subsystemCert.profile
similarity index 100%
rename from pki/base/kra/shared/conf/subsystemCert.profile
rename to base/kra/shared/conf/subsystemCert.profile
diff --git a/pki/base/kra/shared/conf/tomcat-jk2.manifest b/base/kra/shared/conf/tomcat-jk2.manifest
similarity index 100%
rename from pki/base/kra/shared/conf/tomcat-jk2.manifest
rename to base/kra/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/kra/shared/conf/tomcat-users.xml b/base/kra/shared/conf/tomcat-users.xml
similarity index 100%
rename from pki/base/kra/shared/conf/tomcat-users.xml
rename to base/kra/shared/conf/tomcat-users.xml
diff --git a/pki/base/kra/shared/conf/tomcat6.conf b/base/kra/shared/conf/tomcat6.conf
similarity index 100%
rename from pki/base/kra/shared/conf/tomcat6.conf
rename to base/kra/shared/conf/tomcat6.conf
diff --git a/pki/base/kra/shared/conf/transportCert.profile b/base/kra/shared/conf/transportCert.profile
similarity index 100%
rename from pki/base/kra/shared/conf/transportCert.profile
rename to base/kra/shared/conf/transportCert.profile
diff --git a/pki/base/kra/shared/conf/uriworkermap.properties b/base/kra/shared/conf/uriworkermap.properties
similarity index 100%
rename from pki/base/kra/shared/conf/uriworkermap.properties
rename to base/kra/shared/conf/uriworkermap.properties
diff --git a/pki/base/kra/shared/conf/vlv.ldif b/base/kra/shared/conf/vlv.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/vlv.ldif
rename to base/kra/shared/conf/vlv.ldif
diff --git a/pki/base/kra/shared/conf/vlvtasks.ldif b/base/kra/shared/conf/vlvtasks.ldif
similarity index 100%
rename from pki/base/kra/shared/conf/vlvtasks.ldif
rename to base/kra/shared/conf/vlvtasks.ldif
diff --git a/pki/base/kra/shared/conf/web.xml b/base/kra/shared/conf/web.xml
similarity index 100%
rename from pki/base/kra/shared/conf/web.xml
rename to base/kra/shared/conf/web.xml
diff --git a/pki/base/kra/shared/conf/workers.properties b/base/kra/shared/conf/workers.properties
similarity index 100%
rename from pki/base/kra/shared/conf/workers.properties
rename to base/kra/shared/conf/workers.properties
diff --git a/pki/base/kra/shared/conf/workers.properties.minimal b/base/kra/shared/conf/workers.properties.minimal
similarity index 100%
rename from pki/base/kra/shared/conf/workers.properties.minimal
rename to base/kra/shared/conf/workers.properties.minimal
diff --git a/pki/base/kra/shared/conf/workers2.properties b/base/kra/shared/conf/workers2.properties
similarity index 100%
rename from pki/base/kra/shared/conf/workers2.properties
rename to base/kra/shared/conf/workers2.properties
diff --git a/pki/base/kra/shared/conf/workers2.properties.minimal b/base/kra/shared/conf/workers2.properties.minimal
similarity index 100%
rename from pki/base/kra/shared/conf/workers2.properties.minimal
rename to base/kra/shared/conf/workers2.properties.minimal
diff --git a/pki/base/kra/shared/etc/init.d/pki-krad b/base/kra/shared/etc/init.d/pki-krad
similarity index 100%
rename from pki/base/kra/shared/etc/init.d/pki-krad
rename to base/kra/shared/etc/init.d/pki-krad
diff --git a/pki/base/kra/shared/lib/systemd/system/pki-krad.target b/base/kra/shared/lib/systemd/system/pki-krad.target
similarity index 100%
rename from pki/base/kra/shared/lib/systemd/system/pki-krad.target
rename to base/kra/shared/lib/systemd/system/pki-krad.target
diff --git a/pki/base/kra/shared/lib/systemd/system/pki-krad@.service b/base/kra/shared/lib/systemd/system/pki-krad@.service
similarity index 100%
rename from pki/base/kra/shared/lib/systemd/system/pki-krad@.service
rename to base/kra/shared/lib/systemd/system/pki-krad@.service
diff --git a/pki/base/kra/shared/webapps/ROOT/WEB-INF/web.xml b/base/kra/shared/webapps/ROOT/WEB-INF/web.xml
similarity index 100%
rename from pki/base/kra/shared/webapps/ROOT/WEB-INF/web.xml
rename to base/kra/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/kra/shared/webapps/ROOT/index.jsp b/base/kra/shared/webapps/ROOT/index.jsp
similarity index 100%
rename from pki/base/kra/shared/webapps/ROOT/index.jsp
rename to base/kra/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties b/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
similarity index 100%
rename from pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
rename to base/kra/shared/webapps/kra/WEB-INF/velocity.properties
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
similarity index 100%
rename from pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
rename to base/kra/shared/webapps/kra/WEB-INF/web.xml
diff --git a/pki/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
similarity index 100%
rename from pki/base/kra/src/CMakeLists.txt
rename to base/kra/src/CMakeLists.txt
diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/EncryptionUnit.java
rename to base/kra/src/com/netscape/kra/EncryptionUnit.java
diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/EnrollmentService.java
rename to base/kra/src/com/netscape/kra/EnrollmentService.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/KRANotify.java
rename to base/kra/src/com/netscape/kra/KRANotify.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java b/base/kra/src/com/netscape/kra/KRAPolicy.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/KRAPolicy.java
rename to base/kra/src/com/netscape/kra/KRAPolicy.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRAService.java b/base/kra/src/com/netscape/kra/KRAService.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/KRAService.java
rename to base/kra/src/com/netscape/kra/KRAService.java
diff --git a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
rename to base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
diff --git a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
rename to base/kra/src/com/netscape/kra/NetkeyKeygenService.java
diff --git a/pki/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/RecoveryService.java
rename to base/kra/src/com/netscape/kra/RecoveryService.java
diff --git a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java
rename to base/kra/src/com/netscape/kra/StorageKeyUnit.java
diff --git a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
rename to base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
diff --git a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/base/kra/src/com/netscape/kra/TransportKeyUnit.java
similarity index 100%
rename from pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java
rename to base/kra/src/com/netscape/kra/TransportKeyUnit.java
diff --git a/pki/base/migrate/41ToTxt/classes/CMS41LdifParser.class b/base/migrate/41ToTxt/classes/CMS41LdifParser.class
similarity index 100%
rename from pki/base/migrate/41ToTxt/classes/CMS41LdifParser.class
rename to base/migrate/41ToTxt/classes/CMS41LdifParser.class
diff --git a/pki/base/migrate/41ToTxt/classes/Main.class b/base/migrate/41ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/41ToTxt/classes/Main.class
rename to base/migrate/41ToTxt/classes/Main.class
diff --git a/pki/base/migrate/41ToTxt/run.bat b/base/migrate/41ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/41ToTxt/run.bat
rename to base/migrate/41ToTxt/run.bat
diff --git a/pki/base/migrate/41ToTxt/run.sh b/base/migrate/41ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/41ToTxt/run.sh
rename to base/migrate/41ToTxt/run.sh
diff --git a/pki/base/migrate/41ToTxt/src/Main.java b/base/migrate/41ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/41ToTxt/src/Main.java
rename to base/migrate/41ToTxt/src/Main.java
diff --git a/pki/base/migrate/41ToTxt/src/compile.bat b/base/migrate/41ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/41ToTxt/src/compile.bat
rename to base/migrate/41ToTxt/src/compile.bat
diff --git a/pki/base/migrate/41ToTxt/src/compile.sh b/base/migrate/41ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/41ToTxt/src/compile.sh
rename to base/migrate/41ToTxt/src/compile.sh
diff --git a/pki/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class b/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
rename to base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
diff --git a/pki/base/migrate/42SP2ToTxt/classes/Main.class b/base/migrate/42SP2ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/classes/Main.class
rename to base/migrate/42SP2ToTxt/classes/Main.class
diff --git a/pki/base/migrate/42SP2ToTxt/run.bat b/base/migrate/42SP2ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/run.bat
rename to base/migrate/42SP2ToTxt/run.bat
diff --git a/pki/base/migrate/42SP2ToTxt/run.sh b/base/migrate/42SP2ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/run.sh
rename to base/migrate/42SP2ToTxt/run.sh
diff --git a/pki/base/migrate/42SP2ToTxt/src/Main.java b/base/migrate/42SP2ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/src/Main.java
rename to base/migrate/42SP2ToTxt/src/Main.java
diff --git a/pki/base/migrate/42SP2ToTxt/src/compile.bat b/base/migrate/42SP2ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/src/compile.bat
rename to base/migrate/42SP2ToTxt/src/compile.bat
diff --git a/pki/base/migrate/42SP2ToTxt/src/compile.sh b/base/migrate/42SP2ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/42SP2ToTxt/src/compile.sh
rename to base/migrate/42SP2ToTxt/src/compile.sh
diff --git a/pki/base/migrate/42ToTxt/classes/CMS42LdifParser.class b/base/migrate/42ToTxt/classes/CMS42LdifParser.class
similarity index 100%
rename from pki/base/migrate/42ToTxt/classes/CMS42LdifParser.class
rename to base/migrate/42ToTxt/classes/CMS42LdifParser.class
diff --git a/pki/base/migrate/42ToTxt/classes/Main.class b/base/migrate/42ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/42ToTxt/classes/Main.class
rename to base/migrate/42ToTxt/classes/Main.class
diff --git a/pki/base/migrate/42ToTxt/run.bat b/base/migrate/42ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/42ToTxt/run.bat
rename to base/migrate/42ToTxt/run.bat
diff --git a/pki/base/migrate/42ToTxt/run.sh b/base/migrate/42ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/42ToTxt/run.sh
rename to base/migrate/42ToTxt/run.sh
diff --git a/pki/base/migrate/42ToTxt/src/Main.java b/base/migrate/42ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/42ToTxt/src/Main.java
rename to base/migrate/42ToTxt/src/Main.java
diff --git a/pki/base/migrate/42ToTxt/src/compile.bat b/base/migrate/42ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/42ToTxt/src/compile.bat
rename to base/migrate/42ToTxt/src/compile.bat
diff --git a/pki/base/migrate/42ToTxt/src/compile.sh b/base/migrate/42ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/42ToTxt/src/compile.sh
rename to base/migrate/42ToTxt/src/compile.sh
diff --git a/pki/base/migrate/45ToTxt/classes/CMS45LdifParser.class b/base/migrate/45ToTxt/classes/CMS45LdifParser.class
similarity index 100%
rename from pki/base/migrate/45ToTxt/classes/CMS45LdifParser.class
rename to base/migrate/45ToTxt/classes/CMS45LdifParser.class
diff --git a/pki/base/migrate/45ToTxt/classes/Main.class b/base/migrate/45ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/45ToTxt/classes/Main.class
rename to base/migrate/45ToTxt/classes/Main.class
diff --git a/pki/base/migrate/45ToTxt/run.bat b/base/migrate/45ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/45ToTxt/run.bat
rename to base/migrate/45ToTxt/run.bat
diff --git a/pki/base/migrate/45ToTxt/run.sh b/base/migrate/45ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/45ToTxt/run.sh
rename to base/migrate/45ToTxt/run.sh
diff --git a/pki/base/migrate/45ToTxt/src/Main.java b/base/migrate/45ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/45ToTxt/src/Main.java
rename to base/migrate/45ToTxt/src/Main.java
diff --git a/pki/base/migrate/45ToTxt/src/compile.bat b/base/migrate/45ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/45ToTxt/src/compile.bat
rename to base/migrate/45ToTxt/src/compile.bat
diff --git a/pki/base/migrate/45ToTxt/src/compile.sh b/base/migrate/45ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/45ToTxt/src/compile.sh
rename to base/migrate/45ToTxt/src/compile.sh
diff --git a/pki/base/migrate/47ToTxt/classes/CMS47LdifParser.class b/base/migrate/47ToTxt/classes/CMS47LdifParser.class
similarity index 100%
rename from pki/base/migrate/47ToTxt/classes/CMS47LdifParser.class
rename to base/migrate/47ToTxt/classes/CMS47LdifParser.class
diff --git a/pki/base/migrate/47ToTxt/classes/Main.class b/base/migrate/47ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/47ToTxt/classes/Main.class
rename to base/migrate/47ToTxt/classes/Main.class
diff --git a/pki/base/migrate/47ToTxt/run.bat b/base/migrate/47ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/47ToTxt/run.bat
rename to base/migrate/47ToTxt/run.bat
diff --git a/pki/base/migrate/47ToTxt/run.sh b/base/migrate/47ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/47ToTxt/run.sh
rename to base/migrate/47ToTxt/run.sh
diff --git a/pki/base/migrate/47ToTxt/src/Main.java b/base/migrate/47ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/47ToTxt/src/Main.java
rename to base/migrate/47ToTxt/src/Main.java
diff --git a/pki/base/migrate/47ToTxt/src/compile.bat b/base/migrate/47ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/47ToTxt/src/compile.bat
rename to base/migrate/47ToTxt/src/compile.bat
diff --git a/pki/base/migrate/47ToTxt/src/compile.sh b/base/migrate/47ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/47ToTxt/src/compile.sh
rename to base/migrate/47ToTxt/src/compile.sh
diff --git a/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class b/base/migrate/60ToTxt/classes/CMS60LdifParser.class
similarity index 100%
rename from pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class
rename to base/migrate/60ToTxt/classes/CMS60LdifParser.class
diff --git a/pki/base/migrate/60ToTxt/classes/Main.class b/base/migrate/60ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/60ToTxt/classes/Main.class
rename to base/migrate/60ToTxt/classes/Main.class
diff --git a/pki/base/migrate/60ToTxt/run.bat b/base/migrate/60ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/60ToTxt/run.bat
rename to base/migrate/60ToTxt/run.bat
diff --git a/pki/base/migrate/60ToTxt/run.sh b/base/migrate/60ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/60ToTxt/run.sh
rename to base/migrate/60ToTxt/run.sh
diff --git a/pki/base/migrate/60ToTxt/src/Main.java b/base/migrate/60ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/60ToTxt/src/Main.java
rename to base/migrate/60ToTxt/src/Main.java
diff --git a/pki/base/migrate/60ToTxt/src/compile.bat b/base/migrate/60ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/60ToTxt/src/compile.bat
rename to base/migrate/60ToTxt/src/compile.bat
diff --git a/pki/base/migrate/60ToTxt/src/compile.sh b/base/migrate/60ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/60ToTxt/src/compile.sh
rename to base/migrate/60ToTxt/src/compile.sh
diff --git a/pki/base/migrate/61ToTxt/classes/CMS61LdifParser.class b/base/migrate/61ToTxt/classes/CMS61LdifParser.class
similarity index 100%
rename from pki/base/migrate/61ToTxt/classes/CMS61LdifParser.class
rename to base/migrate/61ToTxt/classes/CMS61LdifParser.class
diff --git a/pki/base/migrate/61ToTxt/classes/Main.class b/base/migrate/61ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/61ToTxt/classes/Main.class
rename to base/migrate/61ToTxt/classes/Main.class
diff --git a/pki/base/migrate/61ToTxt/run.bat b/base/migrate/61ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/61ToTxt/run.bat
rename to base/migrate/61ToTxt/run.bat
diff --git a/pki/base/migrate/61ToTxt/run.sh b/base/migrate/61ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/61ToTxt/run.sh
rename to base/migrate/61ToTxt/run.sh
diff --git a/pki/base/migrate/61ToTxt/src/Main.java b/base/migrate/61ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/61ToTxt/src/Main.java
rename to base/migrate/61ToTxt/src/Main.java
diff --git a/pki/base/migrate/61ToTxt/src/compile.bat b/base/migrate/61ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/61ToTxt/src/compile.bat
rename to base/migrate/61ToTxt/src/compile.bat
diff --git a/pki/base/migrate/61ToTxt/src/compile.sh b/base/migrate/61ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/61ToTxt/src/compile.sh
rename to base/migrate/61ToTxt/src/compile.sh
diff --git a/pki/base/migrate/62ToTxt/classes/CMS62LdifParser.class b/base/migrate/62ToTxt/classes/CMS62LdifParser.class
similarity index 100%
rename from pki/base/migrate/62ToTxt/classes/CMS62LdifParser.class
rename to base/migrate/62ToTxt/classes/CMS62LdifParser.class
diff --git a/pki/base/migrate/62ToTxt/classes/Main.class b/base/migrate/62ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/62ToTxt/classes/Main.class
rename to base/migrate/62ToTxt/classes/Main.class
diff --git a/pki/base/migrate/62ToTxt/run.bat b/base/migrate/62ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/62ToTxt/run.bat
rename to base/migrate/62ToTxt/run.bat
diff --git a/pki/base/migrate/62ToTxt/run.sh b/base/migrate/62ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/62ToTxt/run.sh
rename to base/migrate/62ToTxt/run.sh
diff --git a/pki/base/migrate/62ToTxt/src/Main.java b/base/migrate/62ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/62ToTxt/src/Main.java
rename to base/migrate/62ToTxt/src/Main.java
diff --git a/pki/base/migrate/62ToTxt/src/compile.bat b/base/migrate/62ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/62ToTxt/src/compile.bat
rename to base/migrate/62ToTxt/src/compile.bat
diff --git a/pki/base/migrate/62ToTxt/src/compile.sh b/base/migrate/62ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/62ToTxt/src/compile.sh
rename to base/migrate/62ToTxt/src/compile.sh
diff --git a/pki/base/migrate/63ToTxt/classes/CMS63LdifParser.class b/base/migrate/63ToTxt/classes/CMS63LdifParser.class
similarity index 100%
rename from pki/base/migrate/63ToTxt/classes/CMS63LdifParser.class
rename to base/migrate/63ToTxt/classes/CMS63LdifParser.class
diff --git a/pki/base/migrate/63ToTxt/classes/Main.class b/base/migrate/63ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/63ToTxt/classes/Main.class
rename to base/migrate/63ToTxt/classes/Main.class
diff --git a/pki/base/migrate/63ToTxt/run.bat b/base/migrate/63ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/63ToTxt/run.bat
rename to base/migrate/63ToTxt/run.bat
diff --git a/pki/base/migrate/63ToTxt/run.sh b/base/migrate/63ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/63ToTxt/run.sh
rename to base/migrate/63ToTxt/run.sh
diff --git a/pki/base/migrate/63ToTxt/src/Main.java b/base/migrate/63ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/63ToTxt/src/Main.java
rename to base/migrate/63ToTxt/src/Main.java
diff --git a/pki/base/migrate/63ToTxt/src/compile.bat b/base/migrate/63ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/63ToTxt/src/compile.bat
rename to base/migrate/63ToTxt/src/compile.bat
diff --git a/pki/base/migrate/63ToTxt/src/compile.sh b/base/migrate/63ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/63ToTxt/src/compile.sh
rename to base/migrate/63ToTxt/src/compile.sh
diff --git a/pki/base/migrate/70ToTxt/classes/CMS70LdifParser.class b/base/migrate/70ToTxt/classes/CMS70LdifParser.class
similarity index 100%
rename from pki/base/migrate/70ToTxt/classes/CMS70LdifParser.class
rename to base/migrate/70ToTxt/classes/CMS70LdifParser.class
diff --git a/pki/base/migrate/70ToTxt/classes/Main.class b/base/migrate/70ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/70ToTxt/classes/Main.class
rename to base/migrate/70ToTxt/classes/Main.class
diff --git a/pki/base/migrate/70ToTxt/run.bat b/base/migrate/70ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/70ToTxt/run.bat
rename to base/migrate/70ToTxt/run.bat
diff --git a/pki/base/migrate/70ToTxt/run.sh b/base/migrate/70ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/70ToTxt/run.sh
rename to base/migrate/70ToTxt/run.sh
diff --git a/pki/base/migrate/70ToTxt/src/Main.java b/base/migrate/70ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/70ToTxt/src/Main.java
rename to base/migrate/70ToTxt/src/Main.java
diff --git a/pki/base/migrate/70ToTxt/src/compile.bat b/base/migrate/70ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/70ToTxt/src/compile.bat
rename to base/migrate/70ToTxt/src/compile.bat
diff --git a/pki/base/migrate/70ToTxt/src/compile.sh b/base/migrate/70ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/70ToTxt/src/compile.sh
rename to base/migrate/70ToTxt/src/compile.sh
diff --git a/pki/base/migrate/71ToTxt/classes/CMS71LdifParser.class b/base/migrate/71ToTxt/classes/CMS71LdifParser.class
similarity index 100%
rename from pki/base/migrate/71ToTxt/classes/CMS71LdifParser.class
rename to base/migrate/71ToTxt/classes/CMS71LdifParser.class
diff --git a/pki/base/migrate/71ToTxt/classes/Main.class b/base/migrate/71ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/71ToTxt/classes/Main.class
rename to base/migrate/71ToTxt/classes/Main.class
diff --git a/pki/base/migrate/71ToTxt/run.bat b/base/migrate/71ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/71ToTxt/run.bat
rename to base/migrate/71ToTxt/run.bat
diff --git a/pki/base/migrate/71ToTxt/run.sh b/base/migrate/71ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/71ToTxt/run.sh
rename to base/migrate/71ToTxt/run.sh
diff --git a/pki/base/migrate/71ToTxt/src/Main.java b/base/migrate/71ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/71ToTxt/src/Main.java
rename to base/migrate/71ToTxt/src/Main.java
diff --git a/pki/base/migrate/71ToTxt/src/compile.bat b/base/migrate/71ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/71ToTxt/src/compile.bat
rename to base/migrate/71ToTxt/src/compile.bat
diff --git a/pki/base/migrate/71ToTxt/src/compile.sh b/base/migrate/71ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/71ToTxt/src/compile.sh
rename to base/migrate/71ToTxt/src/compile.sh
diff --git a/pki/base/migrate/72ToTxt/classes/CMS72LdifParser.class b/base/migrate/72ToTxt/classes/CMS72LdifParser.class
similarity index 100%
rename from pki/base/migrate/72ToTxt/classes/CMS72LdifParser.class
rename to base/migrate/72ToTxt/classes/CMS72LdifParser.class
diff --git a/pki/base/migrate/72ToTxt/classes/Main.class b/base/migrate/72ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/72ToTxt/classes/Main.class
rename to base/migrate/72ToTxt/classes/Main.class
diff --git a/pki/base/migrate/72ToTxt/run.bat b/base/migrate/72ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/72ToTxt/run.bat
rename to base/migrate/72ToTxt/run.bat
diff --git a/pki/base/migrate/72ToTxt/run.sh b/base/migrate/72ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/72ToTxt/run.sh
rename to base/migrate/72ToTxt/run.sh
diff --git a/pki/base/migrate/72ToTxt/src/Main.java b/base/migrate/72ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/72ToTxt/src/Main.java
rename to base/migrate/72ToTxt/src/Main.java
diff --git a/pki/base/migrate/72ToTxt/src/compile.bat b/base/migrate/72ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/72ToTxt/src/compile.bat
rename to base/migrate/72ToTxt/src/compile.bat
diff --git a/pki/base/migrate/72ToTxt/src/compile.sh b/base/migrate/72ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/72ToTxt/src/compile.sh
rename to base/migrate/72ToTxt/src/compile.sh
diff --git a/pki/base/migrate/73ToTxt/classes/CMS73LdifParser.class b/base/migrate/73ToTxt/classes/CMS73LdifParser.class
similarity index 100%
rename from pki/base/migrate/73ToTxt/classes/CMS73LdifParser.class
rename to base/migrate/73ToTxt/classes/CMS73LdifParser.class
diff --git a/pki/base/migrate/73ToTxt/classes/Main.class b/base/migrate/73ToTxt/classes/Main.class
similarity index 100%
rename from pki/base/migrate/73ToTxt/classes/Main.class
rename to base/migrate/73ToTxt/classes/Main.class
diff --git a/pki/base/migrate/73ToTxt/run.bat b/base/migrate/73ToTxt/run.bat
similarity index 100%
rename from pki/base/migrate/73ToTxt/run.bat
rename to base/migrate/73ToTxt/run.bat
diff --git a/pki/base/migrate/73ToTxt/run.sh b/base/migrate/73ToTxt/run.sh
similarity index 100%
rename from pki/base/migrate/73ToTxt/run.sh
rename to base/migrate/73ToTxt/run.sh
diff --git a/pki/base/migrate/73ToTxt/src/Main.java b/base/migrate/73ToTxt/src/Main.java
similarity index 100%
rename from pki/base/migrate/73ToTxt/src/Main.java
rename to base/migrate/73ToTxt/src/Main.java
diff --git a/pki/base/migrate/73ToTxt/src/compile.bat b/base/migrate/73ToTxt/src/compile.bat
similarity index 100%
rename from pki/base/migrate/73ToTxt/src/compile.bat
rename to base/migrate/73ToTxt/src/compile.bat
diff --git a/pki/base/migrate/73ToTxt/src/compile.sh b/base/migrate/73ToTxt/src/compile.sh
similarity index 100%
rename from pki/base/migrate/73ToTxt/src/compile.sh
rename to base/migrate/73ToTxt/src/compile.sh
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.class b/base/migrate/80/MigrateSecurityDomain.class
similarity index 100%
rename from pki/base/migrate/80/MigrateSecurityDomain.class
rename to base/migrate/80/MigrateSecurityDomain.class
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/base/migrate/80/MigrateSecurityDomain.java
similarity index 100%
rename from pki/base/migrate/80/MigrateSecurityDomain.java
rename to base/migrate/80/MigrateSecurityDomain.java
diff --git a/pki/base/migrate/80/readme b/base/migrate/80/readme
similarity index 100%
rename from pki/base/migrate/80/readme
rename to base/migrate/80/readme
diff --git a/pki/base/migrate/80/schema-add.ldif b/base/migrate/80/schema-add.ldif
similarity index 100%
rename from pki/base/migrate/80/schema-add.ldif
rename to base/migrate/80/schema-add.ldif
diff --git a/pki/base/migrate/CMakeLists.txt b/base/migrate/CMakeLists.txt
similarity index 100%
rename from pki/base/migrate/CMakeLists.txt
rename to base/migrate/CMakeLists.txt
diff --git a/pki/base/migrate/LICENSE b/base/migrate/LICENSE
similarity index 100%
rename from pki/base/migrate/LICENSE
rename to base/migrate/LICENSE
diff --git a/pki/base/migrate/TpsTo80/Makefile b/base/migrate/TpsTo80/Makefile
similarity index 100%
rename from pki/base/migrate/TpsTo80/Makefile
rename to base/migrate/TpsTo80/Makefile
diff --git a/pki/base/migrate/TpsTo80/linux/migrateTPSData.i386 b/base/migrate/TpsTo80/linux/migrateTPSData.i386
similarity index 100%
rename from pki/base/migrate/TpsTo80/linux/migrateTPSData.i386
rename to base/migrate/TpsTo80/linux/migrateTPSData.i386
diff --git a/pki/base/migrate/TpsTo80/linux/migrateTPSData.x86_64 b/base/migrate/TpsTo80/linux/migrateTPSData.x86_64
similarity index 100%
rename from pki/base/migrate/TpsTo80/linux/migrateTPSData.x86_64
rename to base/migrate/TpsTo80/linux/migrateTPSData.x86_64
diff --git a/pki/base/migrate/TpsTo80/migrateTPSData.c b/base/migrate/TpsTo80/migrateTPSData.c
similarity index 100%
rename from pki/base/migrate/TpsTo80/migrateTPSData.c
rename to base/migrate/TpsTo80/migrateTPSData.c
diff --git a/pki/base/migrate/TpsTo80/readme b/base/migrate/TpsTo80/readme
similarity index 100%
rename from pki/base/migrate/TpsTo80/readme
rename to base/migrate/TpsTo80/readme
diff --git a/pki/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc b/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
similarity index 100%
rename from pki/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
rename to base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
diff --git a/pki/base/migrate/TxtTo60/classes/CMS60LdifParser.class b/base/migrate/TxtTo60/classes/CMS60LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo60/classes/CMS60LdifParser.class
rename to base/migrate/TxtTo60/classes/CMS60LdifParser.class
diff --git a/pki/base/migrate/TxtTo60/classes/DummyAuthManager.class b/base/migrate/TxtTo60/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo60/classes/DummyAuthManager.class
rename to base/migrate/TxtTo60/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo60/classes/Main.class b/base/migrate/TxtTo60/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo60/classes/Main.class
rename to base/migrate/TxtTo60/classes/Main.class
diff --git a/pki/base/migrate/TxtTo60/run.bat b/base/migrate/TxtTo60/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo60/run.bat
rename to base/migrate/TxtTo60/run.bat
diff --git a/pki/base/migrate/TxtTo60/run.sh b/base/migrate/TxtTo60/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo60/run.sh
rename to base/migrate/TxtTo60/run.sh
diff --git a/pki/base/migrate/TxtTo60/src/Main.java b/base/migrate/TxtTo60/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo60/src/Main.java
rename to base/migrate/TxtTo60/src/Main.java
diff --git a/pki/base/migrate/TxtTo60/src/compile.bat b/base/migrate/TxtTo60/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo60/src/compile.bat
rename to base/migrate/TxtTo60/src/compile.bat
diff --git a/pki/base/migrate/TxtTo60/src/compile.sh b/base/migrate/TxtTo60/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo60/src/compile.sh
rename to base/migrate/TxtTo60/src/compile.sh
diff --git a/pki/base/migrate/TxtTo61/classes/CMS61LdifParser.class b/base/migrate/TxtTo61/classes/CMS61LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo61/classes/CMS61LdifParser.class
rename to base/migrate/TxtTo61/classes/CMS61LdifParser.class
diff --git a/pki/base/migrate/TxtTo61/classes/DummyAuthManager.class b/base/migrate/TxtTo61/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo61/classes/DummyAuthManager.class
rename to base/migrate/TxtTo61/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo61/classes/Main.class b/base/migrate/TxtTo61/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo61/classes/Main.class
rename to base/migrate/TxtTo61/classes/Main.class
diff --git a/pki/base/migrate/TxtTo61/run.bat b/base/migrate/TxtTo61/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo61/run.bat
rename to base/migrate/TxtTo61/run.bat
diff --git a/pki/base/migrate/TxtTo61/run.sh b/base/migrate/TxtTo61/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo61/run.sh
rename to base/migrate/TxtTo61/run.sh
diff --git a/pki/base/migrate/TxtTo61/src/Main.java b/base/migrate/TxtTo61/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo61/src/Main.java
rename to base/migrate/TxtTo61/src/Main.java
diff --git a/pki/base/migrate/TxtTo61/src/compile.bat b/base/migrate/TxtTo61/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo61/src/compile.bat
rename to base/migrate/TxtTo61/src/compile.bat
diff --git a/pki/base/migrate/TxtTo61/src/compile.sh b/base/migrate/TxtTo61/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo61/src/compile.sh
rename to base/migrate/TxtTo61/src/compile.sh
diff --git a/pki/base/migrate/TxtTo62/classes/CMS62LdifParser.class b/base/migrate/TxtTo62/classes/CMS62LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo62/classes/CMS62LdifParser.class
rename to base/migrate/TxtTo62/classes/CMS62LdifParser.class
diff --git a/pki/base/migrate/TxtTo62/classes/DummyAuthManager.class b/base/migrate/TxtTo62/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo62/classes/DummyAuthManager.class
rename to base/migrate/TxtTo62/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo62/classes/Main.class b/base/migrate/TxtTo62/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo62/classes/Main.class
rename to base/migrate/TxtTo62/classes/Main.class
diff --git a/pki/base/migrate/TxtTo62/run.bat b/base/migrate/TxtTo62/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo62/run.bat
rename to base/migrate/TxtTo62/run.bat
diff --git a/pki/base/migrate/TxtTo62/run.sh b/base/migrate/TxtTo62/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo62/run.sh
rename to base/migrate/TxtTo62/run.sh
diff --git a/pki/base/migrate/TxtTo62/src/Main.java b/base/migrate/TxtTo62/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo62/src/Main.java
rename to base/migrate/TxtTo62/src/Main.java
diff --git a/pki/base/migrate/TxtTo62/src/compile.bat b/base/migrate/TxtTo62/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo62/src/compile.bat
rename to base/migrate/TxtTo62/src/compile.bat
diff --git a/pki/base/migrate/TxtTo62/src/compile.sh b/base/migrate/TxtTo62/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo62/src/compile.sh
rename to base/migrate/TxtTo62/src/compile.sh
diff --git a/pki/base/migrate/TxtTo70/classes/CMS70LdifParser.class b/base/migrate/TxtTo70/classes/CMS70LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo70/classes/CMS70LdifParser.class
rename to base/migrate/TxtTo70/classes/CMS70LdifParser.class
diff --git a/pki/base/migrate/TxtTo70/classes/DummyAuthManager.class b/base/migrate/TxtTo70/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo70/classes/DummyAuthManager.class
rename to base/migrate/TxtTo70/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo70/classes/Main.class b/base/migrate/TxtTo70/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo70/classes/Main.class
rename to base/migrate/TxtTo70/classes/Main.class
diff --git a/pki/base/migrate/TxtTo70/run.bat b/base/migrate/TxtTo70/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo70/run.bat
rename to base/migrate/TxtTo70/run.bat
diff --git a/pki/base/migrate/TxtTo70/run.sh b/base/migrate/TxtTo70/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo70/run.sh
rename to base/migrate/TxtTo70/run.sh
diff --git a/pki/base/migrate/TxtTo70/src/Main.java b/base/migrate/TxtTo70/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo70/src/Main.java
rename to base/migrate/TxtTo70/src/Main.java
diff --git a/pki/base/migrate/TxtTo70/src/compile.bat b/base/migrate/TxtTo70/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo70/src/compile.bat
rename to base/migrate/TxtTo70/src/compile.bat
diff --git a/pki/base/migrate/TxtTo70/src/compile.sh b/base/migrate/TxtTo70/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo70/src/compile.sh
rename to base/migrate/TxtTo70/src/compile.sh
diff --git a/pki/base/migrate/TxtTo71/classes/CMS71LdifParser.class b/base/migrate/TxtTo71/classes/CMS71LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo71/classes/CMS71LdifParser.class
rename to base/migrate/TxtTo71/classes/CMS71LdifParser.class
diff --git a/pki/base/migrate/TxtTo71/classes/DummyAuthManager.class b/base/migrate/TxtTo71/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo71/classes/DummyAuthManager.class
rename to base/migrate/TxtTo71/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo71/classes/Main.class b/base/migrate/TxtTo71/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo71/classes/Main.class
rename to base/migrate/TxtTo71/classes/Main.class
diff --git a/pki/base/migrate/TxtTo71/run.bat b/base/migrate/TxtTo71/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo71/run.bat
rename to base/migrate/TxtTo71/run.bat
diff --git a/pki/base/migrate/TxtTo71/run.sh b/base/migrate/TxtTo71/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo71/run.sh
rename to base/migrate/TxtTo71/run.sh
diff --git a/pki/base/migrate/TxtTo71/src/Main.java b/base/migrate/TxtTo71/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo71/src/Main.java
rename to base/migrate/TxtTo71/src/Main.java
diff --git a/pki/base/migrate/TxtTo71/src/compile.bat b/base/migrate/TxtTo71/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo71/src/compile.bat
rename to base/migrate/TxtTo71/src/compile.bat
diff --git a/pki/base/migrate/TxtTo71/src/compile.sh b/base/migrate/TxtTo71/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo71/src/compile.sh
rename to base/migrate/TxtTo71/src/compile.sh
diff --git a/pki/base/migrate/TxtTo72/classes/CMS72LdifParser.class b/base/migrate/TxtTo72/classes/CMS72LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo72/classes/CMS72LdifParser.class
rename to base/migrate/TxtTo72/classes/CMS72LdifParser.class
diff --git a/pki/base/migrate/TxtTo72/classes/DummyAuthManager.class b/base/migrate/TxtTo72/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo72/classes/DummyAuthManager.class
rename to base/migrate/TxtTo72/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo72/classes/Main.class b/base/migrate/TxtTo72/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo72/classes/Main.class
rename to base/migrate/TxtTo72/classes/Main.class
diff --git a/pki/base/migrate/TxtTo72/run.bat b/base/migrate/TxtTo72/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo72/run.bat
rename to base/migrate/TxtTo72/run.bat
diff --git a/pki/base/migrate/TxtTo72/run.sh b/base/migrate/TxtTo72/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo72/run.sh
rename to base/migrate/TxtTo72/run.sh
diff --git a/pki/base/migrate/TxtTo72/src/Main.java b/base/migrate/TxtTo72/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo72/src/Main.java
rename to base/migrate/TxtTo72/src/Main.java
diff --git a/pki/base/migrate/TxtTo72/src/compile.bat b/base/migrate/TxtTo72/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo72/src/compile.bat
rename to base/migrate/TxtTo72/src/compile.bat
diff --git a/pki/base/migrate/TxtTo72/src/compile.sh b/base/migrate/TxtTo72/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo72/src/compile.sh
rename to base/migrate/TxtTo72/src/compile.sh
diff --git a/pki/base/migrate/TxtTo73/classes/CMS73LdifParser.class b/base/migrate/TxtTo73/classes/CMS73LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo73/classes/CMS73LdifParser.class
rename to base/migrate/TxtTo73/classes/CMS73LdifParser.class
diff --git a/pki/base/migrate/TxtTo73/classes/DummyAuthManager.class b/base/migrate/TxtTo73/classes/DummyAuthManager.class
similarity index 100%
rename from pki/base/migrate/TxtTo73/classes/DummyAuthManager.class
rename to base/migrate/TxtTo73/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo73/classes/Main.class b/base/migrate/TxtTo73/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo73/classes/Main.class
rename to base/migrate/TxtTo73/classes/Main.class
diff --git a/pki/base/migrate/TxtTo73/run.bat b/base/migrate/TxtTo73/run.bat
similarity index 100%
rename from pki/base/migrate/TxtTo73/run.bat
rename to base/migrate/TxtTo73/run.bat
diff --git a/pki/base/migrate/TxtTo73/run.sh b/base/migrate/TxtTo73/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo73/run.sh
rename to base/migrate/TxtTo73/run.sh
diff --git a/pki/base/migrate/TxtTo73/src/Main.java b/base/migrate/TxtTo73/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo73/src/Main.java
rename to base/migrate/TxtTo73/src/Main.java
diff --git a/pki/base/migrate/TxtTo73/src/compile.bat b/base/migrate/TxtTo73/src/compile.bat
similarity index 100%
rename from pki/base/migrate/TxtTo73/src/compile.bat
rename to base/migrate/TxtTo73/src/compile.bat
diff --git a/pki/base/migrate/TxtTo73/src/compile.sh b/base/migrate/TxtTo73/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo73/src/compile.sh
rename to base/migrate/TxtTo73/src/compile.sh
diff --git a/pki/base/migrate/TxtTo80/classes/CS80LdifParser.class b/base/migrate/TxtTo80/classes/CS80LdifParser.class
similarity index 100%
rename from pki/base/migrate/TxtTo80/classes/CS80LdifParser.class
rename to base/migrate/TxtTo80/classes/CS80LdifParser.class
diff --git a/pki/base/migrate/TxtTo80/classes/Main.class b/base/migrate/TxtTo80/classes/Main.class
similarity index 100%
rename from pki/base/migrate/TxtTo80/classes/Main.class
rename to base/migrate/TxtTo80/classes/Main.class
diff --git a/pki/base/migrate/TxtTo80/run.sh b/base/migrate/TxtTo80/run.sh
similarity index 100%
rename from pki/base/migrate/TxtTo80/run.sh
rename to base/migrate/TxtTo80/run.sh
diff --git a/pki/base/migrate/TxtTo80/src/Main.java b/base/migrate/TxtTo80/src/Main.java
similarity index 100%
rename from pki/base/migrate/TxtTo80/src/Main.java
rename to base/migrate/TxtTo80/src/Main.java
diff --git a/pki/base/migrate/TxtTo80/src/compile.sh b/base/migrate/TxtTo80/src/compile.sh
similarity index 100%
rename from pki/base/migrate/TxtTo80/src/compile.sh
rename to base/migrate/TxtTo80/src/compile.sh
diff --git a/pki/base/migrate/kra/RecoverKey.class b/base/migrate/kra/RecoverKey.class
similarity index 100%
rename from pki/base/migrate/kra/RecoverKey.class
rename to base/migrate/kra/RecoverKey.class
diff --git a/pki/base/migrate/kra/RecoverKey.java b/base/migrate/kra/RecoverKey.java
similarity index 100%
rename from pki/base/migrate/kra/RecoverKey.java
rename to base/migrate/kra/RecoverKey.java
diff --git a/pki/base/migrate/kra/RecoverPin.class b/base/migrate/kra/RecoverPin.class
similarity index 100%
rename from pki/base/migrate/kra/RecoverPin.class
rename to base/migrate/kra/RecoverPin.class
diff --git a/pki/base/migrate/kra/RecoverPin.java b/base/migrate/kra/RecoverPin.java
similarity index 100%
rename from pki/base/migrate/kra/RecoverPin.java
rename to base/migrate/kra/RecoverPin.java
diff --git a/pki/base/migrate/kra/readme.txt b/base/migrate/kra/readme.txt
similarity index 100%
rename from pki/base/migrate/kra/readme.txt
rename to base/migrate/kra/readme.txt
diff --git a/pki/base/native-tools/CMakeLists.txt b/base/native-tools/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/CMakeLists.txt
rename to base/native-tools/CMakeLists.txt
diff --git a/pki/base/native-tools/LICENSE b/base/native-tools/LICENSE
similarity index 100%
rename from pki/base/native-tools/LICENSE
rename to base/native-tools/LICENSE
diff --git a/pki/base/native-tools/doc/README b/base/native-tools/doc/README
similarity index 100%
rename from pki/base/native-tools/doc/README
rename to base/native-tools/doc/README
diff --git a/pki/base/native-tools/src/CMakeLists.txt b/base/native-tools/src/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/CMakeLists.txt
rename to base/native-tools/src/CMakeLists.txt
diff --git a/pki/base/native-tools/src/bulkissuance/CMakeLists.txt b/base/native-tools/src/bulkissuance/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/bulkissuance/CMakeLists.txt
rename to base/native-tools/src/bulkissuance/CMakeLists.txt
diff --git a/pki/base/native-tools/src/bulkissuance/bulkissuance.c b/base/native-tools/src/bulkissuance/bulkissuance.c
similarity index 100%
rename from pki/base/native-tools/src/bulkissuance/bulkissuance.c
rename to base/native-tools/src/bulkissuance/bulkissuance.c
diff --git a/pki/base/native-tools/src/bulkissuance/bulkissuance.data b/base/native-tools/src/bulkissuance/bulkissuance.data
similarity index 100%
rename from pki/base/native-tools/src/bulkissuance/bulkissuance.data
rename to base/native-tools/src/bulkissuance/bulkissuance.data
diff --git a/pki/base/native-tools/src/bulkissuance/getopt.c b/base/native-tools/src/bulkissuance/getopt.c
similarity index 100%
rename from pki/base/native-tools/src/bulkissuance/getopt.c
rename to base/native-tools/src/bulkissuance/getopt.c
diff --git a/pki/base/native-tools/src/p7tool/CMakeLists.txt b/base/native-tools/src/p7tool/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/p7tool/CMakeLists.txt
rename to base/native-tools/src/p7tool/CMakeLists.txt
diff --git a/pki/base/native-tools/src/p7tool/NSPRerrs.h b/base/native-tools/src/p7tool/NSPRerrs.h
similarity index 100%
rename from pki/base/native-tools/src/p7tool/NSPRerrs.h
rename to base/native-tools/src/p7tool/NSPRerrs.h
diff --git a/pki/base/native-tools/src/p7tool/SECerrs.h b/base/native-tools/src/p7tool/SECerrs.h
similarity index 100%
rename from pki/base/native-tools/src/p7tool/SECerrs.h
rename to base/native-tools/src/p7tool/SECerrs.h
diff --git a/pki/base/native-tools/src/p7tool/SSLerrs.h b/base/native-tools/src/p7tool/SSLerrs.h
similarity index 100%
rename from pki/base/native-tools/src/p7tool/SSLerrs.h
rename to base/native-tools/src/p7tool/SSLerrs.h
diff --git a/pki/base/native-tools/src/p7tool/p7tool.c b/base/native-tools/src/p7tool/p7tool.c
similarity index 100%
rename from pki/base/native-tools/src/p7tool/p7tool.c
rename to base/native-tools/src/p7tool/p7tool.c
diff --git a/pki/base/native-tools/src/p7tool/pppolicy.c b/base/native-tools/src/p7tool/pppolicy.c
similarity index 100%
rename from pki/base/native-tools/src/p7tool/pppolicy.c
rename to base/native-tools/src/p7tool/pppolicy.c
diff --git a/pki/base/native-tools/src/p7tool/secerror.c b/base/native-tools/src/p7tool/secerror.c
similarity index 100%
rename from pki/base/native-tools/src/p7tool/secerror.c
rename to base/native-tools/src/p7tool/secerror.c
diff --git a/pki/base/native-tools/src/p7tool/secerror.h b/base/native-tools/src/p7tool/secerror.h
similarity index 100%
rename from pki/base/native-tools/src/p7tool/secerror.h
rename to base/native-tools/src/p7tool/secerror.h
diff --git a/pki/base/native-tools/src/p7tool/secpwd.c b/base/native-tools/src/p7tool/secpwd.c
similarity index 100%
rename from pki/base/native-tools/src/p7tool/secpwd.c
rename to base/native-tools/src/p7tool/secpwd.c
diff --git a/pki/base/native-tools/src/p7tool/secutil.c b/base/native-tools/src/p7tool/secutil.c
similarity index 100%
rename from pki/base/native-tools/src/p7tool/secutil.c
rename to base/native-tools/src/p7tool/secutil.c
diff --git a/pki/base/native-tools/src/p7tool/secutil.h b/base/native-tools/src/p7tool/secutil.h
similarity index 100%
rename from pki/base/native-tools/src/p7tool/secutil.h
rename to base/native-tools/src/p7tool/secutil.h
diff --git a/pki/base/native-tools/src/revoker/CMakeLists.txt b/base/native-tools/src/revoker/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/revoker/CMakeLists.txt
rename to base/native-tools/src/revoker/CMakeLists.txt
diff --git a/pki/base/native-tools/src/revoker/getopt.c b/base/native-tools/src/revoker/getopt.c
similarity index 100%
rename from pki/base/native-tools/src/revoker/getopt.c
rename to base/native-tools/src/revoker/getopt.c
diff --git a/pki/base/native-tools/src/revoker/revoker.c b/base/native-tools/src/revoker/revoker.c
similarity index 100%
rename from pki/base/native-tools/src/revoker/revoker.c
rename to base/native-tools/src/revoker/revoker.c
diff --git a/pki/base/native-tools/src/setpin/CMakeLists.txt b/base/native-tools/src/setpin/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/setpin/CMakeLists.txt
rename to base/native-tools/src/setpin/CMakeLists.txt
diff --git a/pki/base/native-tools/src/setpin/b64.c b/base/native-tools/src/setpin/b64.c
similarity index 100%
rename from pki/base/native-tools/src/setpin/b64.c
rename to base/native-tools/src/setpin/b64.c
diff --git a/pki/base/native-tools/src/setpin/options.c b/base/native-tools/src/setpin/options.c
similarity index 100%
rename from pki/base/native-tools/src/setpin/options.c
rename to base/native-tools/src/setpin/options.c
diff --git a/pki/base/native-tools/src/setpin/options.h b/base/native-tools/src/setpin/options.h
similarity index 100%
rename from pki/base/native-tools/src/setpin/options.h
rename to base/native-tools/src/setpin/options.h
diff --git a/pki/base/native-tools/src/setpin/setpin.c b/base/native-tools/src/setpin/setpin.c
similarity index 100%
rename from pki/base/native-tools/src/setpin/setpin.c
rename to base/native-tools/src/setpin/setpin.c
diff --git a/pki/base/native-tools/src/setpin/setpin.conf b/base/native-tools/src/setpin/setpin.conf
similarity index 100%
rename from pki/base/native-tools/src/setpin/setpin.conf
rename to base/native-tools/src/setpin/setpin.conf
diff --git a/pki/base/native-tools/src/setpin/setpin_options.c b/base/native-tools/src/setpin/setpin_options.c
similarity index 100%
rename from pki/base/native-tools/src/setpin/setpin_options.c
rename to base/native-tools/src/setpin/setpin_options.c
diff --git a/pki/base/native-tools/src/setpin/setpin_options.h b/base/native-tools/src/setpin/setpin_options.h
similarity index 100%
rename from pki/base/native-tools/src/setpin/setpin_options.h
rename to base/native-tools/src/setpin/setpin_options.h
diff --git a/pki/base/native-tools/src/sslget/CMakeLists.txt b/base/native-tools/src/sslget/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/sslget/CMakeLists.txt
rename to base/native-tools/src/sslget/CMakeLists.txt
diff --git a/pki/base/native-tools/src/sslget/getopt.c b/base/native-tools/src/sslget/getopt.c
similarity index 100%
rename from pki/base/native-tools/src/sslget/getopt.c
rename to base/native-tools/src/sslget/getopt.c
diff --git a/pki/base/native-tools/src/sslget/sslget.c b/base/native-tools/src/sslget/sslget.c
similarity index 100%
rename from pki/base/native-tools/src/sslget/sslget.c
rename to base/native-tools/src/sslget/sslget.c
diff --git a/pki/base/native-tools/src/tkstool/CMakeLists.txt b/base/native-tools/src/tkstool/CMakeLists.txt
similarity index 100%
rename from pki/base/native-tools/src/tkstool/CMakeLists.txt
rename to base/native-tools/src/tkstool/CMakeLists.txt
diff --git a/pki/base/native-tools/src/tkstool/NSPRerrs.h b/base/native-tools/src/tkstool/NSPRerrs.h
similarity index 100%
rename from pki/base/native-tools/src/tkstool/NSPRerrs.h
rename to base/native-tools/src/tkstool/NSPRerrs.h
diff --git a/pki/base/native-tools/src/tkstool/SECerrs.h b/base/native-tools/src/tkstool/SECerrs.h
similarity index 100%
rename from pki/base/native-tools/src/tkstool/SECerrs.h
rename to base/native-tools/src/tkstool/SECerrs.h
diff --git a/pki/base/native-tools/src/tkstool/SSLerrs.h b/base/native-tools/src/tkstool/SSLerrs.h
similarity index 100%
rename from pki/base/native-tools/src/tkstool/SSLerrs.h
rename to base/native-tools/src/tkstool/SSLerrs.h
diff --git a/pki/base/native-tools/src/tkstool/delete.c b/base/native-tools/src/tkstool/delete.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/delete.c
rename to base/native-tools/src/tkstool/delete.c
diff --git a/pki/base/native-tools/src/tkstool/file.c b/base/native-tools/src/tkstool/file.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/file.c
rename to base/native-tools/src/tkstool/file.c
diff --git a/pki/base/native-tools/src/tkstool/find.c b/base/native-tools/src/tkstool/find.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/find.c
rename to base/native-tools/src/tkstool/find.c
diff --git a/pki/base/native-tools/src/tkstool/help.c b/base/native-tools/src/tkstool/help.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/help.c
rename to base/native-tools/src/tkstool/help.c
diff --git a/pki/base/native-tools/src/tkstool/key.c b/base/native-tools/src/tkstool/key.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/key.c
rename to base/native-tools/src/tkstool/key.c
diff --git a/pki/base/native-tools/src/tkstool/list.c b/base/native-tools/src/tkstool/list.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/list.c
rename to base/native-tools/src/tkstool/list.c
diff --git a/pki/base/native-tools/src/tkstool/modules.c b/base/native-tools/src/tkstool/modules.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/modules.c
rename to base/native-tools/src/tkstool/modules.c
diff --git a/pki/base/native-tools/src/tkstool/pppolicy.c b/base/native-tools/src/tkstool/pppolicy.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/pppolicy.c
rename to base/native-tools/src/tkstool/pppolicy.c
diff --git a/pki/base/native-tools/src/tkstool/random.c b/base/native-tools/src/tkstool/random.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/random.c
rename to base/native-tools/src/tkstool/random.c
diff --git a/pki/base/native-tools/src/tkstool/retrieve.c b/base/native-tools/src/tkstool/retrieve.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/retrieve.c
rename to base/native-tools/src/tkstool/retrieve.c
diff --git a/pki/base/native-tools/src/tkstool/secerror.c b/base/native-tools/src/tkstool/secerror.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/secerror.c
rename to base/native-tools/src/tkstool/secerror.c
diff --git a/pki/base/native-tools/src/tkstool/secpwd.c b/base/native-tools/src/tkstool/secpwd.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/secpwd.c
rename to base/native-tools/src/tkstool/secpwd.c
diff --git a/pki/base/native-tools/src/tkstool/secutil.c b/base/native-tools/src/tkstool/secutil.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/secutil.c
rename to base/native-tools/src/tkstool/secutil.c
diff --git a/pki/base/native-tools/src/tkstool/secutil.h b/base/native-tools/src/tkstool/secutil.h
similarity index 100%
rename from pki/base/native-tools/src/tkstool/secutil.h
rename to base/native-tools/src/tkstool/secutil.h
diff --git a/pki/base/native-tools/src/tkstool/tkstool.c b/base/native-tools/src/tkstool/tkstool.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/tkstool.c
rename to base/native-tools/src/tkstool/tkstool.c
diff --git a/pki/base/native-tools/src/tkstool/tkstool.h b/base/native-tools/src/tkstool/tkstool.h
similarity index 100%
rename from pki/base/native-tools/src/tkstool/tkstool.h
rename to base/native-tools/src/tkstool/tkstool.h
diff --git a/pki/base/native-tools/src/tkstool/util.c b/base/native-tools/src/tkstool/util.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/util.c
rename to base/native-tools/src/tkstool/util.c
diff --git a/pki/base/native-tools/src/tkstool/version.c b/base/native-tools/src/tkstool/version.c
similarity index 100%
rename from pki/base/native-tools/src/tkstool/version.c
rename to base/native-tools/src/tkstool/version.c
diff --git a/pki/base/ocsp/CMakeLists.txt b/base/ocsp/CMakeLists.txt
similarity index 100%
rename from pki/base/ocsp/CMakeLists.txt
rename to base/ocsp/CMakeLists.txt
diff --git a/pki/base/ocsp/LICENSE b/base/ocsp/LICENSE
similarity index 100%
rename from pki/base/ocsp/LICENSE
rename to base/ocsp/LICENSE
diff --git a/pki/base/ocsp/setup/CMakeLists.txt b/base/ocsp/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/ocsp/setup/CMakeLists.txt
rename to base/ocsp/setup/CMakeLists.txt
diff --git a/pki/base/ocsp/setup/registry_instance b/base/ocsp/setup/registry_instance
similarity index 100%
rename from pki/base/ocsp/setup/registry_instance
rename to base/ocsp/setup/registry_instance
diff --git a/pki/base/ocsp/shared/conf/CMakeLists.txt b/base/ocsp/shared/conf/CMakeLists.txt
similarity index 100%
rename from pki/base/ocsp/shared/conf/CMakeLists.txt
rename to base/ocsp/shared/conf/CMakeLists.txt
diff --git a/pki/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
similarity index 100%
rename from pki/base/ocsp/shared/conf/CS.cfg.in
rename to base/ocsp/shared/conf/CS.cfg.in
diff --git a/pki/base/ocsp/shared/conf/acl.ldif b/base/ocsp/shared/conf/acl.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/acl.ldif
rename to base/ocsp/shared/conf/acl.ldif
diff --git a/pki/base/ocsp/shared/conf/catalina.policy b/base/ocsp/shared/conf/catalina.policy
similarity index 100%
rename from pki/base/ocsp/shared/conf/catalina.policy
rename to base/ocsp/shared/conf/catalina.policy
diff --git a/pki/base/ocsp/shared/conf/catalina.properties b/base/ocsp/shared/conf/catalina.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/catalina.properties
rename to base/ocsp/shared/conf/catalina.properties
diff --git a/pki/base/ocsp/shared/conf/context.xml b/base/ocsp/shared/conf/context.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/context.xml
rename to base/ocsp/shared/conf/context.xml
diff --git a/pki/base/ocsp/shared/conf/database.ldif b/base/ocsp/shared/conf/database.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/database.ldif
rename to base/ocsp/shared/conf/database.ldif
diff --git a/pki/base/ocsp/shared/conf/db.ldif b/base/ocsp/shared/conf/db.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/db.ldif
rename to base/ocsp/shared/conf/db.ldif
diff --git a/pki/base/ocsp/shared/conf/index.ldif b/base/ocsp/shared/conf/index.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/index.ldif
rename to base/ocsp/shared/conf/index.ldif
diff --git a/pki/base/ocsp/shared/conf/jk2.manifest b/base/ocsp/shared/conf/jk2.manifest
similarity index 100%
rename from pki/base/ocsp/shared/conf/jk2.manifest
rename to base/ocsp/shared/conf/jk2.manifest
diff --git a/pki/base/ocsp/shared/conf/jk2.properties b/base/ocsp/shared/conf/jk2.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/jk2.properties
rename to base/ocsp/shared/conf/jk2.properties
diff --git a/pki/base/ocsp/shared/conf/jkconf.ant.xml b/base/ocsp/shared/conf/jkconf.ant.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/jkconf.ant.xml
rename to base/ocsp/shared/conf/jkconf.ant.xml
diff --git a/pki/base/ocsp/shared/conf/jkconfig.manifest b/base/ocsp/shared/conf/jkconfig.manifest
similarity index 100%
rename from pki/base/ocsp/shared/conf/jkconfig.manifest
rename to base/ocsp/shared/conf/jkconfig.manifest
diff --git a/pki/base/ocsp/shared/conf/logging.properties b/base/ocsp/shared/conf/logging.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/logging.properties
rename to base/ocsp/shared/conf/logging.properties
diff --git a/pki/base/ocsp/shared/conf/manager.ldif b/base/ocsp/shared/conf/manager.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/manager.ldif
rename to base/ocsp/shared/conf/manager.ldif
diff --git a/pki/base/ocsp/shared/conf/schema.ldif b/base/ocsp/shared/conf/schema.ldif
similarity index 100%
rename from pki/base/ocsp/shared/conf/schema.ldif
rename to base/ocsp/shared/conf/schema.ldif
diff --git a/pki/base/ocsp/shared/conf/server-minimal.xml b/base/ocsp/shared/conf/server-minimal.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/server-minimal.xml
rename to base/ocsp/shared/conf/server-minimal.xml
diff --git a/pki/base/ocsp/shared/conf/server.xml b/base/ocsp/shared/conf/server.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/server.xml
rename to base/ocsp/shared/conf/server.xml
diff --git a/pki/base/ocsp/shared/conf/serverCertNick.conf b/base/ocsp/shared/conf/serverCertNick.conf
similarity index 100%
rename from pki/base/ocsp/shared/conf/serverCertNick.conf
rename to base/ocsp/shared/conf/serverCertNick.conf
diff --git a/pki/base/ocsp/shared/conf/shm.manifest b/base/ocsp/shared/conf/shm.manifest
similarity index 100%
rename from pki/base/ocsp/shared/conf/shm.manifest
rename to base/ocsp/shared/conf/shm.manifest
diff --git a/pki/base/ocsp/shared/conf/tomcat-jk2.manifest b/base/ocsp/shared/conf/tomcat-jk2.manifest
similarity index 100%
rename from pki/base/ocsp/shared/conf/tomcat-jk2.manifest
rename to base/ocsp/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/ocsp/shared/conf/tomcat-users.xml b/base/ocsp/shared/conf/tomcat-users.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/tomcat-users.xml
rename to base/ocsp/shared/conf/tomcat-users.xml
diff --git a/pki/base/ocsp/shared/conf/tomcat6.conf b/base/ocsp/shared/conf/tomcat6.conf
similarity index 100%
rename from pki/base/ocsp/shared/conf/tomcat6.conf
rename to base/ocsp/shared/conf/tomcat6.conf
diff --git a/pki/base/ocsp/shared/conf/uriworkermap.properties b/base/ocsp/shared/conf/uriworkermap.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/uriworkermap.properties
rename to base/ocsp/shared/conf/uriworkermap.properties
diff --git a/pki/base/ocsp/shared/conf/web.xml b/base/ocsp/shared/conf/web.xml
similarity index 100%
rename from pki/base/ocsp/shared/conf/web.xml
rename to base/ocsp/shared/conf/web.xml
diff --git a/pki/base/ocsp/shared/conf/workers.properties b/base/ocsp/shared/conf/workers.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/workers.properties
rename to base/ocsp/shared/conf/workers.properties
diff --git a/pki/base/ocsp/shared/conf/workers.properties.minimal b/base/ocsp/shared/conf/workers.properties.minimal
similarity index 100%
rename from pki/base/ocsp/shared/conf/workers.properties.minimal
rename to base/ocsp/shared/conf/workers.properties.minimal
diff --git a/pki/base/ocsp/shared/conf/workers2.properties b/base/ocsp/shared/conf/workers2.properties
similarity index 100%
rename from pki/base/ocsp/shared/conf/workers2.properties
rename to base/ocsp/shared/conf/workers2.properties
diff --git a/pki/base/ocsp/shared/conf/workers2.properties.minimal b/base/ocsp/shared/conf/workers2.properties.minimal
similarity index 100%
rename from pki/base/ocsp/shared/conf/workers2.properties.minimal
rename to base/ocsp/shared/conf/workers2.properties.minimal
diff --git a/pki/base/ocsp/shared/etc/init.d/pki-ocspd b/base/ocsp/shared/etc/init.d/pki-ocspd
similarity index 100%
rename from pki/base/ocsp/shared/etc/init.d/pki-ocspd
rename to base/ocsp/shared/etc/init.d/pki-ocspd
diff --git a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd.target b/base/ocsp/shared/lib/systemd/system/pki-ocspd.target
similarity index 100%
rename from pki/base/ocsp/shared/lib/systemd/system/pki-ocspd.target
rename to base/ocsp/shared/lib/systemd/system/pki-ocspd.target
diff --git a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service b/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
similarity index 100%
rename from pki/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
rename to base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
diff --git a/pki/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml b/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
similarity index 100%
rename from pki/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
rename to base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/ocsp/shared/webapps/ROOT/index.jsp b/base/ocsp/shared/webapps/ROOT/index.jsp
similarity index 100%
rename from pki/base/ocsp/shared/webapps/ROOT/index.jsp
rename to base/ocsp/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties b/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
similarity index 100%
rename from pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
rename to base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
similarity index 100%
rename from pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
rename to base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
diff --git a/pki/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
similarity index 100%
rename from pki/base/ocsp/src/CMakeLists.txt
rename to base/ocsp/src/CMakeLists.txt
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java b/base/ocsp/src/com/netscape/ocsp/EOCSPException.java
similarity index 100%
rename from pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java
rename to base/ocsp/src/com/netscape/ocsp/EOCSPException.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
similarity index 100%
rename from pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
rename to base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java b/base/ocsp/src/com/netscape/ocsp/OCSPResources.java
similarity index 100%
rename from pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java
rename to base/ocsp/src/com/netscape/ocsp/OCSPResources.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
similarity index 100%
rename from pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
rename to base/ocsp/src/com/netscape/ocsp/SigningUnit.java
diff --git a/pki/base/ra/CMakeLists.txt b/base/ra/CMakeLists.txt
similarity index 100%
rename from pki/base/ra/CMakeLists.txt
rename to base/ra/CMakeLists.txt
diff --git a/pki/base/ra/LICENSE b/base/ra/LICENSE
similarity index 100%
rename from pki/base/ra/LICENSE
rename to base/ra/LICENSE
diff --git a/pki/base/ra/apache/conf/httpd.conf b/base/ra/apache/conf/httpd.conf
similarity index 100%
rename from pki/base/ra/apache/conf/httpd.conf
rename to base/ra/apache/conf/httpd.conf
diff --git a/pki/base/ra/apache/conf/magic b/base/ra/apache/conf/magic
similarity index 100%
rename from pki/base/ra/apache/conf/magic
rename to base/ra/apache/conf/magic
diff --git a/pki/base/ra/apache/conf/mime.types b/base/ra/apache/conf/mime.types
similarity index 100%
rename from pki/base/ra/apache/conf/mime.types
rename to base/ra/apache/conf/mime.types
diff --git a/pki/base/ra/apache/conf/nss.conf b/base/ra/apache/conf/nss.conf
similarity index 100%
rename from pki/base/ra/apache/conf/nss.conf
rename to base/ra/apache/conf/nss.conf
diff --git a/pki/base/ra/apache/conf/perl.conf b/base/ra/apache/conf/perl.conf
similarity index 100%
rename from pki/base/ra/apache/conf/perl.conf
rename to base/ra/apache/conf/perl.conf
diff --git a/pki/base/ra/doc/CMakeLists.txt b/base/ra/doc/CMakeLists.txt
similarity index 100%
rename from pki/base/ra/doc/CMakeLists.txt
rename to base/ra/doc/CMakeLists.txt
diff --git a/pki/base/ra/doc/CS.cfg.in b/base/ra/doc/CS.cfg.in
similarity index 100%
rename from pki/base/ra/doc/CS.cfg.in
rename to base/ra/doc/CS.cfg.in
diff --git a/pki/base/ra/emails/mail_approve_request.vm b/base/ra/emails/mail_approve_request.vm
similarity index 100%
rename from pki/base/ra/emails/mail_approve_request.vm
rename to base/ra/emails/mail_approve_request.vm
diff --git a/pki/base/ra/emails/mail_create_request.vm b/base/ra/emails/mail_create_request.vm
similarity index 100%
rename from pki/base/ra/emails/mail_create_request.vm
rename to base/ra/emails/mail_create_request.vm
diff --git a/pki/base/ra/etc/init.d/pki-rad b/base/ra/etc/init.d/pki-rad
similarity index 100%
rename from pki/base/ra/etc/init.d/pki-rad
rename to base/ra/etc/init.d/pki-rad
diff --git a/pki/base/ra/forms/admin/group/add.cgi b/base/ra/forms/admin/group/add.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/add.cgi
rename to base/ra/forms/admin/group/add.cgi
diff --git a/pki/base/ra/forms/admin/group/add_member.cgi b/base/ra/forms/admin/group/add_member.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/add_member.cgi
rename to base/ra/forms/admin/group/add_member.cgi
diff --git a/pki/base/ra/forms/admin/group/add_new.cgi b/base/ra/forms/admin/group/add_new.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/add_new.cgi
rename to base/ra/forms/admin/group/add_new.cgi
diff --git a/pki/base/ra/forms/admin/group/delete.cgi b/base/ra/forms/admin/group/delete.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/delete.cgi
rename to base/ra/forms/admin/group/delete.cgi
diff --git a/pki/base/ra/forms/admin/group/delete_member.cgi b/base/ra/forms/admin/group/delete_member.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/delete_member.cgi
rename to base/ra/forms/admin/group/delete_member.cgi
diff --git a/pki/base/ra/forms/admin/group/index.cgi b/base/ra/forms/admin/group/index.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/index.cgi
rename to base/ra/forms/admin/group/index.cgi
diff --git a/pki/base/ra/forms/admin/group/read.cgi b/base/ra/forms/admin/group/read.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/group/read.cgi
rename to base/ra/forms/admin/group/read.cgi
diff --git a/pki/base/ra/forms/admin/index.cgi b/base/ra/forms/admin/index.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/index.cgi
rename to base/ra/forms/admin/index.cgi
diff --git a/pki/base/ra/forms/admin/user/add.cgi b/base/ra/forms/admin/user/add.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/user/add.cgi
rename to base/ra/forms/admin/user/add.cgi
diff --git a/pki/base/ra/forms/admin/user/add_new.cgi b/base/ra/forms/admin/user/add_new.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/user/add_new.cgi
rename to base/ra/forms/admin/user/add_new.cgi
diff --git a/pki/base/ra/forms/admin/user/delete.cgi b/base/ra/forms/admin/user/delete.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/user/delete.cgi
rename to base/ra/forms/admin/user/delete.cgi
diff --git a/pki/base/ra/forms/admin/user/index.cgi b/base/ra/forms/admin/user/index.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/user/index.cgi
rename to base/ra/forms/admin/user/index.cgi
diff --git a/pki/base/ra/forms/admin/user/read.cgi b/base/ra/forms/admin/user/read.cgi
similarity index 100%
rename from pki/base/ra/forms/admin/user/read.cgi
rename to base/ra/forms/admin/user/read.cgi
diff --git a/pki/base/ra/forms/agent/cert/index.cgi b/base/ra/forms/agent/cert/index.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/cert/index.cgi
rename to base/ra/forms/agent/cert/index.cgi
diff --git a/pki/base/ra/forms/agent/cert/read.cgi b/base/ra/forms/agent/cert/read.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/cert/read.cgi
rename to base/ra/forms/agent/cert/read.cgi
diff --git a/pki/base/ra/forms/agent/cert/revoke.cgi b/base/ra/forms/agent/cert/revoke.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/cert/revoke.cgi
rename to base/ra/forms/agent/cert/revoke.cgi
diff --git a/pki/base/ra/forms/agent/cert/submit.cgi b/base/ra/forms/agent/cert/submit.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/cert/submit.cgi
rename to base/ra/forms/agent/cert/submit.cgi
diff --git a/pki/base/ra/forms/agent/error.cgi b/base/ra/forms/agent/error.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/error.cgi
rename to base/ra/forms/agent/error.cgi
diff --git a/pki/base/ra/forms/agent/index.cgi b/base/ra/forms/agent/index.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/index.cgi
rename to base/ra/forms/agent/index.cgi
diff --git a/pki/base/ra/forms/agent/request/add_note.cgi b/base/ra/forms/agent/request/add_note.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/request/add_note.cgi
rename to base/ra/forms/agent/request/add_note.cgi
diff --git a/pki/base/ra/forms/agent/request/index.cgi b/base/ra/forms/agent/request/index.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/request/index.cgi
rename to base/ra/forms/agent/request/index.cgi
diff --git a/pki/base/ra/forms/agent/request/op.cgi b/base/ra/forms/agent/request/op.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/request/op.cgi
rename to base/ra/forms/agent/request/op.cgi
diff --git a/pki/base/ra/forms/agent/request/read.cgi b/base/ra/forms/agent/request/read.cgi
similarity index 100%
rename from pki/base/ra/forms/agent/request/read.cgi
rename to base/ra/forms/agent/request/read.cgi
diff --git a/pki/base/ra/forms/ee/agent/enroll.cgi b/base/ra/forms/ee/agent/enroll.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/agent/enroll.cgi
rename to base/ra/forms/ee/agent/enroll.cgi
diff --git a/pki/base/ra/forms/ee/agent/index.cgi b/base/ra/forms/ee/agent/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/agent/index.cgi
rename to base/ra/forms/ee/agent/index.cgi
diff --git a/pki/base/ra/forms/ee/agent/new.cgi b/base/ra/forms/ee/agent/new.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/agent/new.cgi
rename to base/ra/forms/ee/agent/new.cgi
diff --git a/pki/base/ra/forms/ee/agent/start.cgi b/base/ra/forms/ee/agent/start.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/agent/start.cgi
rename to base/ra/forms/ee/agent/start.cgi
diff --git a/pki/base/ra/forms/ee/agent/submit.cgi b/base/ra/forms/ee/agent/submit.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/agent/submit.cgi
rename to base/ra/forms/ee/agent/submit.cgi
diff --git a/pki/base/ra/forms/ee/error.cgi b/base/ra/forms/ee/error.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/error.cgi
rename to base/ra/forms/ee/error.cgi
diff --git a/pki/base/ra/forms/ee/index.cgi b/base/ra/forms/ee/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/index.cgi
rename to base/ra/forms/ee/index.cgi
diff --git a/pki/base/ra/forms/ee/request/getcert.cgi b/base/ra/forms/ee/request/getcert.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/request/getcert.cgi
rename to base/ra/forms/ee/request/getcert.cgi
diff --git a/pki/base/ra/forms/ee/request/importcert.cgi b/base/ra/forms/ee/request/importcert.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/request/importcert.cgi
rename to base/ra/forms/ee/request/importcert.cgi
diff --git a/pki/base/ra/forms/ee/request/index.cgi b/base/ra/forms/ee/request/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/request/index.cgi
rename to base/ra/forms/ee/request/index.cgi
diff --git a/pki/base/ra/forms/ee/request/status.cgi b/base/ra/forms/ee/request/status.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/request/status.cgi
rename to base/ra/forms/ee/request/status.cgi
diff --git a/pki/base/ra/forms/ee/scep/enroll.cgi b/base/ra/forms/ee/scep/enroll.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/enroll.cgi
rename to base/ra/forms/ee/scep/enroll.cgi
diff --git a/pki/base/ra/forms/ee/scep/index.cgi b/base/ra/forms/ee/scep/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/index.cgi
rename to base/ra/forms/ee/scep/index.cgi
diff --git a/pki/base/ra/forms/ee/scep/installer.cgi b/base/ra/forms/ee/scep/installer.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/installer.cgi
rename to base/ra/forms/ee/scep/installer.cgi
diff --git a/pki/base/ra/forms/ee/scep/manager.cgi b/base/ra/forms/ee/scep/manager.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/manager.cgi
rename to base/ra/forms/ee/scep/manager.cgi
diff --git a/pki/base/ra/forms/ee/scep/pkiclient.cgi b/base/ra/forms/ee/scep/pkiclient.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/pkiclient.cgi
rename to base/ra/forms/ee/scep/pkiclient.cgi
diff --git a/pki/base/ra/forms/ee/scep/submit.cgi b/base/ra/forms/ee/scep/submit.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/scep/submit.cgi
rename to base/ra/forms/ee/scep/submit.cgi
diff --git a/pki/base/ra/forms/ee/server/admin.cgi b/base/ra/forms/ee/server/admin.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/server/admin.cgi
rename to base/ra/forms/ee/server/admin.cgi
diff --git a/pki/base/ra/forms/ee/server/index.cgi b/base/ra/forms/ee/server/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/server/index.cgi
rename to base/ra/forms/ee/server/index.cgi
diff --git a/pki/base/ra/forms/ee/server/submit.cgi b/base/ra/forms/ee/server/submit.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/server/submit.cgi
rename to base/ra/forms/ee/server/submit.cgi
diff --git a/pki/base/ra/forms/ee/user/index.cgi b/base/ra/forms/ee/user/index.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/user/index.cgi
rename to base/ra/forms/ee/user/index.cgi
diff --git a/pki/base/ra/forms/ee/user/renew.cgi b/base/ra/forms/ee/user/renew.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/user/renew.cgi
rename to base/ra/forms/ee/user/renew.cgi
diff --git a/pki/base/ra/forms/ee/user/renewal.cgi b/base/ra/forms/ee/user/renewal.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/user/renewal.cgi
rename to base/ra/forms/ee/user/renewal.cgi
diff --git a/pki/base/ra/forms/ee/user/submit.cgi b/base/ra/forms/ee/user/submit.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/user/submit.cgi
rename to base/ra/forms/ee/user/submit.cgi
diff --git a/pki/base/ra/forms/ee/user/user.cgi b/base/ra/forms/ee/user/user.cgi
similarity index 100%
rename from pki/base/ra/forms/ee/user/user.cgi
rename to base/ra/forms/ee/user/user.cgi
diff --git a/pki/base/ra/forms/index.cgi b/base/ra/forms/index.cgi
similarity index 100%
rename from pki/base/ra/forms/index.cgi
rename to base/ra/forms/index.cgi
diff --git a/pki/base/ra/lib/perl/PKI/Base/CertStore.pm b/base/ra/lib/perl/PKI/Base/CertStore.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/CertStore.pm
rename to base/ra/lib/perl/PKI/Base/CertStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Conf.pm b/base/ra/lib/perl/PKI/Base/Conf.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/Conf.pm
rename to base/ra/lib/perl/PKI/Base/Conf.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/PinStore.pm b/base/ra/lib/perl/PKI/Base/PinStore.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/PinStore.pm
rename to base/ra/lib/perl/PKI/Base/PinStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Registry.pm b/base/ra/lib/perl/PKI/Base/Registry.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/Registry.pm
rename to base/ra/lib/perl/PKI/Base/Registry.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/TimeTool.pm b/base/ra/lib/perl/PKI/Base/TimeTool.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/TimeTool.pm
rename to base/ra/lib/perl/PKI/Base/TimeTool.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/UserStore.pm b/base/ra/lib/perl/PKI/Base/UserStore.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/UserStore.pm
rename to base/ra/lib/perl/PKI/Base/UserStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Util.pm b/base/ra/lib/perl/PKI/Base/Util.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Base/Util.pm
rename to base/ra/lib/perl/PKI/Base/Util.pm
diff --git a/pki/base/ra/lib/perl/PKI/Conn/CA.pm b/base/ra/lib/perl/PKI/Conn/CA.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Conn/CA.pm
rename to base/ra/lib/perl/PKI/Conn/CA.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm b/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
rename to base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm b/base/ra/lib/perl/PKI/RA/AdminPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
rename to base/ra/lib/perl/PKI/RA/AdminPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm b/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
rename to base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm b/base/ra/lib/perl/PKI/RA/BasePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/BasePanel.pm
rename to base/ra/lib/perl/PKI/RA/BasePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm b/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
rename to base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm b/base/ra/lib/perl/PKI/RA/CertInfo.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/CertInfo.pm
rename to base/ra/lib/perl/PKI/RA/CertInfo.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm b/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
rename to base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm b/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
rename to base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Common.pm b/base/ra/lib/perl/PKI/RA/Common.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/Common.pm
rename to base/ra/lib/perl/PKI/RA/Common.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Config.pm b/base/ra/lib/perl/PKI/RA/Config.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/Config.pm
rename to base/ra/lib/perl/PKI/RA/Config.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm b/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
rename to base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm b/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
rename to base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm b/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
rename to base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm b/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
rename to base/ra/lib/perl/PKI/RA/DatabasePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm b/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
rename to base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm b/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
rename to base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm b/base/ra/lib/perl/PKI/RA/DonePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
rename to base/ra/lib/perl/PKI/RA/DonePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm b/base/ra/lib/perl/PKI/RA/GlobalVar.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm
rename to base/ra/lib/perl/PKI/RA/GlobalVar.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm b/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
rename to base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/base/ra/lib/perl/PKI/RA/Login.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/Login.pm
rename to base/ra/lib/perl/PKI/RA/Login.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm b/base/ra/lib/perl/PKI/RA/LoginPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm
rename to base/ra/lib/perl/PKI/RA/LoginPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm b/base/ra/lib/perl/PKI/RA/ModulePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm
rename to base/ra/lib/perl/PKI/RA/ModulePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm b/base/ra/lib/perl/PKI/RA/Modutil.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/Modutil.pm
rename to base/ra/lib/perl/PKI/RA/Modutil.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm b/base/ra/lib/perl/PKI/RA/NamePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
rename to base/ra/lib/perl/PKI/RA/NamePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm b/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
rename to base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
rename to base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm b/base/ra/lib/perl/PKI/RA/SizePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/SizePanel.pm
rename to base/ra/lib/perl/PKI/RA/SizePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm b/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
rename to base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm b/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
rename to base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm b/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
rename to base/ra/lib/perl/PKI/RA/WelcomePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/wizard.pm b/base/ra/lib/perl/PKI/RA/wizard.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/RA/wizard.pm
rename to base/ra/lib/perl/PKI/RA/wizard.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm b/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
rename to base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm b/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
rename to base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm b/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
rename to base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm b/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
rename to base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Queue.pm b/base/ra/lib/perl/PKI/Request/Queue.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Request/Queue.pm
rename to base/ra/lib/perl/PKI/Request/Queue.pm
diff --git a/pki/base/ra/lib/perl/PKI/Service/Op.pm b/base/ra/lib/perl/PKI/Service/Op.pm
similarity index 100%
rename from pki/base/ra/lib/perl/PKI/Service/Op.pm
rename to base/ra/lib/perl/PKI/Service/Op.pm
diff --git a/pki/base/ra/lib/perl/Template/Velocity.pm b/base/ra/lib/perl/Template/Velocity.pm
similarity index 100%
rename from pki/base/ra/lib/perl/Template/Velocity.pm
rename to base/ra/lib/perl/Template/Velocity.pm
diff --git a/pki/base/ra/scripts/nss_pcache b/base/ra/scripts/nss_pcache
similarity index 100%
rename from pki/base/ra/scripts/nss_pcache
rename to base/ra/scripts/nss_pcache
diff --git a/pki/base/ra/scripts/schema.sql b/base/ra/scripts/schema.sql
similarity index 100%
rename from pki/base/ra/scripts/schema.sql
rename to base/ra/scripts/schema.sql
diff --git a/pki/base/ra/setup/CMakeLists.txt b/base/ra/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/ra/setup/CMakeLists.txt
rename to base/ra/setup/CMakeLists.txt
diff --git a/pki/base/ra/setup/registry_instance b/base/ra/setup/registry_instance
similarity index 100%
rename from pki/base/ra/setup/registry_instance
rename to base/ra/setup/registry_instance
diff --git a/pki/base/scripts/enable_cvs_keywords_in_svn b/base/scripts/enable_cvs_keywords_in_svn
similarity index 100%
rename from pki/base/scripts/enable_cvs_keywords_in_svn
rename to base/scripts/enable_cvs_keywords_in_svn
diff --git a/pki/base/scripts/pkicheck b/base/scripts/pkicheck
similarity index 100%
rename from pki/base/scripts/pkicheck
rename to base/scripts/pkicheck
diff --git a/pki/base/scripts/pkimanifest b/base/scripts/pkimanifest
similarity index 100%
rename from pki/base/scripts/pkimanifest
rename to base/scripts/pkimanifest
diff --git a/pki/base/selinux/CMakeLists.txt b/base/selinux/CMakeLists.txt
similarity index 100%
rename from pki/base/selinux/CMakeLists.txt
rename to base/selinux/CMakeLists.txt
diff --git a/pki/base/selinux/LICENSE b/base/selinux/LICENSE
similarity index 100%
rename from pki/base/selinux/LICENSE
rename to base/selinux/LICENSE
diff --git a/pki/base/selinux/src/CMakeLists.txt b/base/selinux/src/CMakeLists.txt
similarity index 100%
rename from pki/base/selinux/src/CMakeLists.txt
rename to base/selinux/src/CMakeLists.txt
diff --git a/pki/base/selinux/src/Makefile b/base/selinux/src/Makefile
similarity index 100%
rename from pki/base/selinux/src/Makefile
rename to base/selinux/src/Makefile
diff --git a/pki/base/selinux/src/pki.fc b/base/selinux/src/pki.fc
similarity index 100%
rename from pki/base/selinux/src/pki.fc
rename to base/selinux/src/pki.fc
diff --git a/pki/base/selinux/src/pki.if b/base/selinux/src/pki.if
similarity index 100%
rename from pki/base/selinux/src/pki.if
rename to base/selinux/src/pki.if
diff --git a/pki/base/selinux/src/pki.sh b/base/selinux/src/pki.sh
similarity index 100%
rename from pki/base/selinux/src/pki.sh
rename to base/selinux/src/pki.sh
diff --git a/pki/base/selinux/src/pki.te b/base/selinux/src/pki.te
similarity index 100%
rename from pki/base/selinux/src/pki.te
rename to base/selinux/src/pki.te
diff --git a/pki/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/setup/CMakeLists.txt
rename to base/setup/CMakeLists.txt
diff --git a/pki/base/setup/LICENSE b/base/setup/LICENSE
similarity index 100%
rename from pki/base/setup/LICENSE
rename to base/setup/LICENSE
diff --git a/pki/base/setup/pki-setup-proxy b/base/setup/pki-setup-proxy
similarity index 100%
rename from pki/base/setup/pki-setup-proxy
rename to base/setup/pki-setup-proxy
diff --git a/pki/base/setup/pkicommon.pm b/base/setup/pkicommon.pm
similarity index 100%
rename from pki/base/setup/pkicommon.pm
rename to base/setup/pkicommon.pm
diff --git a/pki/base/setup/pkicreate b/base/setup/pkicreate
similarity index 100%
rename from pki/base/setup/pkicreate
rename to base/setup/pkicreate
diff --git a/pki/base/setup/pkiremove b/base/setup/pkiremove
similarity index 100%
rename from pki/base/setup/pkiremove
rename to base/setup/pkiremove
diff --git a/pki/base/setup/scripts/functions b/base/setup/scripts/functions
similarity index 100%
rename from pki/base/setup/scripts/functions
rename to base/setup/scripts/functions
diff --git a/pki/base/setup/scripts/pki_apache_initscript b/base/setup/scripts/pki_apache_initscript
similarity index 100%
rename from pki/base/setup/scripts/pki_apache_initscript
rename to base/setup/scripts/pki_apache_initscript
diff --git a/pki/base/setup/scripts/pkicontrol b/base/setup/scripts/pkicontrol
similarity index 100%
rename from pki/base/setup/scripts/pkicontrol
rename to base/setup/scripts/pkicontrol
diff --git a/pki/base/silent/CMakeLists.txt b/base/silent/CMakeLists.txt
similarity index 100%
rename from pki/base/silent/CMakeLists.txt
rename to base/silent/CMakeLists.txt
diff --git a/pki/base/silent/LICENSE b/base/silent/LICENSE
similarity index 100%
rename from pki/base/silent/LICENSE
rename to base/silent/LICENSE
diff --git a/pki/base/silent/scripts/CMakeLists.txt b/base/silent/scripts/CMakeLists.txt
similarity index 100%
rename from pki/base/silent/scripts/CMakeLists.txt
rename to base/silent/scripts/CMakeLists.txt
diff --git a/pki/base/silent/scripts/pkisilent b/base/silent/scripts/pkisilent
similarity index 100%
rename from pki/base/silent/scripts/pkisilent
rename to base/silent/scripts/pkisilent
diff --git a/pki/base/silent/src/CMakeLists.txt b/base/silent/src/CMakeLists.txt
similarity index 100%
rename from pki/base/silent/src/CMakeLists.txt
rename to base/silent/src/CMakeLists.txt
diff --git a/pki/base/silent/src/argparser/ArgParseException.java b/base/silent/src/argparser/ArgParseException.java
similarity index 100%
rename from pki/base/silent/src/argparser/ArgParseException.java
rename to base/silent/src/argparser/ArgParseException.java
diff --git a/pki/base/silent/src/argparser/ArgParser.java b/base/silent/src/argparser/ArgParser.java
similarity index 100%
rename from pki/base/silent/src/argparser/ArgParser.java
rename to base/silent/src/argparser/ArgParser.java
diff --git a/pki/base/silent/src/argparser/ArgParserTest.java b/base/silent/src/argparser/ArgParserTest.java
similarity index 100%
rename from pki/base/silent/src/argparser/ArgParserTest.java
rename to base/silent/src/argparser/ArgParserTest.java
diff --git a/pki/base/silent/src/argparser/BooleanHolder.java b/base/silent/src/argparser/BooleanHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/BooleanHolder.java
rename to base/silent/src/argparser/BooleanHolder.java
diff --git a/pki/base/silent/src/argparser/CharHolder.java b/base/silent/src/argparser/CharHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/CharHolder.java
rename to base/silent/src/argparser/CharHolder.java
diff --git a/pki/base/silent/src/argparser/DoubleHolder.java b/base/silent/src/argparser/DoubleHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/DoubleHolder.java
rename to base/silent/src/argparser/DoubleHolder.java
diff --git a/pki/base/silent/src/argparser/FloatHolder.java b/base/silent/src/argparser/FloatHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/FloatHolder.java
rename to base/silent/src/argparser/FloatHolder.java
diff --git a/pki/base/silent/src/argparser/IntHolder.java b/base/silent/src/argparser/IntHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/IntHolder.java
rename to base/silent/src/argparser/IntHolder.java
diff --git a/pki/base/silent/src/argparser/LongHolder.java b/base/silent/src/argparser/LongHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/LongHolder.java
rename to base/silent/src/argparser/LongHolder.java
diff --git a/pki/base/silent/src/argparser/ObjectHolder.java b/base/silent/src/argparser/ObjectHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/ObjectHolder.java
rename to base/silent/src/argparser/ObjectHolder.java
diff --git a/pki/base/silent/src/argparser/SimpleExample.java b/base/silent/src/argparser/SimpleExample.java
similarity index 100%
rename from pki/base/silent/src/argparser/SimpleExample.java
rename to base/silent/src/argparser/SimpleExample.java
diff --git a/pki/base/silent/src/argparser/StringHolder.java b/base/silent/src/argparser/StringHolder.java
similarity index 100%
rename from pki/base/silent/src/argparser/StringHolder.java
rename to base/silent/src/argparser/StringHolder.java
diff --git a/pki/base/silent/src/argparser/StringScanException.java b/base/silent/src/argparser/StringScanException.java
similarity index 100%
rename from pki/base/silent/src/argparser/StringScanException.java
rename to base/silent/src/argparser/StringScanException.java
diff --git a/pki/base/silent/src/argparser/StringScanner.java b/base/silent/src/argparser/StringScanner.java
similarity index 100%
rename from pki/base/silent/src/argparser/StringScanner.java
rename to base/silent/src/argparser/StringScanner.java
diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/base/silent/src/ca/ConfigureCA.java
similarity index 100%
rename from pki/base/silent/src/ca/ConfigureCA.java
rename to base/silent/src/ca/ConfigureCA.java
diff --git a/pki/base/silent/src/ca/DirEnroll.java b/base/silent/src/ca/DirEnroll.java
similarity index 100%
rename from pki/base/silent/src/ca/DirEnroll.java
rename to base/silent/src/ca/DirEnroll.java
diff --git a/pki/base/silent/src/ca/Request.java b/base/silent/src/ca/Request.java
similarity index 100%
rename from pki/base/silent/src/ca/Request.java
rename to base/silent/src/ca/Request.java
diff --git a/pki/base/silent/src/ca/UserEnroll.java b/base/silent/src/ca/UserEnroll.java
similarity index 100%
rename from pki/base/silent/src/ca/UserEnroll.java
rename to base/silent/src/ca/UserEnroll.java
diff --git a/pki/base/silent/src/ca/checkRequest.java b/base/silent/src/ca/checkRequest.java
similarity index 100%
rename from pki/base/silent/src/ca/checkRequest.java
rename to base/silent/src/ca/checkRequest.java
diff --git a/pki/base/silent/src/common/AutoInstaller.java b/base/silent/src/common/AutoInstaller.java
similarity index 100%
rename from pki/base/silent/src/common/AutoInstaller.java
rename to base/silent/src/common/AutoInstaller.java
diff --git a/pki/base/silent/src/common/BaseState.java b/base/silent/src/common/BaseState.java
similarity index 100%
rename from pki/base/silent/src/common/BaseState.java
rename to base/silent/src/common/BaseState.java
diff --git a/pki/base/silent/src/common/CMSConfig.java b/base/silent/src/common/CMSConfig.java
similarity index 100%
rename from pki/base/silent/src/common/CMSConfig.java
rename to base/silent/src/common/CMSConfig.java
diff --git a/pki/base/silent/src/common/CMSInstance.java b/base/silent/src/common/CMSInstance.java
similarity index 100%
rename from pki/base/silent/src/common/CMSInstance.java
rename to base/silent/src/common/CMSInstance.java
diff --git a/pki/base/silent/src/common/CMSLDAP.java b/base/silent/src/common/CMSLDAP.java
similarity index 100%
rename from pki/base/silent/src/common/CMSLDAP.java
rename to base/silent/src/common/CMSLDAP.java
diff --git a/pki/base/silent/src/common/CMSProperties.java b/base/silent/src/common/CMSProperties.java
similarity index 100%
rename from pki/base/silent/src/common/CMSProperties.java
rename to base/silent/src/common/CMSProperties.java
diff --git a/pki/base/silent/src/common/CMSTask.java b/base/silent/src/common/CMSTask.java
similarity index 100%
rename from pki/base/silent/src/common/CMSTask.java
rename to base/silent/src/common/CMSTask.java
diff --git a/pki/base/silent/src/common/Certificate_Record.java b/base/silent/src/common/Certificate_Record.java
similarity index 100%
rename from pki/base/silent/src/common/Certificate_Record.java
rename to base/silent/src/common/Certificate_Record.java
diff --git a/pki/base/silent/src/common/ComCrypto.java b/base/silent/src/common/ComCrypto.java
similarity index 100%
rename from pki/base/silent/src/common/ComCrypto.java
rename to base/silent/src/common/ComCrypto.java
diff --git a/pki/base/silent/src/common/Con2Agent.java b/base/silent/src/common/Con2Agent.java
similarity index 100%
rename from pki/base/silent/src/common/Con2Agent.java
rename to base/silent/src/common/Con2Agent.java
diff --git a/pki/base/silent/src/common/ParseXML.java b/base/silent/src/common/ParseXML.java
similarity index 100%
rename from pki/base/silent/src/common/ParseXML.java
rename to base/silent/src/common/ParseXML.java
diff --git a/pki/base/silent/src/common/PostQuery.java b/base/silent/src/common/PostQuery.java
similarity index 100%
rename from pki/base/silent/src/common/PostQuery.java
rename to base/silent/src/common/PostQuery.java
diff --git a/pki/base/silent/src/common/ServerInfo.java b/base/silent/src/common/ServerInfo.java
similarity index 100%
rename from pki/base/silent/src/common/ServerInfo.java
rename to base/silent/src/common/ServerInfo.java
diff --git a/pki/base/silent/src/common/TestClient.java b/base/silent/src/common/TestClient.java
similarity index 100%
rename from pki/base/silent/src/common/TestClient.java
rename to base/silent/src/common/TestClient.java
diff --git a/pki/base/silent/src/common/Utilities.java b/base/silent/src/common/Utilities.java
similarity index 100%
rename from pki/base/silent/src/common/Utilities.java
rename to base/silent/src/common/Utilities.java
diff --git a/pki/base/silent/src/common/createinstance.java b/base/silent/src/common/createinstance.java
similarity index 100%
rename from pki/base/silent/src/common/createinstance.java
rename to base/silent/src/common/createinstance.java
diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/base/silent/src/drm/ConfigureDRM.java
similarity index 100%
rename from pki/base/silent/src/drm/ConfigureDRM.java
rename to base/silent/src/drm/ConfigureDRM.java
diff --git a/pki/base/silent/src/http/CertSelection.java b/base/silent/src/http/CertSelection.java
similarity index 100%
rename from pki/base/silent/src/http/CertSelection.java
rename to base/silent/src/http/CertSelection.java
diff --git a/pki/base/silent/src/http/HTMLDocument.java b/base/silent/src/http/HTMLDocument.java
similarity index 100%
rename from pki/base/silent/src/http/HTMLDocument.java
rename to base/silent/src/http/HTMLDocument.java
diff --git a/pki/base/silent/src/http/HTTPClient.java b/base/silent/src/http/HTTPClient.java
similarity index 100%
rename from pki/base/silent/src/http/HTTPClient.java
rename to base/silent/src/http/HTTPClient.java
diff --git a/pki/base/silent/src/http/HTTPResponse.java b/base/silent/src/http/HTTPResponse.java
similarity index 100%
rename from pki/base/silent/src/http/HTTPResponse.java
rename to base/silent/src/http/HTTPResponse.java
diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/base/silent/src/ocsp/ConfigureOCSP.java
similarity index 100%
rename from pki/base/silent/src/ocsp/ConfigureOCSP.java
rename to base/silent/src/ocsp/ConfigureOCSP.java
diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/base/silent/src/ra/ConfigureRA.java
similarity index 100%
rename from pki/base/silent/src/ra/ConfigureRA.java
rename to base/silent/src/ra/ConfigureRA.java
diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/base/silent/src/subca/ConfigureSubCA.java
similarity index 100%
rename from pki/base/silent/src/subca/ConfigureSubCA.java
rename to base/silent/src/subca/ConfigureSubCA.java
diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/base/silent/src/tks/ConfigureTKS.java
similarity index 100%
rename from pki/base/silent/src/tks/ConfigureTKS.java
rename to base/silent/src/tks/ConfigureTKS.java
diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/base/silent/src/tps/ConfigureTPS.java
similarity index 100%
rename from pki/base/silent/src/tps/ConfigureTPS.java
rename to base/silent/src/tps/ConfigureTPS.java
diff --git a/pki/base/silent/templates/pki_silent.template b/base/silent/templates/pki_silent.template
similarity index 100%
rename from pki/base/silent/templates/pki_silent.template
rename to base/silent/templates/pki_silent.template
diff --git a/pki/base/silent/templates/subca_silent.template b/base/silent/templates/subca_silent.template
similarity index 100%
rename from pki/base/silent/templates/subca_silent.template
rename to base/silent/templates/subca_silent.template
diff --git a/pki/base/symkey/CMakeLists.txt b/base/symkey/CMakeLists.txt
similarity index 100%
rename from pki/base/symkey/CMakeLists.txt
rename to base/symkey/CMakeLists.txt
diff --git a/pki/base/symkey/LICENSE b/base/symkey/LICENSE
similarity index 100%
rename from pki/base/symkey/LICENSE
rename to base/symkey/LICENSE
diff --git a/pki/base/symkey/src/CMakeLists.txt b/base/symkey/src/CMakeLists.txt
similarity index 100%
rename from pki/base/symkey/src/CMakeLists.txt
rename to base/symkey/src/CMakeLists.txt
diff --git a/pki/base/symkey/src/com/netscape/symkey/Base.h b/base/symkey/src/com/netscape/symkey/Base.h
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/Base.h
rename to base/symkey/src/com/netscape/symkey/Base.h
diff --git a/pki/base/symkey/src/com/netscape/symkey/Buffer.cpp b/base/symkey/src/com/netscape/symkey/Buffer.cpp
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/Buffer.cpp
rename to base/symkey/src/com/netscape/symkey/Buffer.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/Buffer.h b/base/symkey/src/com/netscape/symkey/Buffer.h
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/Buffer.h
rename to base/symkey/src/com/netscape/symkey/Buffer.h
diff --git a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/base/symkey/src/com/netscape/symkey/CMakeLists.txt
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt
rename to base/symkey/src/com/netscape/symkey/CMakeLists.txt
diff --git a/pki/base/symkey/src/com/netscape/symkey/EncryptData.cpp b/base/symkey/src/com/netscape/symkey/EncryptData.cpp
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/EncryptData.cpp
rename to base/symkey/src/com/netscape/symkey/EncryptData.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SessionKey.cpp b/base/symkey/src/com/netscape/symkey/SessionKey.cpp
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/SessionKey.cpp
rename to base/symkey/src/com/netscape/symkey/SessionKey.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SessionKey.java b/base/symkey/src/com/netscape/symkey/SessionKey.java
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/SessionKey.java
rename to base/symkey/src/com/netscape/symkey/SessionKey.java
diff --git a/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp b/base/symkey/src/com/netscape/symkey/SymKey.cpp
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/SymKey.cpp
rename to base/symkey/src/com/netscape/symkey/SymKey.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SymKey.h b/base/symkey/src/com/netscape/symkey/SymKey.h
similarity index 100%
rename from pki/base/symkey/src/com/netscape/symkey/SymKey.h
rename to base/symkey/src/com/netscape/symkey/SymKey.h
diff --git a/pki/base/tks/CMakeLists.txt b/base/tks/CMakeLists.txt
similarity index 100%
rename from pki/base/tks/CMakeLists.txt
rename to base/tks/CMakeLists.txt
diff --git a/pki/base/tks/LICENSE b/base/tks/LICENSE
similarity index 100%
rename from pki/base/tks/LICENSE
rename to base/tks/LICENSE
diff --git a/pki/base/tks/setup/CMakeLists.txt b/base/tks/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/tks/setup/CMakeLists.txt
rename to base/tks/setup/CMakeLists.txt
diff --git a/pki/base/tks/setup/registry_instance b/base/tks/setup/registry_instance
similarity index 100%
rename from pki/base/tks/setup/registry_instance
rename to base/tks/setup/registry_instance
diff --git a/pki/base/tks/shared/conf/CMakeLists.txt b/base/tks/shared/conf/CMakeLists.txt
similarity index 100%
rename from pki/base/tks/shared/conf/CMakeLists.txt
rename to base/tks/shared/conf/CMakeLists.txt
diff --git a/pki/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
similarity index 100%
rename from pki/base/tks/shared/conf/CS.cfg.in
rename to base/tks/shared/conf/CS.cfg.in
diff --git a/pki/base/tks/shared/conf/acl.ldif b/base/tks/shared/conf/acl.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/acl.ldif
rename to base/tks/shared/conf/acl.ldif
diff --git a/pki/base/tks/shared/conf/catalina.policy b/base/tks/shared/conf/catalina.policy
similarity index 100%
rename from pki/base/tks/shared/conf/catalina.policy
rename to base/tks/shared/conf/catalina.policy
diff --git a/pki/base/tks/shared/conf/catalina.properties b/base/tks/shared/conf/catalina.properties
similarity index 100%
rename from pki/base/tks/shared/conf/catalina.properties
rename to base/tks/shared/conf/catalina.properties
diff --git a/pki/base/tks/shared/conf/context.xml b/base/tks/shared/conf/context.xml
similarity index 100%
rename from pki/base/tks/shared/conf/context.xml
rename to base/tks/shared/conf/context.xml
diff --git a/pki/base/tks/shared/conf/database.ldif b/base/tks/shared/conf/database.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/database.ldif
rename to base/tks/shared/conf/database.ldif
diff --git a/pki/base/tks/shared/conf/db.ldif b/base/tks/shared/conf/db.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/db.ldif
rename to base/tks/shared/conf/db.ldif
diff --git a/pki/base/tks/shared/conf/index.ldif b/base/tks/shared/conf/index.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/index.ldif
rename to base/tks/shared/conf/index.ldif
diff --git a/pki/base/tks/shared/conf/jk2.manifest b/base/tks/shared/conf/jk2.manifest
similarity index 100%
rename from pki/base/tks/shared/conf/jk2.manifest
rename to base/tks/shared/conf/jk2.manifest
diff --git a/pki/base/tks/shared/conf/jk2.properties b/base/tks/shared/conf/jk2.properties
similarity index 100%
rename from pki/base/tks/shared/conf/jk2.properties
rename to base/tks/shared/conf/jk2.properties
diff --git a/pki/base/tks/shared/conf/jkconf.ant.xml b/base/tks/shared/conf/jkconf.ant.xml
similarity index 100%
rename from pki/base/tks/shared/conf/jkconf.ant.xml
rename to base/tks/shared/conf/jkconf.ant.xml
diff --git a/pki/base/tks/shared/conf/jkconfig.manifest b/base/tks/shared/conf/jkconfig.manifest
similarity index 100%
rename from pki/base/tks/shared/conf/jkconfig.manifest
rename to base/tks/shared/conf/jkconfig.manifest
diff --git a/pki/base/tks/shared/conf/logging.properties b/base/tks/shared/conf/logging.properties
similarity index 100%
rename from pki/base/tks/shared/conf/logging.properties
rename to base/tks/shared/conf/logging.properties
diff --git a/pki/base/tks/shared/conf/manager.ldif b/base/tks/shared/conf/manager.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/manager.ldif
rename to base/tks/shared/conf/manager.ldif
diff --git a/pki/base/tks/shared/conf/schema.ldif b/base/tks/shared/conf/schema.ldif
similarity index 100%
rename from pki/base/tks/shared/conf/schema.ldif
rename to base/tks/shared/conf/schema.ldif
diff --git a/pki/base/tks/shared/conf/server-minimal.xml b/base/tks/shared/conf/server-minimal.xml
similarity index 100%
rename from pki/base/tks/shared/conf/server-minimal.xml
rename to base/tks/shared/conf/server-minimal.xml
diff --git a/pki/base/tks/shared/conf/server.xml b/base/tks/shared/conf/server.xml
similarity index 100%
rename from pki/base/tks/shared/conf/server.xml
rename to base/tks/shared/conf/server.xml
diff --git a/pki/base/tks/shared/conf/serverCertNick.conf b/base/tks/shared/conf/serverCertNick.conf
similarity index 100%
rename from pki/base/tks/shared/conf/serverCertNick.conf
rename to base/tks/shared/conf/serverCertNick.conf
diff --git a/pki/base/tks/shared/conf/shm.manifest b/base/tks/shared/conf/shm.manifest
similarity index 100%
rename from pki/base/tks/shared/conf/shm.manifest
rename to base/tks/shared/conf/shm.manifest
diff --git a/pki/base/tks/shared/conf/tomcat-jk2.manifest b/base/tks/shared/conf/tomcat-jk2.manifest
similarity index 100%
rename from pki/base/tks/shared/conf/tomcat-jk2.manifest
rename to base/tks/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/tks/shared/conf/tomcat-users.xml b/base/tks/shared/conf/tomcat-users.xml
similarity index 100%
rename from pki/base/tks/shared/conf/tomcat-users.xml
rename to base/tks/shared/conf/tomcat-users.xml
diff --git a/pki/base/tks/shared/conf/tomcat6.conf b/base/tks/shared/conf/tomcat6.conf
similarity index 100%
rename from pki/base/tks/shared/conf/tomcat6.conf
rename to base/tks/shared/conf/tomcat6.conf
diff --git a/pki/base/tks/shared/conf/uriworkermap.properties b/base/tks/shared/conf/uriworkermap.properties
similarity index 100%
rename from pki/base/tks/shared/conf/uriworkermap.properties
rename to base/tks/shared/conf/uriworkermap.properties
diff --git a/pki/base/tks/shared/conf/web.xml b/base/tks/shared/conf/web.xml
similarity index 100%
rename from pki/base/tks/shared/conf/web.xml
rename to base/tks/shared/conf/web.xml
diff --git a/pki/base/tks/shared/conf/workers.properties b/base/tks/shared/conf/workers.properties
similarity index 100%
rename from pki/base/tks/shared/conf/workers.properties
rename to base/tks/shared/conf/workers.properties
diff --git a/pki/base/tks/shared/conf/workers.properties.minimal b/base/tks/shared/conf/workers.properties.minimal
similarity index 100%
rename from pki/base/tks/shared/conf/workers.properties.minimal
rename to base/tks/shared/conf/workers.properties.minimal
diff --git a/pki/base/tks/shared/conf/workers2.properties b/base/tks/shared/conf/workers2.properties
similarity index 100%
rename from pki/base/tks/shared/conf/workers2.properties
rename to base/tks/shared/conf/workers2.properties
diff --git a/pki/base/tks/shared/conf/workers2.properties.minimal b/base/tks/shared/conf/workers2.properties.minimal
similarity index 100%
rename from pki/base/tks/shared/conf/workers2.properties.minimal
rename to base/tks/shared/conf/workers2.properties.minimal
diff --git a/pki/base/tks/shared/etc/init.d/pki-tksd b/base/tks/shared/etc/init.d/pki-tksd
similarity index 100%
rename from pki/base/tks/shared/etc/init.d/pki-tksd
rename to base/tks/shared/etc/init.d/pki-tksd
diff --git a/pki/base/tks/shared/lib/systemd/system/pki-tksd.target b/base/tks/shared/lib/systemd/system/pki-tksd.target
similarity index 100%
rename from pki/base/tks/shared/lib/systemd/system/pki-tksd.target
rename to base/tks/shared/lib/systemd/system/pki-tksd.target
diff --git a/pki/base/tks/shared/lib/systemd/system/pki-tksd@.service b/base/tks/shared/lib/systemd/system/pki-tksd@.service
similarity index 100%
rename from pki/base/tks/shared/lib/systemd/system/pki-tksd@.service
rename to base/tks/shared/lib/systemd/system/pki-tksd@.service
diff --git a/pki/base/tks/shared/webapps/ROOT/WEB-INF/web.xml b/base/tks/shared/webapps/ROOT/WEB-INF/web.xml
similarity index 100%
rename from pki/base/tks/shared/webapps/ROOT/WEB-INF/web.xml
rename to base/tks/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/tks/shared/webapps/ROOT/index.jsp b/base/tks/shared/webapps/ROOT/index.jsp
similarity index 100%
rename from pki/base/tks/shared/webapps/ROOT/index.jsp
rename to base/tks/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties b/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
similarity index 100%
rename from pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
rename to base/tks/shared/webapps/tks/WEB-INF/velocity.properties
diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
similarity index 100%
rename from pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
rename to base/tks/shared/webapps/tks/WEB-INF/web.xml
diff --git a/pki/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
similarity index 100%
rename from pki/base/tks/src/CMakeLists.txt
rename to base/tks/src/CMakeLists.txt
diff --git a/pki/base/tks/src/com/netscape/tks/TKSAuthority.java b/base/tks/src/com/netscape/tks/TKSAuthority.java
similarity index 100%
rename from pki/base/tks/src/com/netscape/tks/TKSAuthority.java
rename to base/tks/src/com/netscape/tks/TKSAuthority.java
diff --git a/pki/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/CMakeLists.txt
rename to base/tps/CMakeLists.txt
diff --git a/pki/base/tps/LICENSE b/base/tps/LICENSE
similarity index 100%
rename from pki/base/tps/LICENSE
rename to base/tps/LICENSE
diff --git a/pki/base/tps/apache/LICENSE-2.0 b/base/tps/apache/LICENSE-2.0
similarity index 100%
rename from pki/base/tps/apache/LICENSE-2.0
rename to base/tps/apache/LICENSE-2.0
diff --git a/pki/base/tps/apache/conf/httpd.conf b/base/tps/apache/conf/httpd.conf
similarity index 100%
rename from pki/base/tps/apache/conf/httpd.conf
rename to base/tps/apache/conf/httpd.conf
diff --git a/pki/base/tps/apache/conf/magic b/base/tps/apache/conf/magic
similarity index 100%
rename from pki/base/tps/apache/conf/magic
rename to base/tps/apache/conf/magic
diff --git a/pki/base/tps/apache/conf/mime.types b/base/tps/apache/conf/mime.types
similarity index 100%
rename from pki/base/tps/apache/conf/mime.types
rename to base/tps/apache/conf/mime.types
diff --git a/pki/base/tps/apache/conf/nss.conf b/base/tps/apache/conf/nss.conf
similarity index 100%
rename from pki/base/tps/apache/conf/nss.conf
rename to base/tps/apache/conf/nss.conf
diff --git a/pki/base/tps/apache/conf/perl.conf b/base/tps/apache/conf/perl.conf
similarity index 100%
rename from pki/base/tps/apache/conf/perl.conf
rename to base/tps/apache/conf/perl.conf
diff --git a/pki/base/tps/apache/pki_instance_command_wrapper b/base/tps/apache/pki_instance_command_wrapper
similarity index 100%
rename from pki/base/tps/apache/pki_instance_command_wrapper
rename to base/tps/apache/pki_instance_command_wrapper
diff --git a/pki/base/tps/apache/pki_subsystem_command_wrapper b/base/tps/apache/pki_subsystem_command_wrapper
similarity index 100%
rename from pki/base/tps/apache/pki_subsystem_command_wrapper
rename to base/tps/apache/pki_subsystem_command_wrapper
diff --git a/pki/base/tps/apache/readme.html b/base/tps/apache/readme.html
similarity index 100%
rename from pki/base/tps/apache/readme.html
rename to base/tps/apache/readme.html
diff --git a/pki/base/tps/applets/1.2.4122DFB4.ijc b/base/tps/applets/1.2.4122DFB4.ijc
similarity index 100%
rename from pki/base/tps/applets/1.2.4122DFB4.ijc
rename to base/tps/applets/1.2.4122DFB4.ijc
diff --git a/pki/base/tps/applets/1.2.416DA155.ijc b/base/tps/applets/1.2.416DA155.ijc
similarity index 100%
rename from pki/base/tps/applets/1.2.416DA155.ijc
rename to base/tps/applets/1.2.416DA155.ijc
diff --git a/pki/base/tps/applets/1.3.42260AFA.ijc b/base/tps/applets/1.3.42260AFA.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.42260AFA.ijc
rename to base/tps/applets/1.3.42260AFA.ijc
diff --git a/pki/base/tps/applets/1.3.4255CC01.ijc b/base/tps/applets/1.3.4255CC01.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.4255CC01.ijc
rename to base/tps/applets/1.3.4255CC01.ijc
diff --git a/pki/base/tps/applets/1.3.42659461.ijc b/base/tps/applets/1.3.42659461.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.42659461.ijc
rename to base/tps/applets/1.3.42659461.ijc
diff --git a/pki/base/tps/applets/1.3.427BDDB8.ijc b/base/tps/applets/1.3.427BDDB8.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.427BDDB8.ijc
rename to base/tps/applets/1.3.427BDDB8.ijc
diff --git a/pki/base/tps/applets/1.3.44724DDE.ijc b/base/tps/applets/1.3.44724DDE.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.44724DDE.ijc
rename to base/tps/applets/1.3.44724DDE.ijc
diff --git a/pki/base/tps/applets/1.3.45787308.ijc b/base/tps/applets/1.3.45787308.ijc
similarity index 100%
rename from pki/base/tps/applets/1.3.45787308.ijc
rename to base/tps/applets/1.3.45787308.ijc
diff --git a/pki/base/tps/applets/1.4.499dc06c.ijc b/base/tps/applets/1.4.499dc06c.ijc
similarity index 100%
rename from pki/base/tps/applets/1.4.499dc06c.ijc
rename to base/tps/applets/1.4.499dc06c.ijc
diff --git a/pki/base/tps/applets/1.4.4d40a449.ijc b/base/tps/applets/1.4.4d40a449.ijc
similarity index 100%
rename from pki/base/tps/applets/1.4.4d40a449.ijc
rename to base/tps/applets/1.4.4d40a449.ijc
diff --git a/pki/base/tps/applets/3FD00877.ijc b/base/tps/applets/3FD00877.ijc
similarity index 100%
rename from pki/base/tps/applets/3FD00877.ijc
rename to base/tps/applets/3FD00877.ijc
diff --git a/pki/base/tps/applets/4003196C.ijc b/base/tps/applets/4003196C.ijc
similarity index 100%
rename from pki/base/tps/applets/4003196C.ijc
rename to base/tps/applets/4003196C.ijc
diff --git a/pki/base/tps/applets/402428AD.ijc b/base/tps/applets/402428AD.ijc
similarity index 100%
rename from pki/base/tps/applets/402428AD.ijc
rename to base/tps/applets/402428AD.ijc
diff --git a/pki/base/tps/applets/404E4697.ijc b/base/tps/applets/404E4697.ijc
similarity index 100%
rename from pki/base/tps/applets/404E4697.ijc
rename to base/tps/applets/404E4697.ijc
diff --git a/pki/base/tps/applets/4122DFB4.ijc b/base/tps/applets/4122DFB4.ijc
similarity index 100%
rename from pki/base/tps/applets/4122DFB4.ijc
rename to base/tps/applets/4122DFB4.ijc
diff --git a/pki/base/tps/applets/listappletdates b/base/tps/applets/listappletdates
similarity index 100%
rename from pki/base/tps/applets/listappletdates
rename to base/tps/applets/listappletdates
diff --git a/pki/base/tps/applets/readme.txt b/base/tps/applets/readme.txt
similarity index 100%
rename from pki/base/tps/applets/readme.txt
rename to base/tps/applets/readme.txt
diff --git a/pki/base/tps/doc/CMakeLists.txt b/base/tps/doc/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/doc/CMakeLists.txt
rename to base/tps/doc/CMakeLists.txt
diff --git a/pki/base/tps/doc/CS.cfg.in b/base/tps/doc/CS.cfg.in
similarity index 100%
rename from pki/base/tps/doc/CS.cfg.in
rename to base/tps/doc/CS.cfg.in
diff --git a/pki/base/tps/etc/init.d/pki-tpsd b/base/tps/etc/init.d/pki-tpsd
similarity index 100%
rename from pki/base/tps/etc/init.d/pki-tpsd
rename to base/tps/etc/init.d/pki-tpsd
diff --git a/pki/base/tps/forms/esc/cgi-bin/demo/enroll.cgi b/base/tps/forms/esc/cgi-bin/demo/enroll.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/demo/enroll.cgi
rename to base/tps/forms/esc/cgi-bin/demo/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/demo/index.cgi b/base/tps/forms/esc/cgi-bin/demo/index.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/demo/index.cgi
rename to base/tps/forms/esc/cgi-bin/demo/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/cachain.cgi b/base/tps/forms/esc/cgi-bin/home/cachain.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/home/cachain.cgi
rename to base/tps/forms/esc/cgi-bin/home/cachain.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/enroll.cgi b/base/tps/forms/esc/cgi-bin/home/enroll.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/home/enroll.cgi
rename to base/tps/forms/esc/cgi-bin/home/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/index.cgi b/base/tps/forms/esc/cgi-bin/home/index.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/home/index.cgi
rename to base/tps/forms/esc/cgi-bin/home/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi b/base/tps/forms/esc/cgi-bin/so/enroll.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi
rename to base/tps/forms/esc/cgi-bin/so/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/so/index.cgi b/base/tps/forms/esc/cgi-bin/so/index.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/so/index.cgi
rename to base/tps/forms/esc/cgi-bin/so/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi b/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
rename to base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl b/base/tps/forms/esc/cgi-bin/sow/cfg.pl
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
rename to base/tps/forms/esc/cgi-bin/sow/cfg.pl
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi b/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
rename to base/tps/forms/esc/cgi-bin/sow/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
rename to base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi b/base/tps/forms/esc/cgi-bin/sow/format.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/format.cgi
rename to base/tps/forms/esc/cgi-bin/sow/format.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi b/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
rename to base/tps/forms/esc/cgi-bin/sow/formatso.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi b/base/tps/forms/esc/cgi-bin/sow/index.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/index.cgi
rename to base/tps/forms/esc/cgi-bin/sow/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi b/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
rename to base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi b/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
rename to base/tps/forms/esc/cgi-bin/sow/is_user.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi b/base/tps/forms/esc/cgi-bin/sow/main.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/main.cgi
rename to base/tps/forms/esc/cgi-bin/sow/main.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi b/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
rename to base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi b/base/tps/forms/esc/cgi-bin/sow/read.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
rename to base/tps/forms/esc/cgi-bin/sow/read.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
rename to base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi b/base/tps/forms/esc/cgi-bin/sow/search.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/search.cgi
rename to base/tps/forms/esc/cgi-bin/sow/search.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
rename to base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi b/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
rename to base/tps/forms/esc/cgi-bin/sow/seturl.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi b/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
rename to base/tps/forms/esc/cgi-bin/sow/welcome.cgi
diff --git a/pki/base/tps/forms/esc/esc.cgi b/base/tps/forms/esc/esc.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/esc.cgi
rename to base/tps/forms/esc/esc.cgi
diff --git a/pki/base/tps/forms/esc/home.cgi b/base/tps/forms/esc/home.cgi
similarity index 100%
rename from pki/base/tps/forms/esc/home.cgi
rename to base/tps/forms/esc/home.cgi
diff --git a/pki/base/tps/forms/index.cgi b/base/tps/forms/index.cgi
similarity index 100%
rename from pki/base/tps/forms/index.cgi
rename to base/tps/forms/index.cgi
diff --git a/pki/base/tps/forms/index.html b/base/tps/forms/index.html
similarity index 100%
rename from pki/base/tps/forms/index.html
rename to base/tps/forms/index.html
diff --git a/pki/base/tps/lib/perl/PKI/Base/Conf.pm b/base/tps/lib/perl/PKI/Base/Conf.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/Base/Conf.pm
rename to base/tps/lib/perl/PKI/Base/Conf.pm
diff --git a/pki/base/tps/lib/perl/PKI/Base/Registry.pm b/base/tps/lib/perl/PKI/Base/Registry.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/Base/Registry.pm
rename to base/tps/lib/perl/PKI/Base/Registry.pm
diff --git a/pki/base/tps/lib/perl/PKI/Service/Op.pm b/base/tps/lib/perl/PKI/Service/Op.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/Service/Op.pm
rename to base/tps/lib/perl/PKI/Service/Op.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
rename to base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
rename to base/tps/lib/perl/PKI/TPS/AdminPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
rename to base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
rename to base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm b/base/tps/lib/perl/PKI/TPS/BasePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
rename to base/tps/lib/perl/PKI/TPS/BasePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
rename to base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm b/base/tps/lib/perl/PKI/TPS/CertInfo.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
rename to base/tps/lib/perl/PKI/TPS/CertInfo.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
rename to base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
rename to base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Common.pm b/base/tps/lib/perl/PKI/TPS/Common.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/Common.pm
rename to base/tps/lib/perl/PKI/TPS/Common.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Config.pm b/base/tps/lib/perl/PKI/TPS/Config.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/Config.pm
rename to base/tps/lib/perl/PKI/TPS/Config.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
rename to base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
rename to base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
rename to base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
rename to base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
rename to base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
rename to base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/base/tps/lib/perl/PKI/TPS/DonePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
rename to base/tps/lib/perl/PKI/TPS/DonePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm b/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
rename to base/tps/lib/perl/PKI/TPS/GlobalVar.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
rename to base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Login.pm b/base/tps/lib/perl/PKI/TPS/Login.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/Login.pm
rename to base/tps/lib/perl/PKI/TPS/Login.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm b/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
rename to base/tps/lib/perl/PKI/TPS/LoginPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
rename to base/tps/lib/perl/PKI/TPS/ModulePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm b/base/tps/lib/perl/PKI/TPS/Modutil.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
rename to base/tps/lib/perl/PKI/TPS/Modutil.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/base/tps/lib/perl/PKI/TPS/NamePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
rename to base/tps/lib/perl/PKI/TPS/NamePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
rename to base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
rename to base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/base/tps/lib/perl/PKI/TPS/SizePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
rename to base/tps/lib/perl/PKI/TPS/SizePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
rename to base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
rename to base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
rename to base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/base/tps/lib/perl/PKI/TPS/wizard.pm
similarity index 100%
rename from pki/base/tps/lib/perl/PKI/TPS/wizard.pm
rename to base/tps/lib/perl/PKI/TPS/wizard.pm
diff --git a/pki/base/tps/lib/perl/Template/Velocity.pm b/base/tps/lib/perl/Template/Velocity.pm
similarity index 100%
rename from pki/base/tps/lib/perl/Template/Velocity.pm
rename to base/tps/lib/perl/Template/Velocity.pm
diff --git a/pki/base/tps/scripts/addAgents.ldif b/base/tps/scripts/addAgents.ldif
similarity index 100%
rename from pki/base/tps/scripts/addAgents.ldif
rename to base/tps/scripts/addAgents.ldif
diff --git a/pki/base/tps/scripts/addIndexes.ldif b/base/tps/scripts/addIndexes.ldif
similarity index 100%
rename from pki/base/tps/scripts/addIndexes.ldif
rename to base/tps/scripts/addIndexes.ldif
diff --git a/pki/base/tps/scripts/addTokens.ldif b/base/tps/scripts/addTokens.ldif
similarity index 100%
rename from pki/base/tps/scripts/addTokens.ldif
rename to base/tps/scripts/addTokens.ldif
diff --git a/pki/base/tps/scripts/addVLVIndexes.ldif b/base/tps/scripts/addVLVIndexes.ldif
similarity index 100%
rename from pki/base/tps/scripts/addVLVIndexes.ldif
rename to base/tps/scripts/addVLVIndexes.ldif
diff --git a/pki/base/tps/scripts/database.ldif b/base/tps/scripts/database.ldif
similarity index 100%
rename from pki/base/tps/scripts/database.ldif
rename to base/tps/scripts/database.ldif
diff --git a/pki/base/tps/scripts/nss_pcache b/base/tps/scripts/nss_pcache
similarity index 100%
rename from pki/base/tps/scripts/nss_pcache
rename to base/tps/scripts/nss_pcache
diff --git a/pki/base/tps/scripts/schemaMods.ldif b/base/tps/scripts/schemaMods.ldif
similarity index 100%
rename from pki/base/tps/scripts/schemaMods.ldif
rename to base/tps/scripts/schemaMods.ldif
diff --git a/pki/base/tps/scripts/vlvtasks.ldif b/base/tps/scripts/vlvtasks.ldif
similarity index 100%
rename from pki/base/tps/scripts/vlvtasks.ldif
rename to base/tps/scripts/vlvtasks.ldif
diff --git a/pki/base/tps/setup/CMakeLists.txt b/base/tps/setup/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/setup/CMakeLists.txt
rename to base/tps/setup/CMakeLists.txt
diff --git a/pki/base/tps/setup/create.pl b/base/tps/setup/create.pl
similarity index 100%
rename from pki/base/tps/setup/create.pl
rename to base/tps/setup/create.pl
diff --git a/pki/base/tps/setup/registry_instance b/base/tps/setup/registry_instance
similarity index 100%
rename from pki/base/tps/setup/registry_instance
rename to base/tps/setup/registry_instance
diff --git a/pki/base/tps/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/CMakeLists.txt
rename to base/tps/src/CMakeLists.txt
diff --git a/pki/base/tps/src/apdu/APDU.cpp b/base/tps/src/apdu/APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/APDU.cpp
rename to base/tps/src/apdu/APDU.cpp
diff --git a/pki/base/tps/src/apdu/APDU_Response.cpp b/base/tps/src/apdu/APDU_Response.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/APDU_Response.cpp
rename to base/tps/src/apdu/APDU_Response.cpp
diff --git a/pki/base/tps/src/apdu/Create_Object_APDU.cpp b/base/tps/src/apdu/Create_Object_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Create_Object_APDU.cpp
rename to base/tps/src/apdu/Create_Object_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Create_Pin_APDU.cpp b/base/tps/src/apdu/Create_Pin_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Create_Pin_APDU.cpp
rename to base/tps/src/apdu/Create_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Delete_File_APDU.cpp b/base/tps/src/apdu/Delete_File_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Delete_File_APDU.cpp
rename to base/tps/src/apdu/Delete_File_APDU.cpp
diff --git a/pki/base/tps/src/apdu/External_Authenticate_APDU.cpp b/base/tps/src/apdu/External_Authenticate_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/External_Authenticate_APDU.cpp
rename to base/tps/src/apdu/External_Authenticate_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp b/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
rename to base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Generate_Key_APDU.cpp b/base/tps/src/apdu/Generate_Key_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Generate_Key_APDU.cpp
rename to base/tps/src/apdu/Generate_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Data_APDU.cpp b/base/tps/src/apdu/Get_Data_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Get_Data_APDU.cpp
rename to base/tps/src/apdu/Get_Data_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp b/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
rename to base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Status_APDU.cpp b/base/tps/src/apdu/Get_Status_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Get_Status_APDU.cpp
rename to base/tps/src/apdu/Get_Status_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Version_APDU.cpp b/base/tps/src/apdu/Get_Version_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Get_Version_APDU.cpp
rename to base/tps/src/apdu/Get_Version_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Import_Key_APDU.cpp b/base/tps/src/apdu/Import_Key_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Import_Key_APDU.cpp
rename to base/tps/src/apdu/Import_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Import_Key_Enc_APDU.cpp b/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
rename to base/tps/src/apdu/Import_Key_Enc_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Initialize_Update_APDU.cpp b/base/tps/src/apdu/Initialize_Update_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Initialize_Update_APDU.cpp
rename to base/tps/src/apdu/Initialize_Update_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Install_Applet_APDU.cpp b/base/tps/src/apdu/Install_Applet_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Install_Applet_APDU.cpp
rename to base/tps/src/apdu/Install_Applet_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Install_Load_APDU.cpp b/base/tps/src/apdu/Install_Load_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Install_Load_APDU.cpp
rename to base/tps/src/apdu/Install_Load_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Lifecycle_APDU.cpp b/base/tps/src/apdu/Lifecycle_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Lifecycle_APDU.cpp
rename to base/tps/src/apdu/Lifecycle_APDU.cpp
diff --git a/pki/base/tps/src/apdu/List_Objects_APDU.cpp b/base/tps/src/apdu/List_Objects_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/List_Objects_APDU.cpp
rename to base/tps/src/apdu/List_Objects_APDU.cpp
diff --git a/pki/base/tps/src/apdu/List_Pins_APDU.cpp b/base/tps/src/apdu/List_Pins_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/List_Pins_APDU.cpp
rename to base/tps/src/apdu/List_Pins_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Load_File_APDU.cpp b/base/tps/src/apdu/Load_File_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Load_File_APDU.cpp
rename to base/tps/src/apdu/Load_File_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Put_Key_APDU.cpp b/base/tps/src/apdu/Put_Key_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Put_Key_APDU.cpp
rename to base/tps/src/apdu/Put_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Read_Buffer_APDU.cpp b/base/tps/src/apdu/Read_Buffer_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Read_Buffer_APDU.cpp
rename to base/tps/src/apdu/Read_Buffer_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Read_Object_APDU.cpp b/base/tps/src/apdu/Read_Object_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Read_Object_APDU.cpp
rename to base/tps/src/apdu/Read_Object_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Select_APDU.cpp b/base/tps/src/apdu/Select_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Select_APDU.cpp
rename to base/tps/src/apdu/Select_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp b/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
rename to base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Set_Pin_APDU.cpp b/base/tps/src/apdu/Set_Pin_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Set_Pin_APDU.cpp
rename to base/tps/src/apdu/Set_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Unblock_Pin_APDU.cpp b/base/tps/src/apdu/Unblock_Pin_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Unblock_Pin_APDU.cpp
rename to base/tps/src/apdu/Unblock_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Write_Object_APDU.cpp b/base/tps/src/apdu/Write_Object_APDU.cpp
similarity index 100%
rename from pki/base/tps/src/apdu/Write_Object_APDU.cpp
rename to base/tps/src/apdu/Write_Object_APDU.cpp
diff --git a/pki/base/tps/src/authentication/CMakeLists.txt b/base/tps/src/authentication/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/authentication/CMakeLists.txt
rename to base/tps/src/authentication/CMakeLists.txt
diff --git a/pki/base/tps/src/authentication/LDAP_Authentication.cpp b/base/tps/src/authentication/LDAP_Authentication.cpp
similarity index 100%
rename from pki/base/tps/src/authentication/LDAP_Authentication.cpp
rename to base/tps/src/authentication/LDAP_Authentication.cpp
diff --git a/pki/base/tps/src/channel/Channel.cpp b/base/tps/src/channel/Channel.cpp
similarity index 100%
rename from pki/base/tps/src/channel/Channel.cpp
rename to base/tps/src/channel/Channel.cpp
diff --git a/pki/base/tps/src/channel/Secure_Channel.cpp b/base/tps/src/channel/Secure_Channel.cpp
similarity index 100%
rename from pki/base/tps/src/channel/Secure_Channel.cpp
rename to base/tps/src/channel/Secure_Channel.cpp
diff --git a/pki/base/tps/src/cms/CertEnroll.cpp b/base/tps/src/cms/CertEnroll.cpp
similarity index 100%
rename from pki/base/tps/src/cms/CertEnroll.cpp
rename to base/tps/src/cms/CertEnroll.cpp
diff --git a/pki/base/tps/src/cms/ConnectionInfo.cpp b/base/tps/src/cms/ConnectionInfo.cpp
similarity index 100%
rename from pki/base/tps/src/cms/ConnectionInfo.cpp
rename to base/tps/src/cms/ConnectionInfo.cpp
diff --git a/pki/base/tps/src/cms/HttpConnection.cpp b/base/tps/src/cms/HttpConnection.cpp
similarity index 100%
rename from pki/base/tps/src/cms/HttpConnection.cpp
rename to base/tps/src/cms/HttpConnection.cpp
diff --git a/pki/base/tps/src/engine/RA.cpp b/base/tps/src/engine/RA.cpp
similarity index 100%
rename from pki/base/tps/src/engine/RA.cpp
rename to base/tps/src/engine/RA.cpp
diff --git a/pki/base/tps/src/httpClient/Cache.cpp b/base/tps/src/httpClient/Cache.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/Cache.cpp
rename to base/tps/src/httpClient/Cache.cpp
diff --git a/pki/base/tps/src/httpClient/engine.cpp b/base/tps/src/httpClient/engine.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/engine.cpp
rename to base/tps/src/httpClient/engine.cpp
diff --git a/pki/base/tps/src/httpClient/http.cpp b/base/tps/src/httpClient/http.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/http.cpp
rename to base/tps/src/httpClient/http.cpp
diff --git a/pki/base/tps/src/httpClient/httpClient.cpp b/base/tps/src/httpClient/httpClient.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/httpClient.cpp
rename to base/tps/src/httpClient/httpClient.cpp
diff --git a/pki/base/tps/src/httpClient/nscperror.cpp b/base/tps/src/httpClient/nscperror.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/nscperror.cpp
rename to base/tps/src/httpClient/nscperror.cpp
diff --git a/pki/base/tps/src/httpClient/request.cpp b/base/tps/src/httpClient/request.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/request.cpp
rename to base/tps/src/httpClient/request.cpp
diff --git a/pki/base/tps/src/httpClient/response.cpp b/base/tps/src/httpClient/response.cpp
similarity index 100%
rename from pki/base/tps/src/httpClient/response.cpp
rename to base/tps/src/httpClient/response.cpp
diff --git a/pki/base/tps/src/include/apdu/APDU.h b/base/tps/src/include/apdu/APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/APDU.h
rename to base/tps/src/include/apdu/APDU.h
diff --git a/pki/base/tps/src/include/apdu/APDU_Response.h b/base/tps/src/include/apdu/APDU_Response.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/APDU_Response.h
rename to base/tps/src/include/apdu/APDU_Response.h
diff --git a/pki/base/tps/src/include/apdu/Create_Object_APDU.h b/base/tps/src/include/apdu/Create_Object_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Create_Object_APDU.h
rename to base/tps/src/include/apdu/Create_Object_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Create_Pin_APDU.h b/base/tps/src/include/apdu/Create_Pin_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Create_Pin_APDU.h
rename to base/tps/src/include/apdu/Create_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Delete_File_APDU.h b/base/tps/src/include/apdu/Delete_File_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Delete_File_APDU.h
rename to base/tps/src/include/apdu/Delete_File_APDU.h
diff --git a/pki/base/tps/src/include/apdu/External_Authenticate_APDU.h b/base/tps/src/include/apdu/External_Authenticate_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/External_Authenticate_APDU.h
rename to base/tps/src/include/apdu/External_Authenticate_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h b/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
rename to base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Generate_Key_APDU.h b/base/tps/src/include/apdu/Generate_Key_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Generate_Key_APDU.h
rename to base/tps/src/include/apdu/Generate_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Data_APDU.h b/base/tps/src/include/apdu/Get_Data_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Get_Data_APDU.h
rename to base/tps/src/include/apdu/Get_Data_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h b/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
rename to base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Status_APDU.h b/base/tps/src/include/apdu/Get_Status_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Get_Status_APDU.h
rename to base/tps/src/include/apdu/Get_Status_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Version_APDU.h b/base/tps/src/include/apdu/Get_Version_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Get_Version_APDU.h
rename to base/tps/src/include/apdu/Get_Version_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Import_Key_APDU.h b/base/tps/src/include/apdu/Import_Key_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Import_Key_APDU.h
rename to base/tps/src/include/apdu/Import_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Import_Key_Enc_APDU.h b/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
rename to base/tps/src/include/apdu/Import_Key_Enc_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Initialize_Update_APDU.h b/base/tps/src/include/apdu/Initialize_Update_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Initialize_Update_APDU.h
rename to base/tps/src/include/apdu/Initialize_Update_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Install_Applet_APDU.h b/base/tps/src/include/apdu/Install_Applet_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Install_Applet_APDU.h
rename to base/tps/src/include/apdu/Install_Applet_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Install_Load_APDU.h b/base/tps/src/include/apdu/Install_Load_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Install_Load_APDU.h
rename to base/tps/src/include/apdu/Install_Load_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Lifecycle_APDU.h b/base/tps/src/include/apdu/Lifecycle_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Lifecycle_APDU.h
rename to base/tps/src/include/apdu/Lifecycle_APDU.h
diff --git a/pki/base/tps/src/include/apdu/List_Objects_APDU.h b/base/tps/src/include/apdu/List_Objects_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/List_Objects_APDU.h
rename to base/tps/src/include/apdu/List_Objects_APDU.h
diff --git a/pki/base/tps/src/include/apdu/List_Pins_APDU.h b/base/tps/src/include/apdu/List_Pins_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/List_Pins_APDU.h
rename to base/tps/src/include/apdu/List_Pins_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Load_File_APDU.h b/base/tps/src/include/apdu/Load_File_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Load_File_APDU.h
rename to base/tps/src/include/apdu/Load_File_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Put_Key_APDU.h b/base/tps/src/include/apdu/Put_Key_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Put_Key_APDU.h
rename to base/tps/src/include/apdu/Put_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Read_Buffer_APDU.h b/base/tps/src/include/apdu/Read_Buffer_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Read_Buffer_APDU.h
rename to base/tps/src/include/apdu/Read_Buffer_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Read_Object_APDU.h b/base/tps/src/include/apdu/Read_Object_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Read_Object_APDU.h
rename to base/tps/src/include/apdu/Read_Object_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Select_APDU.h b/base/tps/src/include/apdu/Select_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Select_APDU.h
rename to base/tps/src/include/apdu/Select_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h b/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
rename to base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Set_Pin_APDU.h b/base/tps/src/include/apdu/Set_Pin_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Set_Pin_APDU.h
rename to base/tps/src/include/apdu/Set_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Unblock_Pin_APDU.h b/base/tps/src/include/apdu/Unblock_Pin_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Unblock_Pin_APDU.h
rename to base/tps/src/include/apdu/Unblock_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Write_Object_APDU.h b/base/tps/src/include/apdu/Write_Object_APDU.h
similarity index 100%
rename from pki/base/tps/src/include/apdu/Write_Object_APDU.h
rename to base/tps/src/include/apdu/Write_Object_APDU.h
diff --git a/pki/base/tps/src/include/authentication/AuthParams.h b/base/tps/src/include/authentication/AuthParams.h
similarity index 100%
rename from pki/base/tps/src/include/authentication/AuthParams.h
rename to base/tps/src/include/authentication/AuthParams.h
diff --git a/pki/base/tps/src/include/authentication/Authentication.h b/base/tps/src/include/authentication/Authentication.h
similarity index 100%
rename from pki/base/tps/src/include/authentication/Authentication.h
rename to base/tps/src/include/authentication/Authentication.h
diff --git a/pki/base/tps/src/include/authentication/LDAP_Authentication.h b/base/tps/src/include/authentication/LDAP_Authentication.h
similarity index 100%
rename from pki/base/tps/src/include/authentication/LDAP_Authentication.h
rename to base/tps/src/include/authentication/LDAP_Authentication.h
diff --git a/pki/base/tps/src/include/channel/Channel.h b/base/tps/src/include/channel/Channel.h
similarity index 100%
rename from pki/base/tps/src/include/channel/Channel.h
rename to base/tps/src/include/channel/Channel.h
diff --git a/pki/base/tps/src/include/channel/Secure_Channel.h b/base/tps/src/include/channel/Secure_Channel.h
similarity index 100%
rename from pki/base/tps/src/include/channel/Secure_Channel.h
rename to base/tps/src/include/channel/Secure_Channel.h
diff --git a/pki/base/tps/src/include/cms/CertEnroll.h b/base/tps/src/include/cms/CertEnroll.h
similarity index 100%
rename from pki/base/tps/src/include/cms/CertEnroll.h
rename to base/tps/src/include/cms/CertEnroll.h
diff --git a/pki/base/tps/src/include/cms/ConnectionInfo.h b/base/tps/src/include/cms/ConnectionInfo.h
similarity index 100%
rename from pki/base/tps/src/include/cms/ConnectionInfo.h
rename to base/tps/src/include/cms/ConnectionInfo.h
diff --git a/pki/base/tps/src/include/cms/HttpConnection.h b/base/tps/src/include/cms/HttpConnection.h
similarity index 100%
rename from pki/base/tps/src/include/cms/HttpConnection.h
rename to base/tps/src/include/cms/HttpConnection.h
diff --git a/pki/base/tps/src/include/engine/RA.h b/base/tps/src/include/engine/RA.h
similarity index 100%
rename from pki/base/tps/src/include/engine/RA.h
rename to base/tps/src/include/engine/RA.h
diff --git a/pki/base/tps/src/include/engine/audit.h b/base/tps/src/include/engine/audit.h
similarity index 100%
rename from pki/base/tps/src/include/engine/audit.h
rename to base/tps/src/include/engine/audit.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/AccessLogger.h b/base/tps/src/include/httpClient/httpc/AccessLogger.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/AccessLogger.h
rename to base/tps/src/include/httpClient/httpc/AccessLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Auth.h b/base/tps/src/include/httpClient/httpc/Auth.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Auth.h
rename to base/tps/src/include/httpClient/httpc/Auth.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ByteBuffer.h b/base/tps/src/include/httpClient/httpc/ByteBuffer.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ByteBuffer.h
rename to base/tps/src/include/httpClient/httpc/ByteBuffer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/CERTUtil.h b/base/tps/src/include/httpClient/httpc/CERTUtil.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/CERTUtil.h
rename to base/tps/src/include/httpClient/httpc/CERTUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Cache.h b/base/tps/src/include/httpClient/httpc/Cache.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Cache.h
rename to base/tps/src/include/httpClient/httpc/Cache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Connection.h b/base/tps/src/include/httpClient/httpc/Connection.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Connection.h
rename to base/tps/src/include/httpClient/httpc/Connection.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ConnectionListener.h b/base/tps/src/include/httpClient/httpc/ConnectionListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ConnectionListener.h
rename to base/tps/src/include/httpClient/httpc/ConnectionListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/DebugLogger.h b/base/tps/src/include/httpClient/httpc/DebugLogger.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/DebugLogger.h
rename to base/tps/src/include/httpClient/httpc/DebugLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Defines.h b/base/tps/src/include/httpClient/httpc/Defines.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Defines.h
rename to base/tps/src/include/httpClient/httpc/Defines.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ErrorLogger.h b/base/tps/src/include/httpClient/httpc/ErrorLogger.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ErrorLogger.h
rename to base/tps/src/include/httpClient/httpc/ErrorLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Iterator.h b/base/tps/src/include/httpClient/httpc/Iterator.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Iterator.h
rename to base/tps/src/include/httpClient/httpc/Iterator.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/LogRotationTask.h b/base/tps/src/include/httpClient/httpc/LogRotationTask.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/LogRotationTask.h
rename to base/tps/src/include/httpClient/httpc/LogRotationTask.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Logger.h b/base/tps/src/include/httpClient/httpc/Logger.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Logger.h
rename to base/tps/src/include/httpClient/httpc/Logger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/NSPRerrs.h b/base/tps/src/include/httpClient/httpc/NSPRerrs.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/NSPRerrs.h
rename to base/tps/src/include/httpClient/httpc/NSPRerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddy.h b/base/tps/src/include/httpClient/httpc/PSBuddy.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSBuddy.h
rename to base/tps/src/include/httpClient/httpc/PSBuddy.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyCache.h b/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
rename to base/tps/src/include/httpClient/httpc/PSBuddyCache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyList.h b/base/tps/src/include/httpClient/httpc/PSBuddyList.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSBuddyList.h
rename to base/tps/src/include/httpClient/httpc/PSBuddyList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyListener.h b/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
rename to base/tps/src/include/httpClient/httpc/PSBuddyListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyService.h b/base/tps/src/include/httpClient/httpc/PSBuddyService.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSBuddyService.h
rename to base/tps/src/include/httpClient/httpc/PSBuddyService.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCertExtension.h b/base/tps/src/include/httpClient/httpc/PSCertExtension.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSCertExtension.h
rename to base/tps/src/include/httpClient/httpc/PSCertExtension.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCommonLib.h b/base/tps/src/include/httpClient/httpc/PSCommonLib.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSCommonLib.h
rename to base/tps/src/include/httpClient/httpc/PSCommonLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfig.h b/base/tps/src/include/httpClient/httpc/PSConfig.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSConfig.h
rename to base/tps/src/include/httpClient/httpc/PSConfig.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfigManager.h b/base/tps/src/include/httpClient/httpc/PSConfigManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSConfigManager.h
rename to base/tps/src/include/httpClient/httpc/PSConfigManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfigReader.h b/base/tps/src/include/httpClient/httpc/PSConfigReader.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSConfigReader.h
rename to base/tps/src/include/httpClient/httpc/PSConfigReader.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCrypt.h b/base/tps/src/include/httpClient/httpc/PSCrypt.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSCrypt.h
rename to base/tps/src/include/httpClient/httpc/PSCrypt.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h b/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
rename to base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h b/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
rename to base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSGroup.h b/base/tps/src/include/httpClient/httpc/PSGroup.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSGroup.h
rename to base/tps/src/include/httpClient/httpc/PSGroup.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSGroupCache.h b/base/tps/src/include/httpClient/httpc/PSGroupCache.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSGroupCache.h
rename to base/tps/src/include/httpClient/httpc/PSGroupCache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSHelper.h b/base/tps/src/include/httpClient/httpc/PSHelper.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSHelper.h
rename to base/tps/src/include/httpClient/httpc/PSHelper.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSListener.h b/base/tps/src/include/httpClient/httpc/PSListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSListener.h
rename to base/tps/src/include/httpClient/httpc/PSListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPRUtil.h b/base/tps/src/include/httpClient/httpc/PSPRUtil.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSPRUtil.h
rename to base/tps/src/include/httpClient/httpc/PSPRUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPlugin.h b/base/tps/src/include/httpClient/httpc/PSPlugin.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSPlugin.h
rename to base/tps/src/include/httpClient/httpc/PSPlugin.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPluginManager.h b/base/tps/src/include/httpClient/httpc/PSPluginManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSPluginManager.h
rename to base/tps/src/include/httpClient/httpc/PSPluginManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServer.h b/base/tps/src/include/httpClient/httpc/PSServer.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServer.h
rename to base/tps/src/include/httpClient/httpc/PSServer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerLib.h b/base/tps/src/include/httpClient/httpc/PSServerLib.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServerLib.h
rename to base/tps/src/include/httpClient/httpc/PSServerLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerListener.h b/base/tps/src/include/httpClient/httpc/PSServerListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServerListener.h
rename to base/tps/src/include/httpClient/httpc/PSServerListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerManager.h b/base/tps/src/include/httpClient/httpc/PSServerManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServerManager.h
rename to base/tps/src/include/httpClient/httpc/PSServerManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServiceListener.h b/base/tps/src/include/httpClient/httpc/PSServiceListener.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServiceListener.h
rename to base/tps/src/include/httpClient/httpc/PSServiceListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServiceManager.h b/base/tps/src/include/httpClient/httpc/PSServiceManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSServiceManager.h
rename to base/tps/src/include/httpClient/httpc/PSServiceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSUser.h b/base/tps/src/include/httpClient/httpc/PSUser.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSUser.h
rename to base/tps/src/include/httpClient/httpc/PSUser.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSWaspLib.h b/base/tps/src/include/httpClient/httpc/PSWaspLib.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PSWaspLib.h
rename to base/tps/src/include/httpClient/httpc/PSWaspLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Pool.h b/base/tps/src/include/httpClient/httpc/Pool.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Pool.h
rename to base/tps/src/include/httpClient/httpc/Pool.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceManager.h b/base/tps/src/include/httpClient/httpc/PresenceManager.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PresenceManager.h
rename to base/tps/src/include/httpClient/httpc/PresenceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceServer.h b/base/tps/src/include/httpClient/httpc/PresenceServer.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PresenceServer.h
rename to base/tps/src/include/httpClient/httpc/PresenceServer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h b/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
rename to base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SECerrs.h b/base/tps/src/include/httpClient/httpc/SECerrs.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SECerrs.h
rename to base/tps/src/include/httpClient/httpc/SECerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLServerSocket.h b/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
rename to base/tps/src/include/httpClient/httpc/SSLServerSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLSocket.h b/base/tps/src/include/httpClient/httpc/SSLSocket.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SSLSocket.h
rename to base/tps/src/include/httpClient/httpc/SSLSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLerrs.h b/base/tps/src/include/httpClient/httpc/SSLerrs.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SSLerrs.h
rename to base/tps/src/include/httpClient/httpc/SSLerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ScheduledTask.h b/base/tps/src/include/httpClient/httpc/ScheduledTask.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ScheduledTask.h
rename to base/tps/src/include/httpClient/httpc/ScheduledTask.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Scheduler.h b/base/tps/src/include/httpClient/httpc/Scheduler.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Scheduler.h
rename to base/tps/src/include/httpClient/httpc/Scheduler.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SecurityHeaders.h b/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
rename to base/tps/src/include/httpClient/httpc/SecurityHeaders.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerConnection.h b/base/tps/src/include/httpClient/httpc/ServerConnection.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ServerConnection.h
rename to base/tps/src/include/httpClient/httpc/ServerConnection.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h b/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
rename to base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerSocket.h b/base/tps/src/include/httpClient/httpc/ServerSocket.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ServerSocket.h
rename to base/tps/src/include/httpClient/httpc/ServerSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Socket.h b/base/tps/src/include/httpClient/httpc/Socket.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/Socket.h
rename to base/tps/src/include/httpClient/httpc/Socket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SocketINC.h b/base/tps/src/include/httpClient/httpc/SocketINC.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SocketINC.h
rename to base/tps/src/include/httpClient/httpc/SocketINC.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SocketLib.h b/base/tps/src/include/httpClient/httpc/SocketLib.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/SocketLib.h
rename to base/tps/src/include/httpClient/httpc/SocketLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/StringList.h b/base/tps/src/include/httpClient/httpc/StringList.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/StringList.h
rename to base/tps/src/include/httpClient/httpc/StringList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/StringUtil.h b/base/tps/src/include/httpClient/httpc/StringUtil.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/StringUtil.h
rename to base/tps/src/include/httpClient/httpc/StringUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/TaskList.h b/base/tps/src/include/httpClient/httpc/TaskList.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/TaskList.h
rename to base/tps/src/include/httpClient/httpc/TaskList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ThreadPool.h b/base/tps/src/include/httpClient/httpc/ThreadPool.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/ThreadPool.h
rename to base/tps/src/include/httpClient/httpc/ThreadPool.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/URLUtil.h b/base/tps/src/include/httpClient/httpc/URLUtil.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/URLUtil.h
rename to base/tps/src/include/httpClient/httpc/URLUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/engine.h b/base/tps/src/include/httpClient/httpc/engine.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/engine.h
rename to base/tps/src/include/httpClient/httpc/engine.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/http.h b/base/tps/src/include/httpClient/httpc/http.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/http.h
rename to base/tps/src/include/httpClient/httpc/http.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/request.h b/base/tps/src/include/httpClient/httpc/request.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/request.h
rename to base/tps/src/include/httpClient/httpc/request.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/response.h b/base/tps/src/include/httpClient/httpc/response.h
similarity index 100%
rename from pki/base/tps/src/include/httpClient/httpc/response.h
rename to base/tps/src/include/httpClient/httpc/response.h
diff --git a/pki/base/tps/src/include/main/AttributeSpec.h b/base/tps/src/include/main/AttributeSpec.h
similarity index 100%
rename from pki/base/tps/src/include/main/AttributeSpec.h
rename to base/tps/src/include/main/AttributeSpec.h
diff --git a/pki/base/tps/src/include/main/AuthenticationEntry.h b/base/tps/src/include/main/AuthenticationEntry.h
similarity index 100%
rename from pki/base/tps/src/include/main/AuthenticationEntry.h
rename to base/tps/src/include/main/AuthenticationEntry.h
diff --git a/pki/base/tps/src/include/main/Base.h b/base/tps/src/include/main/Base.h
similarity index 100%
rename from pki/base/tps/src/include/main/Base.h
rename to base/tps/src/include/main/Base.h
diff --git a/pki/base/tps/src/include/main/Buffer.h b/base/tps/src/include/main/Buffer.h
similarity index 100%
rename from pki/base/tps/src/include/main/Buffer.h
rename to base/tps/src/include/main/Buffer.h
diff --git a/pki/base/tps/src/include/main/ConfigStore.h b/base/tps/src/include/main/ConfigStore.h
similarity index 100%
rename from pki/base/tps/src/include/main/ConfigStore.h
rename to base/tps/src/include/main/ConfigStore.h
diff --git a/pki/base/tps/src/include/main/LogFile.h b/base/tps/src/include/main/LogFile.h
similarity index 100%
rename from pki/base/tps/src/include/main/LogFile.h
rename to base/tps/src/include/main/LogFile.h
diff --git a/pki/base/tps/src/include/main/Login.h b/base/tps/src/include/main/Login.h
similarity index 100%
rename from pki/base/tps/src/include/main/Login.h
rename to base/tps/src/include/main/Login.h
diff --git a/pki/base/tps/src/include/main/Memory.h b/base/tps/src/include/main/Memory.h
similarity index 100%
rename from pki/base/tps/src/include/main/Memory.h
rename to base/tps/src/include/main/Memory.h
diff --git a/pki/base/tps/src/include/main/MemoryMgr.h b/base/tps/src/include/main/MemoryMgr.h
similarity index 100%
rename from pki/base/tps/src/include/main/MemoryMgr.h
rename to base/tps/src/include/main/MemoryMgr.h
diff --git a/pki/base/tps/src/include/main/NameValueSet.h b/base/tps/src/include/main/NameValueSet.h
similarity index 100%
rename from pki/base/tps/src/include/main/NameValueSet.h
rename to base/tps/src/include/main/NameValueSet.h
diff --git a/pki/base/tps/src/include/main/ObjectSpec.h b/base/tps/src/include/main/ObjectSpec.h
similarity index 100%
rename from pki/base/tps/src/include/main/ObjectSpec.h
rename to base/tps/src/include/main/ObjectSpec.h
diff --git a/pki/base/tps/src/include/main/PKCS11Obj.h b/base/tps/src/include/main/PKCS11Obj.h
similarity index 100%
rename from pki/base/tps/src/include/main/PKCS11Obj.h
rename to base/tps/src/include/main/PKCS11Obj.h
diff --git a/pki/base/tps/src/include/main/PublishEntry.h b/base/tps/src/include/main/PublishEntry.h
similarity index 100%
rename from pki/base/tps/src/include/main/PublishEntry.h
rename to base/tps/src/include/main/PublishEntry.h
diff --git a/pki/base/tps/src/include/main/RA_Context.h b/base/tps/src/include/main/RA_Context.h
similarity index 100%
rename from pki/base/tps/src/include/main/RA_Context.h
rename to base/tps/src/include/main/RA_Context.h
diff --git a/pki/base/tps/src/include/main/RA_Msg.h b/base/tps/src/include/main/RA_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/main/RA_Msg.h
rename to base/tps/src/include/main/RA_Msg.h
diff --git a/pki/base/tps/src/include/main/RA_Session.h b/base/tps/src/include/main/RA_Session.h
similarity index 100%
rename from pki/base/tps/src/include/main/RA_Session.h
rename to base/tps/src/include/main/RA_Session.h
diff --git a/pki/base/tps/src/include/main/RA_pblock.h b/base/tps/src/include/main/RA_pblock.h
similarity index 100%
rename from pki/base/tps/src/include/main/RA_pblock.h
rename to base/tps/src/include/main/RA_pblock.h
diff --git a/pki/base/tps/src/include/main/RollingLogFile.h b/base/tps/src/include/main/RollingLogFile.h
similarity index 100%
rename from pki/base/tps/src/include/main/RollingLogFile.h
rename to base/tps/src/include/main/RollingLogFile.h
diff --git a/pki/base/tps/src/include/main/SecureId.h b/base/tps/src/include/main/SecureId.h
similarity index 100%
rename from pki/base/tps/src/include/main/SecureId.h
rename to base/tps/src/include/main/SecureId.h
diff --git a/pki/base/tps/src/include/main/Util.h b/base/tps/src/include/main/Util.h
similarity index 100%
rename from pki/base/tps/src/include/main/Util.h
rename to base/tps/src/include/main/Util.h
diff --git a/pki/base/tps/src/include/modules/tps/AP_Context.h b/base/tps/src/include/modules/tps/AP_Context.h
similarity index 100%
rename from pki/base/tps/src/include/modules/tps/AP_Context.h
rename to base/tps/src/include/modules/tps/AP_Context.h
diff --git a/pki/base/tps/src/include/modules/tps/AP_Session.h b/base/tps/src/include/modules/tps/AP_Session.h
similarity index 100%
rename from pki/base/tps/src/include/modules/tps/AP_Session.h
rename to base/tps/src/include/modules/tps/AP_Session.h
diff --git a/pki/base/tps/src/include/msg/RA_ASQ_Request_Msg.h b/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
rename to base/tps/src/include/msg/RA_ASQ_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_ASQ_Response_Msg.h b/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
rename to base/tps/src/include/msg/RA_ASQ_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Begin_Op_Msg.h b/base/tps/src/include/msg/RA_Begin_Op_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Begin_Op_Msg.h
rename to base/tps/src/include/msg/RA_Begin_Op_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_End_Op_Msg.h b/base/tps/src/include/msg/RA_End_Op_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_End_Op_Msg.h
rename to base/tps/src/include/msg/RA_End_Op_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h b/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
rename to base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h b/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
rename to base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Login_Request_Msg.h b/base/tps/src/include/msg/RA_Login_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Login_Request_Msg.h
rename to base/tps/src/include/msg/RA_Login_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Login_Response_Msg.h b/base/tps/src/include/msg/RA_Login_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Login_Response_Msg.h
rename to base/tps/src/include/msg/RA_Login_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h b/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
rename to base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h b/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
rename to base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_SecureId_Request_Msg.h b/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
rename to base/tps/src/include/msg/RA_SecureId_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_SecureId_Response_Msg.h b/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
rename to base/tps/src/include/msg/RA_SecureId_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h b/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
rename to base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h b/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
rename to base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h b/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
rename to base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h b/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
similarity index 100%
rename from pki/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
rename to base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
diff --git a/pki/base/tps/src/include/processor/RA_Enroll_Processor.h b/base/tps/src/include/processor/RA_Enroll_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Enroll_Processor.h
rename to base/tps/src/include/processor/RA_Enroll_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Format_Processor.h b/base/tps/src/include/processor/RA_Format_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Format_Processor.h
rename to base/tps/src/include/processor/RA_Format_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Pin_Reset_Processor.h b/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
rename to base/tps/src/include/processor/RA_Pin_Reset_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Processor.h b/base/tps/src/include/processor/RA_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Processor.h
rename to base/tps/src/include/processor/RA_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Renew_Processor.h b/base/tps/src/include/processor/RA_Renew_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Renew_Processor.h
rename to base/tps/src/include/processor/RA_Renew_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Unblock_Processor.h b/base/tps/src/include/processor/RA_Unblock_Processor.h
similarity index 100%
rename from pki/base/tps/src/include/processor/RA_Unblock_Processor.h
rename to base/tps/src/include/processor/RA_Unblock_Processor.h
diff --git a/pki/base/tps/src/include/publisher/IConnector.h b/base/tps/src/include/publisher/IConnector.h
similarity index 100%
rename from pki/base/tps/src/include/publisher/IConnector.h
rename to base/tps/src/include/publisher/IConnector.h
diff --git a/pki/base/tps/src/include/publisher/IPublish_Data.h b/base/tps/src/include/publisher/IPublish_Data.h
similarity index 100%
rename from pki/base/tps/src/include/publisher/IPublish_Data.h
rename to base/tps/src/include/publisher/IPublish_Data.h
diff --git a/pki/base/tps/src/include/publisher/IPublisher.h b/base/tps/src/include/publisher/IPublisher.h
similarity index 100%
rename from pki/base/tps/src/include/publisher/IPublisher.h
rename to base/tps/src/include/publisher/IPublisher.h
diff --git a/pki/base/tps/src/include/publisher/NetkeyPublisher.h b/base/tps/src/include/publisher/NetkeyPublisher.h
similarity index 100%
rename from pki/base/tps/src/include/publisher/NetkeyPublisher.h
rename to base/tps/src/include/publisher/NetkeyPublisher.h
diff --git a/pki/base/tps/src/include/selftests/SelfTest.h b/base/tps/src/include/selftests/SelfTest.h
similarity index 100%
rename from pki/base/tps/src/include/selftests/SelfTest.h
rename to base/tps/src/include/selftests/SelfTest.h
diff --git a/pki/base/tps/src/include/selftests/TPSPresence.h b/base/tps/src/include/selftests/TPSPresence.h
similarity index 100%
rename from pki/base/tps/src/include/selftests/TPSPresence.h
rename to base/tps/src/include/selftests/TPSPresence.h
diff --git a/pki/base/tps/src/include/selftests/TPSSystemCertsVerification.h b/base/tps/src/include/selftests/TPSSystemCertsVerification.h
similarity index 100%
rename from pki/base/tps/src/include/selftests/TPSSystemCertsVerification.h
rename to base/tps/src/include/selftests/TPSSystemCertsVerification.h
diff --git a/pki/base/tps/src/include/selftests/TPSValidity.h b/base/tps/src/include/selftests/TPSValidity.h
similarity index 100%
rename from pki/base/tps/src/include/selftests/TPSValidity.h
rename to base/tps/src/include/selftests/TPSValidity.h
diff --git a/pki/base/tps/src/include/service/NK_Context.h b/base/tps/src/include/service/NK_Context.h
similarity index 100%
rename from pki/base/tps/src/include/service/NK_Context.h
rename to base/tps/src/include/service/NK_Context.h
diff --git a/pki/base/tps/src/include/service/NK_Session.h b/base/tps/src/include/service/NK_Session.h
similarity index 100%
rename from pki/base/tps/src/include/service/NK_Session.h
rename to base/tps/src/include/service/NK_Session.h
diff --git a/pki/base/tps/src/include/tus/tus_db.h b/base/tps/src/include/tus/tus_db.h
similarity index 100%
rename from pki/base/tps/src/include/tus/tus_db.h
rename to base/tps/src/include/tus/tus_db.h
diff --git a/pki/base/tps/src/main/AttributeSpec.cpp b/base/tps/src/main/AttributeSpec.cpp
similarity index 100%
rename from pki/base/tps/src/main/AttributeSpec.cpp
rename to base/tps/src/main/AttributeSpec.cpp
diff --git a/pki/base/tps/src/main/AuthParams.cpp b/base/tps/src/main/AuthParams.cpp
similarity index 100%
rename from pki/base/tps/src/main/AuthParams.cpp
rename to base/tps/src/main/AuthParams.cpp
diff --git a/pki/base/tps/src/main/Authentication.cpp b/base/tps/src/main/Authentication.cpp
similarity index 100%
rename from pki/base/tps/src/main/Authentication.cpp
rename to base/tps/src/main/Authentication.cpp
diff --git a/pki/base/tps/src/main/AuthenticationEntry.cpp b/base/tps/src/main/AuthenticationEntry.cpp
similarity index 100%
rename from pki/base/tps/src/main/AuthenticationEntry.cpp
rename to base/tps/src/main/AuthenticationEntry.cpp
diff --git a/pki/base/tps/src/main/Buffer.cpp b/base/tps/src/main/Buffer.cpp
similarity index 100%
rename from pki/base/tps/src/main/Buffer.cpp
rename to base/tps/src/main/Buffer.cpp
diff --git a/pki/base/tps/src/main/ConfigStore.cpp b/base/tps/src/main/ConfigStore.cpp
similarity index 100%
rename from pki/base/tps/src/main/ConfigStore.cpp
rename to base/tps/src/main/ConfigStore.cpp
diff --git a/pki/base/tps/src/main/LogFile.cpp b/base/tps/src/main/LogFile.cpp
similarity index 100%
rename from pki/base/tps/src/main/LogFile.cpp
rename to base/tps/src/main/LogFile.cpp
diff --git a/pki/base/tps/src/main/Login.cpp b/base/tps/src/main/Login.cpp
similarity index 100%
rename from pki/base/tps/src/main/Login.cpp
rename to base/tps/src/main/Login.cpp
diff --git a/pki/base/tps/src/main/Memory.cpp b/base/tps/src/main/Memory.cpp
similarity index 100%
rename from pki/base/tps/src/main/Memory.cpp
rename to base/tps/src/main/Memory.cpp
diff --git a/pki/base/tps/src/main/NameValueSet.cpp b/base/tps/src/main/NameValueSet.cpp
similarity index 100%
rename from pki/base/tps/src/main/NameValueSet.cpp
rename to base/tps/src/main/NameValueSet.cpp
diff --git a/pki/base/tps/src/main/ObjectSpec.cpp b/base/tps/src/main/ObjectSpec.cpp
similarity index 100%
rename from pki/base/tps/src/main/ObjectSpec.cpp
rename to base/tps/src/main/ObjectSpec.cpp
diff --git a/pki/base/tps/src/main/PKCS11Obj.cpp b/base/tps/src/main/PKCS11Obj.cpp
similarity index 100%
rename from pki/base/tps/src/main/PKCS11Obj.cpp
rename to base/tps/src/main/PKCS11Obj.cpp
diff --git a/pki/base/tps/src/main/RA_Context.cpp b/base/tps/src/main/RA_Context.cpp
similarity index 100%
rename from pki/base/tps/src/main/RA_Context.cpp
rename to base/tps/src/main/RA_Context.cpp
diff --git a/pki/base/tps/src/main/RA_Msg.cpp b/base/tps/src/main/RA_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/main/RA_Msg.cpp
rename to base/tps/src/main/RA_Msg.cpp
diff --git a/pki/base/tps/src/main/RA_Session.cpp b/base/tps/src/main/RA_Session.cpp
similarity index 100%
rename from pki/base/tps/src/main/RA_Session.cpp
rename to base/tps/src/main/RA_Session.cpp
diff --git a/pki/base/tps/src/main/RA_pblock.cpp b/base/tps/src/main/RA_pblock.cpp
similarity index 100%
rename from pki/base/tps/src/main/RA_pblock.cpp
rename to base/tps/src/main/RA_pblock.cpp
diff --git a/pki/base/tps/src/main/RollingLogFile.cpp b/base/tps/src/main/RollingLogFile.cpp
similarity index 100%
rename from pki/base/tps/src/main/RollingLogFile.cpp
rename to base/tps/src/main/RollingLogFile.cpp
diff --git a/pki/base/tps/src/main/SecureId.cpp b/base/tps/src/main/SecureId.cpp
similarity index 100%
rename from pki/base/tps/src/main/SecureId.cpp
rename to base/tps/src/main/SecureId.cpp
diff --git a/pki/base/tps/src/main/Util.cpp b/base/tps/src/main/Util.cpp
similarity index 100%
rename from pki/base/tps/src/main/Util.cpp
rename to base/tps/src/main/Util.cpp
diff --git a/pki/base/tps/src/modules/CMakeLists.txt b/base/tps/src/modules/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/modules/CMakeLists.txt
rename to base/tps/src/modules/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tokendb/CMakeLists.txt b/base/tps/src/modules/tokendb/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/modules/tokendb/CMakeLists.txt
rename to base/tps/src/modules/tokendb/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp b/base/tps/src/modules/tokendb/mod_tokendb.cpp
similarity index 100%
rename from pki/base/tps/src/modules/tokendb/mod_tokendb.cpp
rename to base/tps/src/modules/tokendb/mod_tokendb.cpp
diff --git a/pki/base/tps/src/modules/tps/AP_Context.cpp b/base/tps/src/modules/tps/AP_Context.cpp
similarity index 100%
rename from pki/base/tps/src/modules/tps/AP_Context.cpp
rename to base/tps/src/modules/tps/AP_Context.cpp
diff --git a/pki/base/tps/src/modules/tps/AP_Session.cpp b/base/tps/src/modules/tps/AP_Session.cpp
similarity index 100%
rename from pki/base/tps/src/modules/tps/AP_Session.cpp
rename to base/tps/src/modules/tps/AP_Session.cpp
diff --git a/pki/base/tps/src/modules/tps/CMakeLists.txt b/base/tps/src/modules/tps/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/modules/tps/CMakeLists.txt
rename to base/tps/src/modules/tps/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tps/mod_tps.cpp b/base/tps/src/modules/tps/mod_tps.cpp
similarity index 100%
rename from pki/base/tps/src/modules/tps/mod_tps.cpp
rename to base/tps/src/modules/tps/mod_tps.cpp
diff --git a/pki/base/tps/src/msg/RA_ASQ_Request_Msg.cpp b/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
rename to base/tps/src/msg/RA_ASQ_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_ASQ_Response_Msg.cpp b/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
rename to base/tps/src/msg/RA_ASQ_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Begin_Op_Msg.cpp b/base/tps/src/msg/RA_Begin_Op_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Begin_Op_Msg.cpp
rename to base/tps/src/msg/RA_Begin_Op_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_End_Op_Msg.cpp b/base/tps/src/msg/RA_End_Op_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_End_Op_Msg.cpp
rename to base/tps/src/msg/RA_End_Op_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp b/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
rename to base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp b/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
rename to base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Login_Request_Msg.cpp b/base/tps/src/msg/RA_Login_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Login_Request_Msg.cpp
rename to base/tps/src/msg/RA_Login_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Login_Response_Msg.cpp b/base/tps/src/msg/RA_Login_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Login_Response_Msg.cpp
rename to base/tps/src/msg/RA_Login_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp b/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
rename to base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp b/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
rename to base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_SecureId_Request_Msg.cpp b/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
rename to base/tps/src/msg/RA_SecureId_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_SecureId_Response_Msg.cpp b/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
rename to base/tps/src/msg/RA_SecureId_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp b/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
rename to base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp b/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
rename to base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp b/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
rename to base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp b/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
similarity index 100%
rename from pki/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
rename to base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
diff --git a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp b/base/tps/src/processor/RA_Enroll_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Enroll_Processor.cpp
rename to base/tps/src/processor/RA_Enroll_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Format_Processor.cpp b/base/tps/src/processor/RA_Format_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Format_Processor.cpp
rename to base/tps/src/processor/RA_Format_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Pin_Reset_Processor.cpp b/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
rename to base/tps/src/processor/RA_Pin_Reset_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Processor.cpp b/base/tps/src/processor/RA_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Processor.cpp
rename to base/tps/src/processor/RA_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Renew_Processor.cpp b/base/tps/src/processor/RA_Renew_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Renew_Processor.cpp
rename to base/tps/src/processor/RA_Renew_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Unblock_Processor.cpp b/base/tps/src/processor/RA_Unblock_Processor.cpp
similarity index 100%
rename from pki/base/tps/src/processor/RA_Unblock_Processor.cpp
rename to base/tps/src/processor/RA_Unblock_Processor.cpp
diff --git a/pki/base/tps/src/selftests/SelfTest.cpp b/base/tps/src/selftests/SelfTest.cpp
similarity index 100%
rename from pki/base/tps/src/selftests/SelfTest.cpp
rename to base/tps/src/selftests/SelfTest.cpp
diff --git a/pki/base/tps/src/selftests/TPSPresence.cpp b/base/tps/src/selftests/TPSPresence.cpp
similarity index 100%
rename from pki/base/tps/src/selftests/TPSPresence.cpp
rename to base/tps/src/selftests/TPSPresence.cpp
diff --git a/pki/base/tps/src/selftests/TPSSystemCertsVerification.cpp b/base/tps/src/selftests/TPSSystemCertsVerification.cpp
similarity index 100%
rename from pki/base/tps/src/selftests/TPSSystemCertsVerification.cpp
rename to base/tps/src/selftests/TPSSystemCertsVerification.cpp
diff --git a/pki/base/tps/src/selftests/TPSValidity.cpp b/base/tps/src/selftests/TPSValidity.cpp
similarity index 100%
rename from pki/base/tps/src/selftests/TPSValidity.cpp
rename to base/tps/src/selftests/TPSValidity.cpp
diff --git a/pki/base/tps/src/test/Test_ConfigStore.cfg b/base/tps/src/test/Test_ConfigStore.cfg
similarity index 100%
rename from pki/base/tps/src/test/Test_ConfigStore.cfg
rename to base/tps/src/test/Test_ConfigStore.cfg
diff --git a/pki/base/tps/src/test/Test_ConfigStore.cpp b/base/tps/src/test/Test_ConfigStore.cpp
similarity index 100%
rename from pki/base/tps/src/test/Test_ConfigStore.cpp
rename to base/tps/src/test/Test_ConfigStore.cpp
diff --git a/pki/base/tps/src/tus/CMakeLists.txt b/base/tps/src/tus/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/src/tus/CMakeLists.txt
rename to base/tps/src/tus/CMakeLists.txt
diff --git a/pki/base/tps/src/tus/tus_db.c b/base/tps/src/tus/tus_db.c
similarity index 100%
rename from pki/base/tps/src/tus/tus_db.c
rename to base/tps/src/tus/tus_db.c
diff --git a/pki/base/tps/stubs/modules/nss/mod_nss_stub.c b/base/tps/stubs/modules/nss/mod_nss_stub.c
similarity index 100%
rename from pki/base/tps/stubs/modules/nss/mod_nss_stub.c
rename to base/tps/stubs/modules/nss/mod_nss_stub.c
diff --git a/pki/base/tps/tools/CMakeLists.txt b/base/tps/tools/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/tools/CMakeLists.txt
rename to base/tps/tools/CMakeLists.txt
diff --git a/pki/base/tps/tools/raclient/CMakeLists.txt b/base/tps/tools/raclient/CMakeLists.txt
similarity index 100%
rename from pki/base/tps/tools/raclient/CMakeLists.txt
rename to base/tps/tools/raclient/CMakeLists.txt
diff --git a/pki/base/tps/tools/raclient/RA_Client.cpp b/base/tps/tools/raclient/RA_Client.cpp
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Client.cpp
rename to base/tps/tools/raclient/RA_Client.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Client.h b/base/tps/tools/raclient/RA_Client.h
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Client.h
rename to base/tps/tools/raclient/RA_Client.h
diff --git a/pki/base/tps/tools/raclient/RA_Conn.cpp b/base/tps/tools/raclient/RA_Conn.cpp
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Conn.cpp
rename to base/tps/tools/raclient/RA_Conn.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Conn.h b/base/tps/tools/raclient/RA_Conn.h
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Conn.h
rename to base/tps/tools/raclient/RA_Conn.h
diff --git a/pki/base/tps/tools/raclient/RA_Token.cpp b/base/tps/tools/raclient/RA_Token.cpp
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Token.cpp
rename to base/tps/tools/raclient/RA_Token.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Token.h b/base/tps/tools/raclient/RA_Token.h
similarity index 100%
rename from pki/base/tps/tools/raclient/RA_Token.h
rename to base/tps/tools/raclient/RA_Token.h
diff --git a/pki/base/tps/tools/raclient/enroll.tps b/base/tps/tools/raclient/enroll.tps
similarity index 100%
rename from pki/base/tps/tools/raclient/enroll.tps
rename to base/tps/tools/raclient/enroll.tps
diff --git a/pki/base/tps/tools/raclient/enroll1.test b/base/tps/tools/raclient/enroll1.test
similarity index 100%
rename from pki/base/tps/tools/raclient/enroll1.test
rename to base/tps/tools/raclient/enroll1.test
diff --git a/pki/base/tps/tools/raclient/format.tps b/base/tps/tools/raclient/format.tps
similarity index 100%
rename from pki/base/tps/tools/raclient/format.tps
rename to base/tps/tools/raclient/format.tps
diff --git a/pki/base/tps/tools/raclient/nt_enroll.test b/base/tps/tools/raclient/nt_enroll.test
similarity index 100%
rename from pki/base/tps/tools/raclient/nt_enroll.test
rename to base/tps/tools/raclient/nt_enroll.test
diff --git a/pki/base/tps/tools/raclient/readme.txt b/base/tps/tools/raclient/readme.txt
similarity index 100%
rename from pki/base/tps/tools/raclient/readme.txt
rename to base/tps/tools/raclient/readme.txt
diff --git a/pki/base/tps/tools/raclient/reset_pin.tps b/base/tps/tools/raclient/reset_pin.tps
similarity index 100%
rename from pki/base/tps/tools/raclient/reset_pin.tps
rename to base/tps/tools/raclient/reset_pin.tps
diff --git a/pki/base/tps/tools/raclient/reset_pin1.test b/base/tps/tools/raclient/reset_pin1.test
similarity index 100%
rename from pki/base/tps/tools/raclient/reset_pin1.test
rename to base/tps/tools/raclient/reset_pin1.test
diff --git a/pki/base/tps/tools/raclient/reset_pin2.test b/base/tps/tools/raclient/reset_pin2.test
similarity index 100%
rename from pki/base/tps/tools/raclient/reset_pin2.test
rename to base/tps/tools/raclient/reset_pin2.test
diff --git a/pki/base/tps/tools/tus/add.c b/base/tps/tools/tus/add.c
similarity index 100%
rename from pki/base/tps/tools/tus/add.c
rename to base/tps/tools/tus/add.c
diff --git a/pki/base/tps/tools/tus/test.c b/base/tps/tools/tus/test.c
similarity index 100%
rename from pki/base/tps/tools/tus/test.c
rename to base/tps/tools/tus/test.c
diff --git a/pki/base/tps/ui/perl/Velocity.pm b/base/tps/ui/perl/Velocity.pm
similarity index 100%
rename from pki/base/tps/ui/perl/Velocity.pm
rename to base/tps/ui/perl/Velocity.pm
diff --git a/pki/base/tps/wrappers/tpsclient.in b/base/tps/wrappers/tpsclient.in
similarity index 100%
rename from pki/base/tps/wrappers/tpsclient.in
rename to base/tps/wrappers/tpsclient.in
diff --git a/pki/base/util/CMakeLists.txt b/base/util/CMakeLists.txt
similarity index 100%
rename from pki/base/util/CMakeLists.txt
rename to base/util/CMakeLists.txt
diff --git a/pki/base/util/LICENSE b/base/util/LICENSE
similarity index 100%
rename from pki/base/util/LICENSE
rename to base/util/LICENSE
diff --git a/pki/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt
similarity index 100%
rename from pki/base/util/src/CMakeLists.txt
rename to base/util/src/CMakeLists.txt
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
rename to base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java b/base/util/src/com/netscape/cmsutil/crypto/Module.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/crypto/Module.java
rename to base/util/src/com/netscape/cmsutil/crypto/Module.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java b/base/util/src/com/netscape/cmsutil/crypto/Token.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/crypto/Token.java
rename to base/util/src/com/netscape/cmsutil/crypto/Token.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java b/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
rename to base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/Http.java b/base/util/src/com/netscape/cmsutil/http/Http.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/Http.java
rename to base/util/src/com/netscape/cmsutil/http/Http.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java b/base/util/src/com/netscape/cmsutil/http/HttpClient.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java
rename to base/util/src/com/netscape/cmsutil/http/HttpClient.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpEofException.java b/base/util/src/com/netscape/cmsutil/http/HttpEofException.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpEofException.java
rename to base/util/src/com/netscape/cmsutil/http/HttpEofException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java b/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
rename to base/util/src/com/netscape/cmsutil/http/HttpMessage.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java b/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
rename to base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java b/base/util/src/com/netscape/cmsutil/http/HttpRequest.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java
rename to base/util/src/com/netscape/cmsutil/http/HttpRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java b/base/util/src/com/netscape/cmsutil/http/HttpResponse.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java
rename to base/util/src/com/netscape/cmsutil/http/HttpResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
rename to base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java b/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
rename to base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java b/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
rename to base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
rename to base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java b/base/util/src/com/netscape/cmsutil/ocsp/CertID.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java
rename to base/util/src/com/netscape/cmsutil/ocsp/CertID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
rename to base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
rename to base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java b/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
rename to base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java b/base/util/src/com/netscape/cmsutil/ocsp/NameID.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java
rename to base/util/src/com/netscape/cmsutil/ocsp/NameID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
rename to base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
rename to base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
rename to base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java b/base/util/src/com/netscape/cmsutil/ocsp/Request.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java
rename to base/util/src/com/netscape/cmsutil/ocsp/Request.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
rename to base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java b/base/util/src/com/netscape/cmsutil/ocsp/Response.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java
rename to base/util/src/com/netscape/cmsutil/ocsp/Response.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
rename to base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
rename to base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
rename to base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java b/base/util/src/com/netscape/cmsutil/ocsp/Signature.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java
rename to base/util/src/com/netscape/cmsutil/ocsp/Signature.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
rename to base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
rename to base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
rename to base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
rename to base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java b/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
rename to base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java b/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
rename to base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
rename to base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
rename to base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
rename to base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java b/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
rename to base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java b/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
rename to base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java b/base/util/src/com/netscape/cmsutil/radius/AccessReject.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java
rename to base/util/src/com/netscape/cmsutil/radius/AccessReject.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java b/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
rename to base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java b/base/util/src/com/netscape/cmsutil/radius/Attribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java
rename to base/util/src/com/netscape/cmsutil/radius/Attribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java b/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
rename to base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java b/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
rename to base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java b/base/util/src/com/netscape/cmsutil/radius/Authenticator.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java
rename to base/util/src/com/netscape/cmsutil/radius/Authenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java b/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
rename to base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java b/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java b/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java b/base/util/src/com/netscape/cmsutil/radius/NASPacket.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java
rename to base/util/src/com/netscape/cmsutil/radius/NASPacket.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java b/base/util/src/com/netscape/cmsutil/radius/Packet.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/Packet.java
rename to base/util/src/com/netscape/cmsutil/radius/Packet.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java b/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
rename to base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
rename to base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java b/base/util/src/com/netscape/cmsutil/radius/RejectException.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java
rename to base/util/src/com/netscape/cmsutil/radius/RejectException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java b/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
rename to base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java b/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
rename to base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java b/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
rename to base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java b/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java b/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
rename to base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
rename to base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java b/base/util/src/com/netscape/cmsutil/util/Cert.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/util/Cert.java
rename to base/util/src/com/netscape/cmsutil/util/Cert.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Fmt.java b/base/util/src/com/netscape/cmsutil/util/Fmt.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/util/Fmt.java
rename to base/util/src/com/netscape/cmsutil/util/Fmt.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java b/base/util/src/com/netscape/cmsutil/util/HMACDigest.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java
rename to base/util/src/com/netscape/cmsutil/util/HMACDigest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java b/base/util/src/com/netscape/cmsutil/util/Utils.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/util/Utils.java
rename to base/util/src/com/netscape/cmsutil/util/Utils.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
similarity index 100%
rename from pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
rename to base/util/src/com/netscape/cmsutil/xml/XMLObject.java
diff --git a/pki/base/util/src/netscape/net/NetworkClient.java b/base/util/src/netscape/net/NetworkClient.java
similarity index 100%
rename from pki/base/util/src/netscape/net/NetworkClient.java
rename to base/util/src/netscape/net/NetworkClient.java
diff --git a/pki/base/util/src/netscape/net/TransferProtocolClient.java b/base/util/src/netscape/net/TransferProtocolClient.java
similarity index 100%
rename from pki/base/util/src/netscape/net/TransferProtocolClient.java
rename to base/util/src/netscape/net/TransferProtocolClient.java
diff --git a/pki/base/util/src/netscape/net/smtp/SmtpClient.java b/base/util/src/netscape/net/smtp/SmtpClient.java
similarity index 100%
rename from pki/base/util/src/netscape/net/smtp/SmtpClient.java
rename to base/util/src/netscape/net/smtp/SmtpClient.java
diff --git a/pki/base/util/src/netscape/net/smtp/SmtpProtocolException.java b/base/util/src/netscape/net/smtp/SmtpProtocolException.java
similarity index 100%
rename from pki/base/util/src/netscape/net/smtp/SmtpProtocolException.java
rename to base/util/src/netscape/net/smtp/SmtpProtocolException.java
diff --git a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java b/base/util/src/netscape/security/acl/AclEntryImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/AclEntryImpl.java
rename to base/util/src/netscape/security/acl/AclEntryImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/AclImpl.java b/base/util/src/netscape/security/acl/AclImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/AclImpl.java
rename to base/util/src/netscape/security/acl/AclImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java b/base/util/src/netscape/security/acl/AllPermissionsImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java
rename to base/util/src/netscape/security/acl/AllPermissionsImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/GroupImpl.java b/base/util/src/netscape/security/acl/GroupImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/GroupImpl.java
rename to base/util/src/netscape/security/acl/GroupImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/OwnerImpl.java b/base/util/src/netscape/security/acl/OwnerImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/OwnerImpl.java
rename to base/util/src/netscape/security/acl/OwnerImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/PermissionImpl.java b/base/util/src/netscape/security/acl/PermissionImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/PermissionImpl.java
rename to base/util/src/netscape/security/acl/PermissionImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java b/base/util/src/netscape/security/acl/PrincipalImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/PrincipalImpl.java
rename to base/util/src/netscape/security/acl/PrincipalImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java b/base/util/src/netscape/security/acl/WorldGroupImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/acl/WorldGroupImpl.java
rename to base/util/src/netscape/security/acl/WorldGroupImpl.java
diff --git a/pki/base/util/src/netscape/security/extensions/AccessDescription.java b/base/util/src/netscape/security/extensions/AccessDescription.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/AccessDescription.java
rename to base/util/src/netscape/security/extensions/AccessDescription.java
diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
rename to base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertInfo.java b/base/util/src/netscape/security/extensions/CertInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/CertInfo.java
rename to base/util/src/netscape/security/extensions/CertInfo.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
rename to base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java b/base/util/src/netscape/security/extensions/CertificateScopeEntry.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java
rename to base/util/src/netscape/security/extensions/CertificateScopeEntry.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
rename to base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
rename to base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
rename to base/util/src/netscape/security/extensions/GenericASN1Extension.java
diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
rename to base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/base/util/src/netscape/security/extensions/KerberosName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/KerberosName.java
rename to base/util/src/netscape/security/extensions/KerberosName.java
diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
rename to base/util/src/netscape/security/extensions/NSCertTypeExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
rename to base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
rename to base/util/src/netscape/security/extensions/PresenceServerExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
rename to base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
diff --git a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java b/base/util/src/netscape/security/pkcs/ContentInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/ContentInfo.java
rename to base/util/src/netscape/security/pkcs/ContentInfo.java
diff --git a/pki/base/util/src/netscape/security/pkcs/EncodingException.java b/base/util/src/netscape/security/pkcs/EncodingException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/EncodingException.java
rename to base/util/src/netscape/security/pkcs/EncodingException.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10.java b/base/util/src/netscape/security/pkcs/PKCS10.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS10.java
rename to base/util/src/netscape/security/pkcs/PKCS10.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
rename to base/util/src/netscape/security/pkcs/PKCS10Attribute.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
rename to base/util/src/netscape/security/pkcs/PKCS10Attributes.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS7.java
rename to base/util/src/netscape/security/pkcs/PKCS7.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/base/util/src/netscape/security/pkcs/PKCS8Key.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS8Key.java
rename to base/util/src/netscape/security/pkcs/PKCS8Key.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
rename to base/util/src/netscape/security/pkcs/PKCS9Attribute.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
rename to base/util/src/netscape/security/pkcs/PKCS9Attributes.java
diff --git a/pki/base/util/src/netscape/security/pkcs/ParsingException.java b/base/util/src/netscape/security/pkcs/ParsingException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/ParsingException.java
rename to base/util/src/netscape/security/pkcs/ParsingException.java
diff --git a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java b/base/util/src/netscape/security/pkcs/SignerInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/pkcs/SignerInfo.java
rename to base/util/src/netscape/security/pkcs/SignerInfo.java
diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/base/util/src/netscape/security/provider/CMS.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/CMS.java
rename to base/util/src/netscape/security/provider/CMS.java
diff --git a/pki/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSA.java
rename to base/util/src/netscape/security/provider/DSA.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/base/util/src/netscape/security/provider/DSAKeyFactory.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAKeyFactory.java
rename to base/util/src/netscape/security/provider/DSAKeyFactory.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
rename to base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java
rename to base/util/src/netscape/security/provider/DSAParameterGenerator.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/base/util/src/netscape/security/provider/DSAParameters.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAParameters.java
rename to base/util/src/netscape/security/provider/DSAParameters.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java b/base/util/src/netscape/security/provider/DSAPrivateKey.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAPrivateKey.java
rename to base/util/src/netscape/security/provider/DSAPrivateKey.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java b/base/util/src/netscape/security/provider/DSAPublicKey.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/DSAPublicKey.java
rename to base/util/src/netscape/security/provider/DSAPublicKey.java
diff --git a/pki/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/MD5.java
rename to base/util/src/netscape/security/provider/MD5.java
diff --git a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java b/base/util/src/netscape/security/provider/RSAPublicKey.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/RSAPublicKey.java
rename to base/util/src/netscape/security/provider/RSAPublicKey.java
diff --git a/pki/base/util/src/netscape/security/provider/SHA.java b/base/util/src/netscape/security/provider/SHA.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/SHA.java
rename to base/util/src/netscape/security/provider/SHA.java
diff --git a/pki/base/util/src/netscape/security/provider/Sun.java b/base/util/src/netscape/security/provider/Sun.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/Sun.java
rename to base/util/src/netscape/security/provider/Sun.java
diff --git a/pki/base/util/src/netscape/security/provider/SystemIdentity.java b/base/util/src/netscape/security/provider/SystemIdentity.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/SystemIdentity.java
rename to base/util/src/netscape/security/provider/SystemIdentity.java
diff --git a/pki/base/util/src/netscape/security/provider/SystemSigner.java b/base/util/src/netscape/security/provider/SystemSigner.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/SystemSigner.java
rename to base/util/src/netscape/security/provider/SystemSigner.java
diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/base/util/src/netscape/security/provider/X509CertificateFactory.java
similarity index 100%
rename from pki/base/util/src/netscape/security/provider/X509CertificateFactory.java
rename to base/util/src/netscape/security/provider/X509CertificateFactory.java
diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
rename to base/util/src/netscape/security/util/ASN1CharStrConvMap.java
diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/base/util/src/netscape/security/util/ArraySet.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ArraySet.java
rename to base/util/src/netscape/security/util/ArraySet.java
diff --git a/pki/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/BigInt.java
rename to base/util/src/netscape/security/util/BigInt.java
diff --git a/pki/base/util/src/netscape/security/util/BitArray.java b/base/util/src/netscape/security/util/BitArray.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/BitArray.java
rename to base/util/src/netscape/security/util/BitArray.java
diff --git a/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java b/base/util/src/netscape/security/util/ByteArrayLexOrder.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java
rename to base/util/src/netscape/security/util/ByteArrayLexOrder.java
diff --git a/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java b/base/util/src/netscape/security/util/ByteArrayTagOrder.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java
rename to base/util/src/netscape/security/util/ByteArrayTagOrder.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharIA5String.java b/base/util/src/netscape/security/util/ByteToCharIA5String.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteToCharIA5String.java
rename to base/util/src/netscape/security/util/ByteToCharIA5String.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/base/util/src/netscape/security/util/ByteToCharPrintable.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteToCharPrintable.java
rename to base/util/src/netscape/security/util/ByteToCharPrintable.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/base/util/src/netscape/security/util/ByteToCharUnicode.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteToCharUnicode.java
rename to base/util/src/netscape/security/util/ByteToCharUnicode.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/base/util/src/netscape/security/util/ByteToCharUniversalString.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
rename to base/util/src/netscape/security/util/ByteToCharUniversalString.java
diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/CertPrettyPrint.java
rename to base/util/src/netscape/security/util/CertPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/CharToByteIA5String.java b/base/util/src/netscape/security/util/CharToByteIA5String.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/CharToByteIA5String.java
rename to base/util/src/netscape/security/util/CharToByteIA5String.java
diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/base/util/src/netscape/security/util/CharToBytePrintable.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/CharToBytePrintable.java
rename to base/util/src/netscape/security/util/CharToBytePrintable.java
diff --git a/pki/base/util/src/netscape/security/util/CharToByteUniversalString.java b/base/util/src/netscape/security/util/CharToByteUniversalString.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/CharToByteUniversalString.java
rename to base/util/src/netscape/security/util/CharToByteUniversalString.java
diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/base/util/src/netscape/security/util/CrlPrettyPrint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/CrlPrettyPrint.java
rename to base/util/src/netscape/security/util/CrlPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/DerEncoder.java b/base/util/src/netscape/security/util/DerEncoder.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/DerEncoder.java
rename to base/util/src/netscape/security/util/DerEncoder.java
diff --git a/pki/base/util/src/netscape/security/util/DerInputBuffer.java b/base/util/src/netscape/security/util/DerInputBuffer.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/DerInputBuffer.java
rename to base/util/src/netscape/security/util/DerInputBuffer.java
diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/base/util/src/netscape/security/util/DerInputStream.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/DerInputStream.java
rename to base/util/src/netscape/security/util/DerInputStream.java
diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/base/util/src/netscape/security/util/DerOutputStream.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/DerOutputStream.java
rename to base/util/src/netscape/security/util/DerOutputStream.java
diff --git a/pki/base/util/src/netscape/security/util/DerValue.java b/base/util/src/netscape/security/util/DerValue.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/DerValue.java
rename to base/util/src/netscape/security/util/DerValue.java
diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ExtPrettyPrint.java
rename to base/util/src/netscape/security/util/ExtPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/ObjectIdentifier.java
rename to base/util/src/netscape/security/util/ObjectIdentifier.java
diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java b/base/util/src/netscape/security/util/PrettyPrintFormat.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/PrettyPrintFormat.java
rename to base/util/src/netscape/security/util/PrettyPrintFormat.java
diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java b/base/util/src/netscape/security/util/PrettyPrintResources.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/PrettyPrintResources.java
rename to base/util/src/netscape/security/util/PrettyPrintResources.java
diff --git a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
rename to base/util/src/netscape/security/util/PubKeyPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/base/util/src/netscape/security/x509/ACertAttrSet.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/ACertAttrSet.java
rename to base/util/src/netscape/security/x509/ACertAttrSet.java
diff --git a/pki/base/util/src/netscape/security/x509/AVA.java b/base/util/src/netscape/security/x509/AVA.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AVA.java
rename to base/util/src/netscape/security/x509/AVA.java
diff --git a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java b/base/util/src/netscape/security/x509/AVAValueConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AVAValueConverter.java
rename to base/util/src/netscape/security/x509/AVAValueConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java b/base/util/src/netscape/security/x509/AlgIdDSA.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AlgIdDSA.java
rename to base/util/src/netscape/security/x509/AlgIdDSA.java
diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/base/util/src/netscape/security/x509/AlgorithmId.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AlgorithmId.java
rename to base/util/src/netscape/security/x509/AlgorithmId.java
diff --git a/pki/base/util/src/netscape/security/x509/Attribute.java b/base/util/src/netscape/security/x509/Attribute.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/Attribute.java
rename to base/util/src/netscape/security/x509/Attribute.java
diff --git a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java b/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
rename to base/util/src/netscape/security/x509/AttributeNameEnumeration.java
diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
rename to base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
rename to base/util/src/netscape/security/x509/BasicConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CPSuri.java b/base/util/src/netscape/security/x509/CPSuri.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CPSuri.java
rename to base/util/src/netscape/security/x509/CPSuri.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/base/util/src/netscape/security/x509/CRLDistributionPoint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java
rename to base/util/src/netscape/security/x509/CRLDistributionPoint.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
rename to base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/base/util/src/netscape/security/x509/CRLExtensions.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CRLExtensions.java
rename to base/util/src/netscape/security/x509/CRLExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/base/util/src/netscape/security/x509/CRLNumberExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
rename to base/util/src/netscape/security/x509/CRLNumberExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
rename to base/util/src/netscape/security/x509/CRLReasonExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java b/base/util/src/netscape/security/x509/CertAndKeyGen.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertAndKeyGen.java
rename to base/util/src/netscape/security/x509/CertAndKeyGen.java
diff --git a/pki/base/util/src/netscape/security/x509/CertAttrSet.java b/base/util/src/netscape/security/x509/CertAttrSet.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertAttrSet.java
rename to base/util/src/netscape/security/x509/CertAttrSet.java
diff --git a/pki/base/util/src/netscape/security/x509/CertException.java b/base/util/src/netscape/security/x509/CertException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertException.java
rename to base/util/src/netscape/security/x509/CertException.java
diff --git a/pki/base/util/src/netscape/security/x509/CertParseError.java b/base/util/src/netscape/security/x509/CertParseError.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertParseError.java
rename to base/util/src/netscape/security/x509/CertParseError.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
rename to base/util/src/netscape/security/x509/CertificateAlgorithmId.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateChain.java b/base/util/src/netscape/security/x509/CertificateChain.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateChain.java
rename to base/util/src/netscape/security/x509/CertificateChain.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/base/util/src/netscape/security/x509/CertificateExtensions.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateExtensions.java
rename to base/util/src/netscape/security/x509/CertificateExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
rename to base/util/src/netscape/security/x509/CertificateIssuerExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/base/util/src/netscape/security/x509/CertificateIssuerName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateIssuerName.java
rename to base/util/src/netscape/security/x509/CertificateIssuerName.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
rename to base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
rename to base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java b/base/util/src/netscape/security/x509/CertificatePolicyId.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificatePolicyId.java
rename to base/util/src/netscape/security/x509/CertificatePolicyId.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java b/base/util/src/netscape/security/x509/CertificatePolicyInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java
rename to base/util/src/netscape/security/x509/CertificatePolicyInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java b/base/util/src/netscape/security/x509/CertificatePolicyMap.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java
rename to base/util/src/netscape/security/x509/CertificatePolicyMap.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java b/base/util/src/netscape/security/x509/CertificatePolicySet.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificatePolicySet.java
rename to base/util/src/netscape/security/x509/CertificatePolicySet.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/base/util/src/netscape/security/x509/CertificateSerialNumber.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java
rename to base/util/src/netscape/security/x509/CertificateSerialNumber.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/base/util/src/netscape/security/x509/CertificateSubjectName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateSubjectName.java
rename to base/util/src/netscape/security/x509/CertificateSubjectName.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
rename to base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/base/util/src/netscape/security/x509/CertificateValidity.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateValidity.java
rename to base/util/src/netscape/security/x509/CertificateValidity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/base/util/src/netscape/security/x509/CertificateVersion.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateVersion.java
rename to base/util/src/netscape/security/x509/CertificateVersion.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/base/util/src/netscape/security/x509/CertificateX509Key.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/CertificateX509Key.java
rename to base/util/src/netscape/security/x509/CertificateX509Key.java
diff --git a/pki/base/util/src/netscape/security/x509/DNSName.java b/base/util/src/netscape/security/x509/DNSName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/DNSName.java
rename to base/util/src/netscape/security/x509/DNSName.java
diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
rename to base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/DirStrConverter.java b/base/util/src/netscape/security/x509/DirStrConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/DirStrConverter.java
rename to base/util/src/netscape/security/x509/DirStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/DisplayText.java b/base/util/src/netscape/security/x509/DisplayText.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/DisplayText.java
rename to base/util/src/netscape/security/x509/DisplayText.java
diff --git a/pki/base/util/src/netscape/security/x509/EDIPartyName.java b/base/util/src/netscape/security/x509/EDIPartyName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/EDIPartyName.java
rename to base/util/src/netscape/security/x509/EDIPartyName.java
diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/base/util/src/netscape/security/x509/Extension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/Extension.java
rename to base/util/src/netscape/security/x509/Extension.java
diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/base/util/src/netscape/security/x509/Extensions.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/Extensions.java
rename to base/util/src/netscape/security/x509/Extensions.java
diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java
rename to base/util/src/netscape/security/x509/FreshestCRLExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralName.java b/base/util/src/netscape/security/x509/GeneralName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralName.java
rename to base/util/src/netscape/security/x509/GeneralName.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java b/base/util/src/netscape/security/x509/GeneralNameInterface.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralNameInterface.java
rename to base/util/src/netscape/security/x509/GeneralNameInterface.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNames.java b/base/util/src/netscape/security/x509/GeneralNames.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralNames.java
rename to base/util/src/netscape/security/x509/GeneralNames.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNamesException.java b/base/util/src/netscape/security/x509/GeneralNamesException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralNamesException.java
rename to base/util/src/netscape/security/x509/GeneralNamesException.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java b/base/util/src/netscape/security/x509/GeneralSubtree.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralSubtree.java
rename to base/util/src/netscape/security/x509/GeneralSubtree.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GeneralSubtrees.java
rename to base/util/src/netscape/security/x509/GeneralSubtrees.java
diff --git a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java b/base/util/src/netscape/security/x509/GenericValueConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/GenericValueConverter.java
rename to base/util/src/netscape/security/x509/GenericValueConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/base/util/src/netscape/security/x509/HoldInstructionExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
rename to base/util/src/netscape/security/x509/HoldInstructionExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java b/base/util/src/netscape/security/x509/IA5StringConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/IA5StringConverter.java
rename to base/util/src/netscape/security/x509/IA5StringConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/IPAddressName.java b/base/util/src/netscape/security/x509/IPAddressName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/IPAddressName.java
rename to base/util/src/netscape/security/x509/IPAddressName.java
diff --git a/pki/base/util/src/netscape/security/x509/InvalidIPAddressException.java b/base/util/src/netscape/security/x509/InvalidIPAddressException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/InvalidIPAddressException.java
rename to base/util/src/netscape/security/x509/InvalidIPAddressException.java
diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/base/util/src/netscape/security/x509/InvalidityDateExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
rename to base/util/src/netscape/security/x509/InvalidityDateExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
rename to base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java
rename to base/util/src/netscape/security/x509/IssuingDistributionPoint.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
rename to base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java b/base/util/src/netscape/security/x509/KeyIdentifier.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/KeyIdentifier.java
rename to base/util/src/netscape/security/x509/KeyIdentifier.java
diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/base/util/src/netscape/security/x509/KeyUsageExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
rename to base/util/src/netscape/security/x509/KeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java b/base/util/src/netscape/security/x509/LdapDNStrConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java
rename to base/util/src/netscape/security/x509/LdapDNStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
rename to base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/base/util/src/netscape/security/x509/NSCCommentExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
rename to base/util/src/netscape/security/x509/NSCCommentExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/base/util/src/netscape/security/x509/NameConstraintsExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
rename to base/util/src/netscape/security/x509/NameConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/NoticeReference.java b/base/util/src/netscape/security/x509/NoticeReference.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/NoticeReference.java
rename to base/util/src/netscape/security/x509/NoticeReference.java
diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/OIDMap.java
rename to base/util/src/netscape/security/x509/OIDMap.java
diff --git a/pki/base/util/src/netscape/security/x509/OIDName.java b/base/util/src/netscape/security/x509/OIDName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/OIDName.java
rename to base/util/src/netscape/security/x509/OIDName.java
diff --git a/pki/base/util/src/netscape/security/x509/OtherName.java b/base/util/src/netscape/security/x509/OtherName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/OtherName.java
rename to base/util/src/netscape/security/x509/OtherName.java
diff --git a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java b/base/util/src/netscape/security/x509/PKIXExtensions.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PKIXExtensions.java
rename to base/util/src/netscape/security/x509/PKIXExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java b/base/util/src/netscape/security/x509/PolicyConstraint.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PolicyConstraint.java
rename to base/util/src/netscape/security/x509/PolicyConstraint.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
rename to base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
rename to base/util/src/netscape/security/x509/PolicyMappingsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java b/base/util/src/netscape/security/x509/PolicyQualifierInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java
rename to base/util/src/netscape/security/x509/PolicyQualifierInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java b/base/util/src/netscape/security/x509/PolicyQualifiers.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PolicyQualifiers.java
rename to base/util/src/netscape/security/x509/PolicyQualifiers.java
diff --git a/pki/base/util/src/netscape/security/x509/PrintableConverter.java b/base/util/src/netscape/security/x509/PrintableConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PrintableConverter.java
rename to base/util/src/netscape/security/x509/PrintableConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
rename to base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/Qualifier.java b/base/util/src/netscape/security/x509/Qualifier.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/Qualifier.java
rename to base/util/src/netscape/security/x509/Qualifier.java
diff --git a/pki/base/util/src/netscape/security/x509/RDN.java b/base/util/src/netscape/security/x509/RDN.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RDN.java
rename to base/util/src/netscape/security/x509/RDN.java
diff --git a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/base/util/src/netscape/security/x509/RFC1779StrConverter.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java
rename to base/util/src/netscape/security/x509/RFC1779StrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/RFC822Name.java b/base/util/src/netscape/security/x509/RFC822Name.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RFC822Name.java
rename to base/util/src/netscape/security/x509/RFC822Name.java
diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/base/util/src/netscape/security/x509/ReasonFlags.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/ReasonFlags.java
rename to base/util/src/netscape/security/x509/ReasonFlags.java
diff --git a/pki/base/util/src/netscape/security/x509/RevocationReason.java b/base/util/src/netscape/security/x509/RevocationReason.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RevocationReason.java
rename to base/util/src/netscape/security/x509/RevocationReason.java
diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/base/util/src/netscape/security/x509/RevokedCertImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RevokedCertImpl.java
rename to base/util/src/netscape/security/x509/RevokedCertImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/base/util/src/netscape/security/x509/RevokedCertificate.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/RevokedCertificate.java
rename to base/util/src/netscape/security/x509/RevokedCertificate.java
diff --git a/pki/base/util/src/netscape/security/x509/SerialNumber.java b/base/util/src/netscape/security/x509/SerialNumber.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/SerialNumber.java
rename to base/util/src/netscape/security/x509/SerialNumber.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
rename to base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
rename to base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
rename to base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/URIName.java b/base/util/src/netscape/security/x509/URIName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/URIName.java
rename to base/util/src/netscape/security/x509/URIName.java
diff --git a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java b/base/util/src/netscape/security/x509/UniqueIdentity.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/UniqueIdentity.java
rename to base/util/src/netscape/security/x509/UniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/UserNotice.java b/base/util/src/netscape/security/x509/UserNotice.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/UserNotice.java
rename to base/util/src/netscape/security/x509/UserNotice.java
diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/base/util/src/netscape/security/x509/X500Name.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X500Name.java
rename to base/util/src/netscape/security/x509/X500Name.java
diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/base/util/src/netscape/security/x509/X500NameAttrMap.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X500NameAttrMap.java
rename to base/util/src/netscape/security/x509/X500NameAttrMap.java
diff --git a/pki/base/util/src/netscape/security/x509/X500Signer.java b/base/util/src/netscape/security/x509/X500Signer.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X500Signer.java
rename to base/util/src/netscape/security/x509/X500Signer.java
diff --git a/pki/base/util/src/netscape/security/x509/X509AttributeName.java b/base/util/src/netscape/security/x509/X509AttributeName.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509AttributeName.java
rename to base/util/src/netscape/security/x509/X509AttributeName.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509CRLImpl.java
rename to base/util/src/netscape/security/x509/X509CRLImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/X509Cert.java b/base/util/src/netscape/security/x509/X509Cert.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509Cert.java
rename to base/util/src/netscape/security/x509/X509Cert.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509CertImpl.java
rename to base/util/src/netscape/security/x509/X509CertImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/base/util/src/netscape/security/x509/X509CertInfo.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509CertInfo.java
rename to base/util/src/netscape/security/x509/X509CertInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/X509ExtensionException.java b/base/util/src/netscape/security/x509/X509ExtensionException.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509ExtensionException.java
rename to base/util/src/netscape/security/x509/X509ExtensionException.java
diff --git a/pki/base/util/src/netscape/security/x509/X509Key.java b/base/util/src/netscape/security/x509/X509Key.java
similarity index 100%
rename from pki/base/util/src/netscape/security/x509/X509Key.java
rename to base/util/src/netscape/security/x509/X509Key.java
diff --git a/pki/cmake/Modules/CMakeDetermineJavaCompiler.cmake b/cmake/Modules/CMakeDetermineJavaCompiler.cmake
similarity index 100%
rename from pki/cmake/Modules/CMakeDetermineJavaCompiler.cmake
rename to cmake/Modules/CMakeDetermineJavaCompiler.cmake
diff --git a/pki/cmake/Modules/CMakeJavaCompiler.cmake.in b/cmake/Modules/CMakeJavaCompiler.cmake.in
similarity index 100%
rename from pki/cmake/Modules/CMakeJavaCompiler.cmake.in
rename to cmake/Modules/CMakeJavaCompiler.cmake.in
diff --git a/pki/cmake/Modules/CMakeJavaInformation.cmake b/cmake/Modules/CMakeJavaInformation.cmake
similarity index 100%
rename from pki/cmake/Modules/CMakeJavaInformation.cmake
rename to cmake/Modules/CMakeJavaInformation.cmake
diff --git a/pki/cmake/Modules/CMakeTestJavaCompiler.cmake b/cmake/Modules/CMakeTestJavaCompiler.cmake
similarity index 100%
rename from pki/cmake/Modules/CMakeTestJavaCompiler.cmake
rename to cmake/Modules/CMakeTestJavaCompiler.cmake
diff --git a/pki/cmake/Modules/COPYING-CMAKE-SCRIPTS b/cmake/Modules/COPYING-CMAKE-SCRIPTS
similarity index 100%
rename from pki/cmake/Modules/COPYING-CMAKE-SCRIPTS
rename to cmake/Modules/COPYING-CMAKE-SCRIPTS
diff --git a/pki/cmake/Modules/DefineCMakeDefaults.cmake b/cmake/Modules/DefineCMakeDefaults.cmake
similarity index 100%
rename from pki/cmake/Modules/DefineCMakeDefaults.cmake
rename to cmake/Modules/DefineCMakeDefaults.cmake
diff --git a/pki/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
similarity index 100%
rename from pki/cmake/Modules/DefineCompilerFlags.cmake
rename to cmake/Modules/DefineCompilerFlags.cmake
diff --git a/pki/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
similarity index 100%
rename from pki/cmake/Modules/DefineInstallationPaths.cmake
rename to cmake/Modules/DefineInstallationPaths.cmake
diff --git a/pki/cmake/Modules/DefinePlatformDefaults.cmake b/cmake/Modules/DefinePlatformDefaults.cmake
similarity index 100%
rename from pki/cmake/Modules/DefinePlatformDefaults.cmake
rename to cmake/Modules/DefinePlatformDefaults.cmake
diff --git a/pki/cmake/Modules/FindAPR.cmake b/cmake/Modules/FindAPR.cmake
similarity index 100%
rename from pki/cmake/Modules/FindAPR.cmake
rename to cmake/Modules/FindAPR.cmake
diff --git a/pki/cmake/Modules/FindJNI.cmake b/cmake/Modules/FindJNI.cmake
similarity index 100%
rename from pki/cmake/Modules/FindJNI.cmake
rename to cmake/Modules/FindJNI.cmake
diff --git a/pki/cmake/Modules/FindJava.cmake b/cmake/Modules/FindJava.cmake
similarity index 100%
rename from pki/cmake/Modules/FindJava.cmake
rename to cmake/Modules/FindJava.cmake
diff --git a/pki/cmake/Modules/FindLdap.cmake b/cmake/Modules/FindLdap.cmake
similarity index 100%
rename from pki/cmake/Modules/FindLdap.cmake
rename to cmake/Modules/FindLdap.cmake
diff --git a/pki/cmake/Modules/FindMozLDAP.cmake b/cmake/Modules/FindMozLDAP.cmake
similarity index 100%
rename from pki/cmake/Modules/FindMozLDAP.cmake
rename to cmake/Modules/FindMozLDAP.cmake
diff --git a/pki/cmake/Modules/FindNSPR.cmake b/cmake/Modules/FindNSPR.cmake
similarity index 100%
rename from pki/cmake/Modules/FindNSPR.cmake
rename to cmake/Modules/FindNSPR.cmake
diff --git a/pki/cmake/Modules/FindNSS.cmake b/cmake/Modules/FindNSS.cmake
similarity index 100%
rename from pki/cmake/Modules/FindNSS.cmake
rename to cmake/Modules/FindNSS.cmake
diff --git a/pki/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake
similarity index 100%
rename from pki/cmake/Modules/FindOpenSSL.cmake
rename to cmake/Modules/FindOpenSSL.cmake
diff --git a/pki/cmake/Modules/FindSvrcore.cmake b/cmake/Modules/FindSvrcore.cmake
similarity index 100%
rename from pki/cmake/Modules/FindSvrcore.cmake
rename to cmake/Modules/FindSvrcore.cmake
diff --git a/pki/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake
similarity index 100%
rename from pki/cmake/Modules/FindZLIB.cmake
rename to cmake/Modules/FindZLIB.cmake
diff --git a/pki/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake b/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
similarity index 100%
rename from pki/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
rename to cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
diff --git a/pki/cmake/Modules/MacroCopyFile.cmake b/cmake/Modules/MacroCopyFile.cmake
similarity index 100%
rename from pki/cmake/Modules/MacroCopyFile.cmake
rename to cmake/Modules/MacroCopyFile.cmake
diff --git a/pki/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake b/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
similarity index 100%
rename from pki/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
rename to cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
diff --git a/pki/cmake/Modules/UseJava.cmake b/cmake/Modules/UseJava.cmake
similarity index 100%
rename from pki/cmake/Modules/UseJava.cmake
rename to cmake/Modules/UseJava.cmake
diff --git a/pki/cmake/Modules/UseJavaClassFilelist.cmake b/cmake/Modules/UseJavaClassFilelist.cmake
similarity index 100%
rename from pki/cmake/Modules/UseJavaClassFilelist.cmake
rename to cmake/Modules/UseJavaClassFilelist.cmake
diff --git a/pki/cmake/Modules/UseJavaSymlinks.cmake b/cmake/Modules/UseJavaSymlinks.cmake
similarity index 100%
rename from pki/cmake/Modules/UseJavaSymlinks.cmake
rename to cmake/Modules/UseJavaSymlinks.cmake
diff --git a/pki/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
similarity index 100%
rename from pki/cmake_uninstall.cmake.in
rename to cmake_uninstall.cmake.in
diff --git a/pki/config.h.cmake b/config.h.cmake
similarity index 100%
rename from pki/config.h.cmake
rename to config.h.cmake
diff --git a/pki/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/CMakeLists.txt
rename to dogtag/CMakeLists.txt
diff --git a/pki/dogtag/ca-ui/CMakeLists.txt b/dogtag/ca-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/ca-ui/CMakeLists.txt
rename to dogtag/ca-ui/CMakeLists.txt
diff --git a/pki/dogtag/ca-ui/LICENSE b/dogtag/ca-ui/LICENSE
similarity index 100%
rename from pki/dogtag/ca-ui/LICENSE
rename to dogtag/ca-ui/LICENSE
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/404.html b/dogtag/ca-ui/shared/webapps/ca/404.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/404.html
rename to dogtag/ca-ui/shared/webapps/ca/404.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/500.html b/dogtag/ca-ui/shared/webapps/ca/500.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/500.html
rename to dogtag/ca-ui/shared/webapps/ca/500.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
rename to dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
rename to dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
rename to dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
rename to dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
rename to dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
rename to dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
rename to dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/index.html b/dogtag/ca-ui/shared/webapps/ca/admin/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/admin/index.html
rename to dogtag/ca-ui/shared/webapps/ca/admin/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
rename to dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js b/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
rename to dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
rename to dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/dogtag/ca-ui/shared/webapps/ca/agent/header.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/header.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
rename to dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html b/dogtag/ca-ui/shared/webapps/ca/agent/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
rename to dogtag/ca-ui/shared/webapps/ca/agent/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/dogtag/ca-ui/shared/webapps/ca/agent/index.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/index.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
rename to dogtag/ca-ui/shared/webapps/ca/agent/ports.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll b/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
rename to dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
rename to dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
rename to dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
rename to dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
rename to dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
rename to dogtag/ca-ui/shared/webapps/ca/ee/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/index.html
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/index.html
rename to dogtag/ca-ui/shared/webapps/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/dogtag/ca-ui/shared/webapps/ca/services.template
similarity index 100%
rename from pki/dogtag/ca-ui/shared/webapps/ca/services.template
rename to dogtag/ca-ui/shared/webapps/ca/services.template
diff --git a/pki/dogtag/common-ui/CMakeLists.txt b/dogtag/common-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/common-ui/CMakeLists.txt
rename to dogtag/common-ui/CMakeLists.txt
diff --git a/pki/dogtag/common-ui/LICENSE b/dogtag/common-ui/LICENSE
similarity index 100%
rename from pki/dogtag/common-ui/LICENSE
rename to dogtag/common-ui/LICENSE
diff --git a/pki/dogtag/common-ui/build.xml b/dogtag/common-ui/build.xml
similarity index 100%
rename from pki/dogtag/common-ui/build.xml
rename to dogtag/common-ui/build.xml
diff --git a/pki/dogtag/common-ui/build_dogtag b/dogtag/common-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/common-ui/build_dogtag
rename to dogtag/common-ui/build_dogtag
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/dogtag/common-ui/dogtag-pki-common-ui.spec
similarity index 100%
rename from pki/dogtag/common-ui/dogtag-pki-common-ui.spec
rename to dogtag/common-ui/dogtag-pki-common-ui.spec
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm b/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm b/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm b/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm b/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm b/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
rename to dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm b/dogtag/common-ui/shared/admin/console/config/config_clone.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
rename to dogtag/common-ui/shared/admin/console/config/config_clone.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm b/dogtag/common-ui/shared/admin/console/config/config_db.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
rename to dogtag/common-ui/shared/admin/console/config/config_db.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm b/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
rename to dogtag/common-ui/shared/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm b/dogtag/common-ui/shared/admin/console/config/config_join.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
rename to dogtag/common-ui/shared/admin/console/config/config_join.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm b/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
rename to dogtag/common-ui/shared/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm b/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
rename to dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm b/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm b/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm b/dogtag/common-ui/shared/admin/console/config/donepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/footer.vm b/dogtag/common-ui/shared/admin/console/config/footer.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/footer.vm
rename to dogtag/common-ui/shared/admin/console/config/footer.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/header.vm b/dogtag/common-ui/shared/admin/console/config/header.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/header.vm
rename to dogtag/common-ui/shared/admin/console/config/header.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm b/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
rename to dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm b/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm b/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/login.vm b/dogtag/common-ui/shared/admin/console/config/login.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/login.vm
rename to dogtag/common-ui/shared/admin/console/config/login.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm b/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm b/dogtag/common-ui/shared/admin/console/config/namepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm b/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
rename to dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
rename to dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm b/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
rename to dogtag/common-ui/shared/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm b/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm b/dogtag/common-ui/shared/admin/console/config/topmenu.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm
rename to dogtag/common-ui/shared/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm b/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
rename to dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm b/dogtag/common-ui/shared/admin/console/config/wizard.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
rename to dogtag/common-ui/shared/admin/console/config/wizard.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/xml.vm b/dogtag/common-ui/shared/admin/console/config/xml.vm
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/config/xml.vm
rename to dogtag/common-ui/shared/admin/console/config/xml.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/badge.png b/dogtag/common-ui/shared/admin/console/img/badge.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/badge.png
rename to dogtag/common-ui/shared/admin/console/img/badge.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif b/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
rename to dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/certificate.png b/dogtag/common-ui/shared/admin/console/img/certificate.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/certificate.png
rename to dogtag/common-ui/shared/admin/console/img/certificate.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif b/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
rename to dogtag/common-ui/shared/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/favicon.ico b/dogtag/common-ui/shared/admin/console/img/favicon.ico
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/favicon.ico
rename to dogtag/common-ui/shared/admin/console/img/favicon.ico
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif b/dogtag/common-ui/shared/admin/console/img/icon-software.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif
rename to dogtag/common-ui/shared/admin/console/img/icon-software.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif b/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
rename to dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/id.png b/dogtag/common-ui/shared/admin/console/img/id.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/id.png
rename to dogtag/common-ui/shared/admin/console/img/id.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/idkey.png b/dogtag/common-ui/shared/admin/console/img/idkey.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/idkey.png
rename to dogtag/common-ui/shared/admin/console/img/idkey.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/key.png b/dogtag/common-ui/shared/admin/console/img/key.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/key.png
rename to dogtag/common-ui/shared/admin/console/img/key.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/lock.png b/dogtag/common-ui/shared/admin/console/img/lock.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/lock.png
rename to dogtag/common-ui/shared/admin/console/img/lock.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif b/dogtag/common-ui/shared/admin/console/img/logo_header.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif
rename to dogtag/common-ui/shared/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png b/dogtag/common-ui/shared/admin/console/img/no-certificate.png
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png
rename to dogtag/common-ui/shared/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/rootca.gif b/dogtag/common-ui/shared/admin/console/img/rootca.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/rootca.gif
rename to dogtag/common-ui/shared/admin/console/img/rootca.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/sub.gif b/dogtag/common-ui/shared/admin/console/img/sub.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/img/sub.gif
rename to dogtag/common-ui/shared/admin/console/img/sub.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/js/misc.js b/dogtag/common-ui/shared/admin/console/js/misc.js
similarity index 100%
rename from pki/dogtag/common-ui/shared/admin/console/js/misc.js
rename to dogtag/common-ui/shared/admin/console/js/misc.js
diff --git a/pki/dogtag/common-ui/shared/css/pki-360.css b/dogtag/common-ui/shared/css/pki-360.css
similarity index 100%
rename from pki/dogtag/common-ui/shared/css/pki-360.css
rename to dogtag/common-ui/shared/css/pki-360.css
diff --git a/pki/dogtag/common-ui/shared/css/pki-base.css b/dogtag/common-ui/shared/css/pki-base.css
similarity index 100%
rename from pki/dogtag/common-ui/shared/css/pki-base.css
rename to dogtag/common-ui/shared/css/pki-base.css
diff --git a/pki/dogtag/common-ui/shared/css/pki.css b/dogtag/common-ui/shared/css/pki.css
similarity index 100%
rename from pki/dogtag/common-ui/shared/css/pki.css
rename to dogtag/common-ui/shared/css/pki.css
diff --git a/pki/dogtag/common-ui/shared/img/favicon.ico b/dogtag/common-ui/shared/img/favicon.ico
similarity index 100%
rename from pki/dogtag/common-ui/shared/img/favicon.ico
rename to dogtag/common-ui/shared/img/favicon.ico
diff --git a/pki/dogtag/common-ui/shared/img/logo_header.gif b/dogtag/common-ui/shared/img/logo_header.gif
similarity index 100%
rename from pki/dogtag/common-ui/shared/img/logo_header.gif
rename to dogtag/common-ui/shared/img/logo_header.gif
diff --git a/pki/dogtag/console-ui/CMakeLists.txt b/dogtag/console-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/console-ui/CMakeLists.txt
rename to dogtag/console-ui/CMakeLists.txt
diff --git a/pki/dogtag/console-ui/LICENSE b/dogtag/console-ui/LICENSE
similarity index 100%
rename from pki/dogtag/console-ui/LICENSE
rename to dogtag/console-ui/LICENSE
diff --git a/pki/dogtag/console-ui/build.xml b/dogtag/console-ui/build.xml
similarity index 100%
rename from pki/dogtag/console-ui/build.xml
rename to dogtag/console-ui/build.xml
diff --git a/pki/dogtag/console-ui/build_dogtag b/dogtag/console-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/console-ui/build_dogtag
rename to dogtag/console-ui/build_dogtag
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/dogtag/console-ui/dogtag-pki-console-ui.spec
similarity index 100%
rename from pki/dogtag/console-ui/dogtag-pki-console-ui.spec
rename to dogtag/console-ui/dogtag-pki-console-ui.spec
diff --git a/pki/dogtag/console-ui/src/CMSAdminRS.properties b/dogtag/console-ui/src/CMSAdminRS.properties
similarity index 100%
rename from pki/dogtag/console-ui/src/CMSAdminRS.properties
rename to dogtag/console-ui/src/CMSAdminRS.properties
diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/dogtag/console-ui/src/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/console-ui/src/CMakeLists.txt
rename to dogtag/console-ui/src/CMakeLists.txt
diff --git a/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif b/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
rename to dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
rename to dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
rename to dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
rename to dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
rename to dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties b/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
similarity index 100%
rename from pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
rename to dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
diff --git a/pki/dogtag/kra-ui/CMakeLists.txt b/dogtag/kra-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/kra-ui/CMakeLists.txt
rename to dogtag/kra-ui/CMakeLists.txt
diff --git a/pki/dogtag/kra-ui/LICENSE b/dogtag/kra-ui/LICENSE
similarity index 100%
rename from pki/dogtag/kra-ui/LICENSE
rename to dogtag/kra-ui/LICENSE
diff --git a/pki/dogtag/kra-ui/build.xml b/dogtag/kra-ui/build.xml
similarity index 100%
rename from pki/dogtag/kra-ui/build.xml
rename to dogtag/kra-ui/build.xml
diff --git a/pki/dogtag/kra-ui/build_dogtag b/dogtag/kra-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/kra-ui/build_dogtag
rename to dogtag/kra-ui/build_dogtag
diff --git a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/dogtag/kra-ui/dogtag-pki-kra-ui.spec
similarity index 100%
rename from pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
rename to dogtag/kra-ui/dogtag-pki-kra-ui.spec
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/404.html b/dogtag/kra-ui/shared/webapps/kra/404.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/404.html
rename to dogtag/kra-ui/shared/webapps/kra/404.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/500.html b/dogtag/kra-ui/shared/webapps/kra/500.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/500.html
rename to dogtag/kra-ui/shared/webapps/kra/500.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
rename to dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js b/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
rename to dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js b/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
rename to dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
rename to dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/dogtag/kra-ui/shared/webapps/kra/agent/header.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/header.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js b/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
rename to dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html b/dogtag/kra-ui/shared/webapps/kra/agent/index.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/dogtag/kra-ui/shared/webapps/kra/agent/index.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/index.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
rename to dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/index.html b/dogtag/kra-ui/shared/webapps/kra/index.html
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/index.html
rename to dogtag/kra-ui/shared/webapps/kra/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/dogtag/kra-ui/shared/webapps/kra/services.template
similarity index 100%
rename from pki/dogtag/kra-ui/shared/webapps/kra/services.template
rename to dogtag/kra-ui/shared/webapps/kra/services.template
diff --git a/pki/dogtag/ocsp-ui/CMakeLists.txt b/dogtag/ocsp-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/ocsp-ui/CMakeLists.txt
rename to dogtag/ocsp-ui/CMakeLists.txt
diff --git a/pki/dogtag/ocsp-ui/LICENSE b/dogtag/ocsp-ui/LICENSE
similarity index 100%
rename from pki/dogtag/ocsp-ui/LICENSE
rename to dogtag/ocsp-ui/LICENSE
diff --git a/pki/dogtag/ocsp-ui/build.xml b/dogtag/ocsp-ui/build.xml
similarity index 100%
rename from pki/dogtag/ocsp-ui/build.xml
rename to dogtag/ocsp-ui/build.xml
diff --git a/pki/dogtag/ocsp-ui/build_dogtag b/dogtag/ocsp-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/ocsp-ui/build_dogtag
rename to dogtag/ocsp-ui/build_dogtag
diff --git a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
similarity index 100%
rename from pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
rename to dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/404.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/500.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
rename to dogtag/ocsp-ui/shared/webapps/ocsp/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
similarity index 100%
rename from pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
rename to dogtag/ocsp-ui/shared/webapps/ocsp/services.template
diff --git a/pki/dogtag/ra-ui/CMakeLists.txt b/dogtag/ra-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/ra-ui/CMakeLists.txt
rename to dogtag/ra-ui/CMakeLists.txt
diff --git a/pki/dogtag/ra-ui/LICENSE b/dogtag/ra-ui/LICENSE
similarity index 100%
rename from pki/dogtag/ra-ui/LICENSE
rename to dogtag/ra-ui/LICENSE
diff --git a/pki/dogtag/ra-ui/build.xml b/dogtag/ra-ui/build.xml
similarity index 100%
rename from pki/dogtag/ra-ui/build.xml
rename to dogtag/ra-ui/build.xml
diff --git a/pki/dogtag/ra-ui/build_dogtag b/dogtag/ra-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/ra-ui/build_dogtag
rename to dogtag/ra-ui/build_dogtag
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/dogtag/ra-ui/dogtag-pki-ra-ui.spec
similarity index 100%
rename from pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
rename to dogtag/ra-ui/dogtag-pki-ra-ui.spec
diff --git a/pki/dogtag/ra-ui/shared/docroot/404.html b/dogtag/ra-ui/shared/docroot/404.html
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/404.html
rename to dogtag/ra-ui/shared/docroot/404.html
diff --git a/pki/dogtag/ra-ui/shared/docroot/500.html b/dogtag/ra-ui/shared/docroot/500.html
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/500.html
rename to dogtag/ra-ui/shared/docroot/500.html
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm b/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
rename to dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm b/dogtag/ra-ui/shared/docroot/admin/group/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
rename to dogtag/ra-ui/shared/docroot/admin/group/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm b/dogtag/ra-ui/shared/docroot/admin/group/read.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
rename to dogtag/ra-ui/shared/docroot/admin/group/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm b/dogtag/ra-ui/shared/docroot/admin/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/index.vm
rename to dogtag/ra-ui/shared/docroot/admin/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm b/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
rename to dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm b/dogtag/ra-ui/shared/docroot/admin/user/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
rename to dogtag/ra-ui/shared/docroot/admin/user/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm b/dogtag/ra-ui/shared/docroot/admin/user/read.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
rename to dogtag/ra-ui/shared/docroot/admin/user/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm b/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
rename to dogtag/ra-ui/shared/docroot/agent/cert/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm b/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
rename to dogtag/ra-ui/shared/docroot/agent/cert/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm b/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
rename to dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm b/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
rename to dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm b/dogtag/ra-ui/shared/docroot/agent/error.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/error.vm
rename to dogtag/ra-ui/shared/docroot/agent/error.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm b/dogtag/ra-ui/shared/docroot/agent/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/index.vm
rename to dogtag/ra-ui/shared/docroot/agent/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm b/dogtag/ra-ui/shared/docroot/agent/request/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
rename to dogtag/ra-ui/shared/docroot/agent/request/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm b/dogtag/ra-ui/shared/docroot/agent/request/op.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
rename to dogtag/ra-ui/shared/docroot/agent/request/op.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm b/dogtag/ra-ui/shared/docroot/agent/request/read.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
rename to dogtag/ra-ui/shared/docroot/agent/request/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css b/dogtag/ra-ui/shared/docroot/css/pki-360.css
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
rename to dogtag/ra-ui/shared/docroot/css/pki-360.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css b/dogtag/ra-ui/shared/docroot/css/pki-base.css
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
rename to dogtag/ra-ui/shared/docroot/css/pki-base.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki.css b/dogtag/ra-ui/shared/docroot/css/pki.css
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/css/pki.css
rename to dogtag/ra-ui/shared/docroot/css/pki.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm b/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
rename to dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm b/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/agent/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm b/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
rename to dogtag/ra-ui/shared/docroot/ee/agent/new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm b/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
rename to dogtag/ra-ui/shared/docroot/ee/agent/start.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm b/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
rename to dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm b/dogtag/ra-ui/shared/docroot/ee/error.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/error.vm
rename to dogtag/ra-ui/shared/docroot/ee/error.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm b/dogtag/ra-ui/shared/docroot/ee/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm b/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
rename to dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm b/dogtag/ra-ui/shared/docroot/ee/request/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/request/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm b/dogtag/ra-ui/shared/docroot/ee/request/status.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
rename to dogtag/ra-ui/shared/docroot/ee/request/status.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm b/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
rename to dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm b/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/scep/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm b/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
rename to dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm b/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
rename to dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm b/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
rename to dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm b/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
rename to dogtag/ra-ui/shared/docroot/ee/server/admin.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm b/dogtag/ra-ui/shared/docroot/ee/server/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/server/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm b/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
rename to dogtag/ra-ui/shared/docroot/ee/server/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm b/dogtag/ra-ui/shared/docroot/ee/user/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
rename to dogtag/ra-ui/shared/docroot/ee/user/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm b/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
rename to dogtag/ra-ui/shared/docroot/ee/user/renew.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm b/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
rename to dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm b/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
rename to dogtag/ra-ui/shared/docroot/ee/user/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm b/dogtag/ra-ui/shared/docroot/ee/user/user.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
rename to dogtag/ra-ui/shared/docroot/ee/user/user.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/footer.vm b/dogtag/ra-ui/shared/docroot/footer.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/footer.vm
rename to dogtag/ra-ui/shared/docroot/footer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/header.vm b/dogtag/ra-ui/shared/docroot/header.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/header.vm
rename to dogtag/ra-ui/shared/docroot/header.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif b/dogtag/ra-ui/shared/docroot/images/logo_header.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif
rename to dogtag/ra-ui/shared/docroot/images/logo_header.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
rename to dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
rename to dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
rename to dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/dogtag/ra-ui/shared/docroot/index.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/index.vm
rename to dogtag/ra-ui/shared/docroot/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js b/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
similarity index 100%
rename from pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
rename to dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
diff --git a/pki/dogtag/tks-ui/CMakeLists.txt b/dogtag/tks-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/tks-ui/CMakeLists.txt
rename to dogtag/tks-ui/CMakeLists.txt
diff --git a/pki/dogtag/tks-ui/LICENSE b/dogtag/tks-ui/LICENSE
similarity index 100%
rename from pki/dogtag/tks-ui/LICENSE
rename to dogtag/tks-ui/LICENSE
diff --git a/pki/dogtag/tks-ui/build.xml b/dogtag/tks-ui/build.xml
similarity index 100%
rename from pki/dogtag/tks-ui/build.xml
rename to dogtag/tks-ui/build.xml
diff --git a/pki/dogtag/tks-ui/build_dogtag b/dogtag/tks-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/tks-ui/build_dogtag
rename to dogtag/tks-ui/build_dogtag
diff --git a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/dogtag/tks-ui/dogtag-pki-tks-ui.spec
similarity index 100%
rename from pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
rename to dogtag/tks-ui/dogtag-pki-tks-ui.spec
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/404.html b/dogtag/tks-ui/shared/webapps/tks/404.html
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/404.html
rename to dogtag/tks-ui/shared/webapps/tks/404.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/500.html b/dogtag/tks-ui/shared/webapps/tks/500.html
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/500.html
rename to dogtag/tks-ui/shared/webapps/tks/500.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
rename to dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js b/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
rename to dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js b/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
rename to dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
rename to dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/dogtag/tks-ui/shared/webapps/tks/agent/header.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/header.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js b/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
rename to dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html b/dogtag/tks-ui/shared/webapps/tks/agent/index.html
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
rename to dogtag/tks-ui/shared/webapps/tks/agent/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/dogtag/tks-ui/shared/webapps/tks/agent/index.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/index.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/ports.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
rename to dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
rename to dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/index.html b/dogtag/tks-ui/shared/webapps/tks/index.html
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/index.html
rename to dogtag/tks-ui/shared/webapps/tks/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/dogtag/tks-ui/shared/webapps/tks/services.template
similarity index 100%
rename from pki/dogtag/tks-ui/shared/webapps/tks/services.template
rename to dogtag/tks-ui/shared/webapps/tks/services.template
diff --git a/pki/dogtag/tps-ui/CMakeLists.txt b/dogtag/tps-ui/CMakeLists.txt
similarity index 100%
rename from pki/dogtag/tps-ui/CMakeLists.txt
rename to dogtag/tps-ui/CMakeLists.txt
diff --git a/pki/dogtag/tps-ui/LICENSE b/dogtag/tps-ui/LICENSE
similarity index 100%
rename from pki/dogtag/tps-ui/LICENSE
rename to dogtag/tps-ui/LICENSE
diff --git a/pki/dogtag/tps-ui/build.xml b/dogtag/tps-ui/build.xml
similarity index 100%
rename from pki/dogtag/tps-ui/build.xml
rename to dogtag/tps-ui/build.xml
diff --git a/pki/dogtag/tps-ui/build_dogtag b/dogtag/tps-ui/build_dogtag
similarity index 100%
rename from pki/dogtag/tps-ui/build_dogtag
rename to dogtag/tps-ui/build_dogtag
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/dogtag/tps-ui/dogtag-pki-tps-ui.spec
similarity index 100%
rename from pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
rename to dogtag/tps-ui/dogtag-pki-tps-ui.spec
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
rename to dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
rename to dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
rename to dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
rename to dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/dogtag/tps-ui/shared/cgi-bin/sow/format.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/format.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html b/dogtag/tps-ui/shared/cgi-bin/sow/main.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/main.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html b/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html b/dogtag/tps-ui/shared/cgi-bin/sow/read.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/read.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html b/dogtag/tps-ui/shared/cgi-bin/sow/search.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/search.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html b/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
rename to dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/404.html b/dogtag/tps-ui/shared/docroot/404.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/404.html
rename to dogtag/tps-ui/shared/docroot/404.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/500.html b/dogtag/tps-ui/shared/docroot/500.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/500.html
rename to dogtag/tps-ui/shared/docroot/500.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css b/dogtag/tps-ui/shared/docroot/css/pki-360.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
rename to dogtag/tps-ui/shared/docroot/css/pki-360.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css b/dogtag/tps-ui/shared/docroot/css/pki-base.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
rename to dogtag/tps-ui/shared/docroot/css/pki-base.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki.css b/dogtag/tps-ui/shared/docroot/css/pki.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/css/pki.css
rename to dogtag/tps-ui/shared/docroot/css/pki.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html b/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
rename to dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html b/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
rename to dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html b/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
rename to dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
rename to dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html b/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
rename to dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html b/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
rename to dogtag/tps-ui/shared/docroot/esc/TokenManager.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html b/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
rename to dogtag/tps-ui/shared/docroot/esc/TokenPin.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
rename to dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
rename to dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
rename to dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css b/dogtag/tps-ui/shared/docroot/esc/demo/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
rename to dogtag/tps-ui/shared/docroot/esc/demo/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js b/dogtag/tps-ui/shared/docroot/esc/demo/util.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
rename to dogtag/tps-ui/shared/docroot/esc/demo/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
rename to dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
rename to dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
rename to dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css b/dogtag/tps-ui/shared/docroot/esc/home/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
rename to dogtag/tps-ui/shared/docroot/esc/home/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js b/dogtag/tps-ui/shared/docroot/esc/home/util.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
rename to dogtag/tps-ui/shared/docroot/esc/home/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif b/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif b/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg b/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
rename to dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
rename to dogtag/tps-ui/shared/docroot/esc/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
rename to dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
rename to dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif b/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
rename to dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
rename to dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
rename to dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css b/dogtag/tps-ui/shared/docroot/esc/so/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
rename to dogtag/tps-ui/shared/docroot/esc/so/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js b/dogtag/tps-ui/shared/docroot/esc/so/util.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
rename to dogtag/tps-ui/shared/docroot/esc/so/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
rename to dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
rename to dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css b/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
rename to dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif b/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
rename to dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
rename to dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
rename to dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css b/dogtag/tps-ui/shared/docroot/esc/sow/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
rename to dogtag/tps-ui/shared/docroot/esc/sow/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/dogtag/tps-ui/shared/docroot/esc/sow/util.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
rename to dogtag/tps-ui/shared/docroot/esc/sow/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/style.css b/dogtag/tps-ui/shared/docroot/esc/style.css
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/esc/style.css
rename to dogtag/tps-ui/shared/docroot/esc/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/footer.vm b/dogtag/tps-ui/shared/docroot/footer.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/footer.vm
rename to dogtag/tps-ui/shared/docroot/footer.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/header.vm b/dogtag/tps-ui/shared/docroot/header.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/header.vm
rename to dogtag/tps-ui/shared/docroot/header.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/index.vm b/dogtag/tps-ui/shared/docroot/index.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/index.vm
rename to dogtag/tps-ui/shared/docroot/index.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template b/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/addResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
rename to dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
rename to dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template b/dogtag/tps-ui/shared/docroot/tokendb/delete.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
rename to dogtag/tps-ui/shared/docroot/tokendb/delete.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template b/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template b/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
rename to dogtag/tps-ui/shared/docroot/tokendb/doToken.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
rename to dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/dogtag/tps-ui/shared/docroot/tokendb/edit.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
rename to dogtag/tps-ui/shared/docroot/tokendb/edit.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template b/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/editResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template b/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
rename to dogtag/tps-ui/shared/docroot/tokendb/editUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template b/dogtag/tps-ui/shared/docroot/tokendb/error.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
rename to dogtag/tps-ui/shared/docroot/tokendb/error.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/dogtag/tps-ui/shared/docroot/tokendb/index.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
rename to dogtag/tps-ui/shared/docroot/tokendb/index.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
rename to dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
rename to dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template b/dogtag/tps-ui/shared/docroot/tokendb/new.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
rename to dogtag/tps-ui/shared/docroot/tokendb/new.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template b/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
rename to dogtag/tps-ui/shared/docroot/tokendb/newUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template b/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
rename to dogtag/tps-ui/shared/docroot/tokendb/revoke.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template b/dogtag/tps-ui/shared/docroot/tokendb/search.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
rename to dogtag/tps-ui/shared/docroot/tokendb/search.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
rename to dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
rename to dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
rename to dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template b/dogtag/tps-ui/shared/docroot/tokendb/show.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
rename to dogtag/tps-ui/shared/docroot/tokendb/show.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
rename to dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template b/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
rename to dogtag/tps-ui/shared/docroot/tokendb/showCert.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template b/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
rename to dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js b/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
similarity index 100%
rename from pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
rename to dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
diff --git a/pki/patches/pki-core-selinux-Dogtag-9-f16.patch b/patches/pki-core-selinux-Dogtag-9-f16.patch
similarity index 100%
rename from pki/patches/pki-core-selinux-Dogtag-9-f16.patch
rename to patches/pki-core-selinux-Dogtag-9-f16.patch
diff --git a/pki/patches/pki-core-selinux-Dogtag-9-f17.patch b/patches/pki-core-selinux-Dogtag-9-f17.patch
similarity index 100%
rename from pki/patches/pki-core-selinux-Dogtag-9-f17.patch
rename to patches/pki-core-selinux-Dogtag-9-f17.patch
diff --git a/pki/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
similarity index 100%
rename from pki/scripts/build_dogtag_pki
rename to scripts/build_dogtag_pki
diff --git a/pki/scripts/compose_dogtag_pki_meta_packages b/scripts/compose_dogtag_pki_meta_packages
similarity index 100%
rename from pki/scripts/compose_dogtag_pki_meta_packages
rename to scripts/compose_dogtag_pki_meta_packages
diff --git a/pki/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
similarity index 100%
rename from pki/scripts/compose_dogtag_pki_theme_packages
rename to scripts/compose_dogtag_pki_theme_packages
diff --git a/pki/scripts/compose_functions b/scripts/compose_functions
similarity index 100%
rename from pki/scripts/compose_functions
rename to scripts/compose_functions
diff --git a/pki/scripts/compose_ipa_pki_theme_packages b/scripts/compose_ipa_pki_theme_packages
similarity index 100%
rename from pki/scripts/compose_ipa_pki_theme_packages
rename to scripts/compose_ipa_pki_theme_packages
diff --git a/pki/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages
similarity index 100%
rename from pki/scripts/compose_pki_console_packages
rename to scripts/compose_pki_console_packages
diff --git a/pki/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
similarity index 100%
rename from pki/scripts/compose_pki_core_packages
rename to scripts/compose_pki_core_packages
diff --git a/pki/scripts/compose_pki_kra_packages b/scripts/compose_pki_kra_packages
similarity index 100%
rename from pki/scripts/compose_pki_kra_packages
rename to scripts/compose_pki_kra_packages
diff --git a/pki/scripts/compose_pki_migrate_packages b/scripts/compose_pki_migrate_packages
similarity index 100%
rename from pki/scripts/compose_pki_migrate_packages
rename to scripts/compose_pki_migrate_packages
diff --git a/pki/scripts/compose_pki_ocsp_packages b/scripts/compose_pki_ocsp_packages
similarity index 100%
rename from pki/scripts/compose_pki_ocsp_packages
rename to scripts/compose_pki_ocsp_packages
diff --git a/pki/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages
similarity index 100%
rename from pki/scripts/compose_pki_ra_packages
rename to scripts/compose_pki_ra_packages
diff --git a/pki/scripts/compose_pki_tks_packages b/scripts/compose_pki_tks_packages
similarity index 100%
rename from pki/scripts/compose_pki_tks_packages
rename to scripts/compose_pki_tks_packages
diff --git a/pki/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages
similarity index 100%
rename from pki/scripts/compose_pki_tps_packages
rename to scripts/compose_pki_tps_packages
diff --git a/pki/scripts/create_pki_yum_repos b/scripts/create_pki_yum_repos
similarity index 100%
rename from pki/scripts/create_pki_yum_repos
rename to scripts/create_pki_yum_repos
diff --git a/pki/scripts/install_default_ca_instance b/scripts/install_default_ca_instance
similarity index 100%
rename from pki/scripts/install_default_ca_instance
rename to scripts/install_default_ca_instance
diff --git a/pki/scripts/install_default_pki_instances b/scripts/install_default_pki_instances
similarity index 100%
rename from pki/scripts/install_default_pki_instances
rename to scripts/install_default_pki_instances
diff --git a/pki/scripts/pki_patch_maker b/scripts/pki_patch_maker
similarity index 100%
rename from pki/scripts/pki_patch_maker
rename to scripts/pki_patch_maker
diff --git a/pki/scripts/prepare_dogtag_pki b/scripts/prepare_dogtag_pki
similarity index 100%
rename from pki/scripts/prepare_dogtag_pki
rename to scripts/prepare_dogtag_pki
diff --git a/pki/scripts/remove_default_pki_instances b/scripts/remove_default_pki_instances
similarity index 100%
rename from pki/scripts/remove_default_pki_instances
rename to scripts/remove_default_pki_instances
diff --git a/pki/scripts/remove_pki_components b/scripts/remove_pki_components
similarity index 100%
rename from pki/scripts/remove_pki_components
rename to scripts/remove_pki_components
diff --git a/pki/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
similarity index 100%
rename from pki/specs/dogtag-pki-theme.spec
rename to specs/dogtag-pki-theme.spec
diff --git a/pki/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
similarity index 100%
rename from pki/specs/dogtag-pki.spec
rename to specs/dogtag-pki.spec
diff --git a/pki/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
similarity index 100%
rename from pki/specs/ipa-pki-theme.spec
rename to specs/ipa-pki-theme.spec
diff --git a/pki/specs/pki-console.spec b/specs/pki-console.spec
similarity index 100%
rename from pki/specs/pki-console.spec
rename to specs/pki-console.spec
diff --git a/pki/specs/pki-core.spec b/specs/pki-core.spec
similarity index 100%
rename from pki/specs/pki-core.spec
rename to specs/pki-core.spec
diff --git a/pki/specs/pki-kra.spec b/specs/pki-kra.spec
similarity index 100%
rename from pki/specs/pki-kra.spec
rename to specs/pki-kra.spec
diff --git a/pki/specs/pki-migrate.spec b/specs/pki-migrate.spec
similarity index 100%
rename from pki/specs/pki-migrate.spec
rename to specs/pki-migrate.spec
diff --git a/pki/specs/pki-ocsp.spec b/specs/pki-ocsp.spec
similarity index 100%
rename from pki/specs/pki-ocsp.spec
rename to specs/pki-ocsp.spec
diff --git a/pki/specs/pki-ra.spec b/specs/pki-ra.spec
similarity index 100%
rename from pki/specs/pki-ra.spec
rename to specs/pki-ra.spec
diff --git a/pki/specs/pki-tks.spec b/specs/pki-tks.spec
similarity index 100%
rename from pki/specs/pki-tks.spec
rename to specs/pki-tks.spec
diff --git a/pki/specs/pki-tps.spec b/specs/pki-tps.spec
similarity index 100%
rename from pki/specs/pki-tps.spec
rename to specs/pki-tps.spec
diff --git a/pki/tools/jar/README.jar-tools b/tools/jar/README.jar-tools
similarity index 100%
rename from pki/tools/jar/README.jar-tools
rename to tools/jar/README.jar-tools
diff --git a/pki/tools/jar/jar-query b/tools/jar/jar-query
similarity index 100%
rename from pki/tools/jar/jar-query
rename to tools/jar/jar-query
diff --git a/pki/tools/jar/java-imports b/tools/jar/java-imports
similarity index 100%
rename from pki/tools/jar/java-imports
rename to tools/jar/java-imports
-- 
1.7.7.4

