From f09322b78abd16e49bfe68a8b5010db598458b77 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 7 Oct 2013 11:48:54 -0400
Subject: [PATCH] Reorganized server packages.

The tomcat, cms, and cmscore packages have been moved from base/common
into separate folders in base/server so that they can be built separately.
---
 .classpath                                         |  25 +--
 base/common/src/CMakeLists.txt                     | 142 -----------------
 base/server/CMakeLists.txt                         |   4 +
 base/server/cms/CMakeLists.txt                     |   3 +
 base/server/cms/src/CMakeLists.txt                 | 168 +++++++++++++++++++++
 .../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/ACLInterceptor.java |   0
 .../cms/authorization/AuthMethodInterceptor.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
 .../cms}/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
 .../cms}/src/com/netscape/cms/logging/LogFile.java |   0
 .../com/netscape/cms/logging/RollingLogFile.java   |   0
 .../cms/notification/MailNotification.java         |   0
 .../cms}/src/com/netscape/cms/ocsp/DefStore.java   |   0
 .../cms}/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
 .../constraint/UserSubjectNameConstraint.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/RandomizedValidityDefault.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
 .../cms/publish/publishers/PublisherUtils.java     |   0
 .../src/com/netscape/cms/realm/PKIPrincipal.java   |   0
 .../cms}/src/com/netscape/cms/realm/PKIRealm.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/account/AccountService.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/GroupMemberProcessor.java    |   0
 .../netscape/cms/servlet/admin/GroupService.java   |   0
 .../cms/servlet/admin/JobsAdminServlet.java        |   0
 .../cms/servlet/admin/KRAAdminServlet.java         |   0
 .../cms/servlet/admin/KRAConnectorProcessor.java   |   0
 .../cms/servlet/admin/KRAConnectorService.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/SystemCertService.java       |   0
 .../netscape/cms/servlet/admin/UserService.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
 .../com/netscape/cms/servlet/base/PKIService.java  |   0
 .../netscape/cms/servlet/base/PortsServlet.java    |   0
 .../netscape/cms/servlet/base/ProxyServlet.java    |   0
 .../com/netscape/cms/servlet/base/RESTServlet.java |   0
 .../cms/servlet/base/SystemInfoServlet.java        |   0
 .../com/netscape/cms/servlet/base/UserInfo.java    |   0
 .../cms/servlet/cert/CMCRevReqServlet.java         |   0
 .../servlet/cert/CertEnrollmentRequestFactory.java |   0
 .../netscape/cms/servlet/cert/CertProcessor.java   |   0
 .../netscape/cms/servlet/cert/CertRequestDAO.java  |   0
 .../cms/servlet/cert/CertRequestInfoFactory.java   |   0
 .../servlet/cert/CertReviewResponseFactory.java    |   0
 .../com/netscape/cms/servlet/cert/CertService.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
 .../cms/servlet/cert/EnrollmentProcessor.java      |   0
 .../netscape/cms/servlet/cert/FilterBuilder.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
 .../cms/servlet/cert/RenewalProcessor.java         |   0
 .../netscape/cms/servlet/cert/RenewalServlet.java  |   0
 .../cms/servlet/cert/RequestProcessor.java         |   0
 .../cms/servlet/cert/RevocationProcessor.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
 .../netscape/cms/servlet/common/ServletUtils.java  |   0
 .../cms/servlet/connector/CloneServlet.java        |   0
 .../cms/servlet/connector/ConnectorServlet.java    |   0
 .../servlet/connector/GenerateKeyPairServlet.java  |   0
 .../servlet/connector/TokenKeyRecoveryServlet.java |   0
 .../netscape/cms/servlet/csadmin/AdminPanel.java   |   0
 .../netscape/cms/servlet/csadmin/AuthDBPanel.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/CertRequestPanel.java      |   0
 .../com/netscape/cms/servlet/csadmin/CertUtil.java |   0
 .../cms/servlet/csadmin/CheckIdentity.java         |   0
 .../csadmin/ConfigCertApprovalCallback.java        |   0
 .../cms/servlet/csadmin/ConfigHSMLoginPanel.java   |   0
 .../cms/servlet/csadmin/ConfigurationUtils.java    |   0
 .../cms/servlet/csadmin/CreateSubsystemPanel.java  |   0
 .../netscape/cms/servlet/csadmin/DRMInfoPanel.java |   0
 .../cms/servlet/csadmin/DatabasePanel.java         |   0
 .../cms/servlet/csadmin/DisplayCertChainPanel.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
 .../netscape/cms/servlet/csadmin/LoginServlet.java |   0
 .../cms/servlet/csadmin/MainPageServlet.java       |   0
 .../netscape/cms/servlet/csadmin/ModulePanel.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
 .../servlet/csadmin/SecurityDomainProcessor.java   |   0
 .../cms/servlet/csadmin/SecurityDomainService.java |   0
 .../netscape/cms/servlet/csadmin/SizePanel.java    |   0
 .../cms/servlet/csadmin/SystemCertDataFactory.java |   0
 .../cms/servlet/csadmin/SystemConfigService.java   |   0
 .../netscape/cms/servlet/csadmin/TKSInfoPanel.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/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/KeyRequestDAO.java    |   0
 .../com/netscape/cms/servlet/key/KeyService.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
 .../netscape/cms/servlet/processors/Processor.java |   0
 .../servlet/profile/PolicyConstraintFactory.java   |   0
 .../cms/servlet/profile/PolicyDefaultFactory.java  |   0
 .../cms/servlet/profile/ProfileApproveServlet.java |   0
 .../cms/servlet/profile/ProfileInputFactory.java   |   0
 .../cms/servlet/profile/ProfileListServlet.java    |   0
 .../cms/servlet/profile/ProfileOutputFactory.java  |   0
 .../cms/servlet/profile/ProfileProcessServlet.java |   0
 .../cms/servlet/profile/ProfileReviewServlet.java  |   0
 .../cms/servlet/profile/ProfileSelectServlet.java  |   0
 .../cms/servlet/profile/ProfileService.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/CMSRequestDAO.java         |   0
 .../cms/servlet/request/CertReqParser.java         |   0
 .../cms/servlet/request/CertRequestService.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/KeyRequestService.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
 .../cms/servlet/tks/TPSConnectorService.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
 .../cms}/src/com/netscape/cms/shares/OldShare.java |   0
 base/{common => server/cms}/src/pki-cms.mf         |   0
 base/server/cmscore/CMakeLists.txt                 |   3 +
 base/server/cmscore/src/CMakeLists.txt             | 166 ++++++++++++++++++++
 .../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/DBAttribute.java  |   0
 .../com/netscape/cmscore/dbs/DBObjectClasses.java  |   0
 .../src/com/netscape/cmscore/dbs/DBRecord.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
 .../src/com/netscape/cmscore/dbs/Database.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
 .../src/com/netscape/cmscore/dbs/LDAPDatabase.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
 .../com/netscape/cmscore/logging/AuditService.java |   0
 .../src/com/netscape/cmscore/logging/Auditor.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
 .../src/com/netscape/cmscore/realm/ACL.java        |   0
 .../src/com/netscape/cmscore/realm/ACLEntry.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/SelfTestService.java         |   0
 .../cmscore/selftests/SelfTestSubsystem.java       |   0
 .../session/LDAPSecurityDomainSessionTable.java    |   0
 .../session/SecurityDomainSessionTable.java        |   0
 .../com/netscape/cmscore/session/SessionTimer.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/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
 base/{common => server/cmscore}/src/pki-cmscore.mf |   0
 base/server/tomcat/CMakeLists.txt                  |   3 +
 base/server/tomcat/src/CMakeLists.txt              | 158 +++++++++++++++++++
 .../src/com/netscape/cms/tomcat/ProxyRealm.java    |   0
 .../cms/tomcat/SSLAuthenticatorWithFallback.java   |   0
 base/{common => server/tomcat}/src/pki-tomcat.mf   |   0
 654 files changed, 519 insertions(+), 153 deletions(-)
 create mode 100644 base/server/cms/CMakeLists.txt
 create mode 100644 base/server/cms/src/CMakeLists.txt
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/AVAPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/AgentCertAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/CMCAuth.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/Crypt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/DNPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/DirBasedAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/FlatFileAuth.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/HashAuthData.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/HashAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/PortalEnroll.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/RDNPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/SharedSecret.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/TokenAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authorization/AAclAuthz.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authorization/ACLInterceptor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authorization/AuthMethodInterceptor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authorization/BasicAclAuthz.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/authorization/DirAclAuthz.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSCRLNumberExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSCRLReasonExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/evaluators/UserAccessEvaluator.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/jobs/AJobBase.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/jobs/PublishCertsJob.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/jobs/RenewalNotificationJob.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/jobs/RequestInQueueJob.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/jobs/UnpublishExpiredJob.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/listeners/CertificateIssuedListener.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/listeners/CertificateRevokedListener.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/listeners/PinRemovalListener.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/listeners/RequestInQListener.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/logging/LogEntry.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/logging/LogFile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/logging/RollingLogFile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/notification/MailNotification.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/ocsp/DefStore.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/ocsp/LDAPStore.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/password/PasswordChecker.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/APolicyRule.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/AgentPolicy.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/DefaultRevocation.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/IssuerConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/ManualAuthentication.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/RenewalConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/RevocationConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/constraints/ValidityConstraints.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/KeyUsageExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/NSCCommentExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/PresenceExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/BasicProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/CAEnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/EnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/EnrollProfileContext.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/ProfileContext.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/ProfilePolicy.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/RAEnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/EnrollConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/KeyConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/NoConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/constraint/ValidityConstraint.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/AutoAssignDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/CAEnrollDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/CAValidityDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/CertificateVersionDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/EnrollDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/EnrollExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/GenericExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/ImageDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/NoDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SigningAlgDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/SubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/UserExtensionDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/UserKeyDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/UserValidityDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/ValidityDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/CMCCertReqInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/CertReqInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/DualKeyGenInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/EnrollInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/FileSigningInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/GenericInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/ImageInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/KeyGenInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/SerialNumRenewInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/SigningKeyGenInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/SubjectDNInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/SubjectNameInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/SubmitterInfoInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/output/CMMFOutput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/output/CertOutput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/output/EnrollOutput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/output/PKCS7Output.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/output/nsNKeyOutput.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/AVAPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/MapAVAPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/MapDNPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/MapRDNPattern.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/mappers/NoMap.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/OCSPPublisher.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/publish/publishers/PublisherUtils.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/realm/PKIPrincipal.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/realm/PKIRealm.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/request/RequestScheduler.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ASelfTest.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ca/CAPresence.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ca/CAValidity.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/common/SystemCertsVerification.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/kra/KRAPresence.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/ra/RAPresence.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/account/AccountService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/AdminResources.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/AdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/AuthCredentials.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/CAAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/GroupService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/KRAConnectorService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/LogAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/RAAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/SystemCertService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/UserService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/CMSServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/CMSStartServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/GetStats.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/IndexServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/PKIService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/PortsServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/ProxyServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/RESTServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/SystemInfoServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/base/UserInfo.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertRequestDAO.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CertService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/CloneRedirect.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DirAuthServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DisplayBySerial.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DisplayCRL.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DoRevoke.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DoUnrevoke.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/EnrollServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/FilterBuilder.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetBySerial.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetCAChain.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetCRL.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetEnableStatus.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/GetInfo.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/ListCerts.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/Monitor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RenewalProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RenewalServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RequestProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RevocationProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RevocationServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/SrchCerts.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/UpdateCRL.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/UpdateDir.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/AuthCredentials.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSFile.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSFileLoader.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSGWResources.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSGateway.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSRequest.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSTemplate.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/CMSTemplateParams.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/ECMSGWException.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/IRawJS.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/RawJS.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/common/ServletUtils.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/connector/CloneServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/connector/ConnectorServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/AdminPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/BaseServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/Cert.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/CertUtil.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/DonePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetCertChain.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetCookie.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetStatus.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/LoginServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/ModulePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/NamePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/RegisterUser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SizePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/filter/EERequestFilter.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/DisplayBySerial.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/DisplayTransport.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/ExamineRecovery.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/GetApprovalStatus.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/GetAsyncPk12.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/GetPk12.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/GrantRecovery.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/KeyRecordParser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/KeyRequestDAO.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/KeyService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/RecoverBySerial.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/SrchKey.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/CMCProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/CRMFProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/IPKIProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/PKCS10Processor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/PKIProcessor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/processors/Processor.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileListServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/CMSRequestDAO.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/CertReqParser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/CertRequestService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/CheckRequest.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/IReqParser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/KeyReqParser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/KeyRequestService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/ProcessCertReq.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/ProcessReq.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/QueryReq.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/ReqParser.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/request/SearchReqs.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/tks/TPSConnectorService.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/tks/TokenServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/wizard/IWizardPanel.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/servlet/wizard/WizardServlet.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/shares/OldJoinShares.java (100%)
 rename base/{common => server/cms}/src/com/netscape/cms/shares/OldShare.java (100%)
 rename base/{common => server/cms}/src/pki-cms.mf (100%)
 create mode 100644 base/server/cmscore/CMakeLists.txt
 create mode 100644 base/server/cmscore/src/CMakeLists.txt
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/CMSEngine.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/CommandQueue.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/PKIServerEvent.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/PKIServerListener.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/Setup.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/apps/Upgrade.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/AuthSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/NullAuthentication.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/VerifiedCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authentication/VerifiedCerts.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/authorization/AuthzSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/ArgBlock.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/FileConfigStore.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/JDialogPasswordCallback.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/PropConfigStore.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/SimpleProperties.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/SourceConfigStore.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/SubsystemLoader.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/base/SubsystemRegistry.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CertDateCompare.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CertPrettyPrint.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CertUtils.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CertificatePair.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CrlPrettyPrint.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/ExtPrettyPrint.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/PrettyPrintFormat.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/PrettyPrintResources.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/cert/X500NameSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/HttpConnFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/HttpConnection.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/HttpConnector.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/HttpPKIMessage.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/HttpRequestEncoder.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/LocalConnector.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/RemoteAuthority.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/RequestTransfer.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/connector/Resender.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/crmf/CRMFParser.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/BigIntegerMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/ByteArrayMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CRLDBSchema.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CRLRepository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CertDBSchema.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CertRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CertRecordList.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CertRecordMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/CertificateRepository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBAttribute.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBObjectClasses.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBRegistry.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBSSession.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBSUtil.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBSearchResults.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DBVirtualList.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/Database.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DateArrayMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/DateMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/IntegerMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyDBSchema.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyRecordList.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyRecordMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyRepository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/KeyStateMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/LDAPDatabase.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/LdapFilterConverter.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/LongMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/MetaInfoMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/PublicKeyMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/Repository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/RepositoryRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/RepositorySchema.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/RevocationInfo.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/StringMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/StringVectorMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/X500NameMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/dbs/X509CertImplMapper.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/extensions/KeyUsage.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/jobs/CronItem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/jobs/CronRange.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/jobs/JobCron.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/jobs/JobsScheduler.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapAndExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapConnModule.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapOrExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapPredicateParser.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapPublishModule.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapRequestListener.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapRule.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/PublishObject.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldap/PublisherProcessor.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/listeners/ListenerPlugin.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/AuditEventFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/AuditFormat.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/AuditService.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/Auditor.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/LogQueue.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/LogSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/Logger.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/SignedAuditLogger.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/logging/SystemEventFactory.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/notification/EmailFormProcessor.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/notification/EmailResolverKeys.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/notification/EmailTemplate.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/AndExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/GeneralNameUtil.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/OrExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/PolicyPredicateParser.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/PolicySet.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/policy/SimpleExpression.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/profile/ProfileSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/realm/ACL.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/realm/ACLEntry.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/registry/PluginInfo.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/registry/PluginRegistry.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/ARequestQueue.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/ARequestRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/CertRequestConstants.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/ExtDataHashtable.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/RequestAttr.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/RequestQueue.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/RequestRecord.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/RequestRepository.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/RequestSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/request/Schema.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/CASigningCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/CertificateInfo.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/JssSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/KRATransportCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/KeyCertUtil.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/OCSPSigningCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/PWCBsdr.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/PWUtil.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/PWsdrCache.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/Provider.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/RASigningCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/SSLCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/SSLSelfSignedCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/security/SubsystemCert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/selftests/SelfTestService.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/session/SessionTimer.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/time/SimpleTimeSource.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/usrgrp/Group.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/usrgrp/UGSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/usrgrp/User.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/Assert.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/AssertionException.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/Debug.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/ExceptionFormatter.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/FileAsString.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/FileDialogFilter.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/PFXUtils.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/ProfileSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/StatsSubsystem.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/UtilMessage.java (100%)
 rename base/{common => server/cmscore}/src/com/netscape/cmscore/util/UtilResources.java (100%)
 rename base/{common => server/cmscore}/src/pki-cmscore.mf (100%)
 create mode 100644 base/server/tomcat/CMakeLists.txt
 create mode 100644 base/server/tomcat/src/CMakeLists.txt
 rename base/{common => server/tomcat}/src/com/netscape/cms/tomcat/ProxyRealm.java (100%)
 rename base/{common => server/tomcat}/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java (100%)
 rename base/{common => server/tomcat}/src/pki-tomcat.mf (100%)

diff --git a/.classpath b/.classpath
index be9988d40e1e4dc55633409c0f91f1f14a643eac..5161a988a3bb038ce688a81059f7c64a8af0fcc2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ca/src"/>
-	<classpathentry kind="src" path="base/test/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/test/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/symkey/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/util/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/util/test"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/common/test"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/common/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/common/test"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/common/functional/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/java-tools/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/server/tomcat/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/server/cms/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/server/cmscore/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/silent/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ca/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ca/functional/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/kra/src"/>
-	<classpathentry kind="src" path="base/migrate/80"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/kra/functional/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ocsp/src"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/symkey/src"/>
 	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tks/src"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/util/src"/>
-	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/silent/src"/>
-	<classpathentry kind="src" path="base/kra/functional/src"/>
-	<classpathentry kind="src" path="base/common/functional/src"/>
-	<classpathentry kind="src" path="base/ca/functional/src"/>
-	<classpathentry kind="src" path="base/tps-tomcat/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tps-tomcat/src"/>
+	<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/migrate/80"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/>
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index c010bedfe809dcee3e98814083839806b936d56f..8300795eb1d88ee7a72fad0a184e6e1f5e882670 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -166,148 +166,6 @@ install(
 set(PKI_CERTSRV_JAR ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar CACHE INTERNAL "pki-certsrv jar file")
 
 
-# build pki-cms
-javac(pki-cms-classes
-    SOURCES
-        com/netscape/cms/*.java
-    EXCLUDE
-        com/netscape/cms/tomcat/*.java
-    CLASSPATH
-        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
-        ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
-        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
-        ${APACHE_COMMONS_LANG_JAR}
-        ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR}
-        ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
-        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cms.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
-)
-
-jar(pki-cms-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cms/*.class
-    EXCLUDE
-        com/netscape/cms/tomcat/*.class
-    DEPENDS
-        pki-cms-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_CMS_JAR ${CMAKE_BINARY_DIR}/dist/pki-cms.jar CACHE INTERNAL "pki-cms jar file")
-
-
-# build pki-tomcat
-javac(pki-tomcat-classes
-    SOURCES
-        com/netscape/cms/tomcat/*.java
-    CLASSPATH
-        ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-cms-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-tomcat.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
-)
-
-jar(pki-tomcat-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cms/tomcat/*.class
-    DEPENDS
-        pki-tomcat-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_TOMCAT_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar CACHE INTERNAL "pki-tomcat jar file")
-
-
-# build pki-cmscore
-javac(pki-cmscore-classes
-    SOURCES
-        com/netscape/cmscore/*.java
-    CLASSPATH
-        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_TOMCAT_JAR}
-        ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
-        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
-        ${APACHE_COMMONS_LANG_JAR}
-        ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR}
-        ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
-        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
-    OUTPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    DEPENDS
-        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tomcat-jar
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmscore.mf
-    ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
-)
-
-jar(pki-cmscore-jar
-    CREATE
-        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
-    OPTIONS
-        m
-    PARAMS
-        ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
-    INPUT_DIR
-        ${CMAKE_BINARY_DIR}/classes
-    FILES
-        com/netscape/cmscore/*.class
-    DEPENDS
-        pki-cmscore-classes
-)
-
-install(
-    FILES
-        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
-
-set(PKI_CMSCORE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar CACHE INTERNAL "pki-cmscore jar file")
-
-
 # build pki-cmsbundle
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmsbundle.mf
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index e8f78c4fc02f40bc169b2b78dd45a2499fbf04ec..8f1391a73e3f5c4f6719a34091ad4757f9b99c96 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -139,3 +139,7 @@ install(
 # install empty directories
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)")
 install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)")
+
+add_subdirectory(tomcat)
+add_subdirectory(cms)
+add_subdirectory(cmscore)
diff --git a/base/server/cms/CMakeLists.txt b/base/server/cms/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..735ca31a89fdb6db51be6b0c0efca0e490355238
--- /dev/null
+++ b/base/server/cms/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(cms)
+
+add_subdirectory(src)
diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..16fa1fe8abf517b78aebbbf67c3fc3d2d78f6a4e
--- /dev/null
+++ b/base/server/cms/src/CMakeLists.txt
@@ -0,0 +1,168 @@
+project(pki-cms)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# build pki-cms
+javac(pki-cms-classes
+    SOURCES
+        com/netscape/cms/*.java
+    CLASSPATH
+        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_TOMCAT_JAR}
+        ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
+        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
+        ${APACHE_COMMONS_LANG_JAR}
+        ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR}
+        ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
+        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    DEPENDS
+        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-tomcat-jar
+)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cms.mf
+    ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
+)
+
+jar(pki-cms-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
+    OPTIONS
+        m
+    PARAMS
+        ${CMAKE_CURRENT_BINARY_DIR}/pki-cms.mf
+    INPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    FILES
+        com/netscape/cms/*.class
+    EXCLUDE
+        com/netscape/cms/tomcat/*.class
+    DEPENDS
+        pki-cms-classes
+)
+
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
+
+set(PKI_CMS_JAR ${CMAKE_BINARY_DIR}/dist/pki-cms.jar CACHE INTERNAL "pki-cms jar file")
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/server/cms/src/com/netscape/cms/authentication/AVAPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/AVAPattern.java
rename to base/server/cms/src/com/netscape/cms/authentication/AVAPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/CMCAuth.java
rename to base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java
diff --git a/base/common/src/com/netscape/cms/authentication/Crypt.java b/base/server/cms/src/com/netscape/cms/authentication/Crypt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/Crypt.java
rename to base/server/cms/src/com/netscape/cms/authentication/Crypt.java
diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/server/cms/src/com/netscape/cms/authentication/DNPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/DNPattern.java
rename to base/server/cms/src/com/netscape/cms/authentication/DNPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/DirBasedAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/DirBasedAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/server/cms/src/com/netscape/cms/authentication/FlatFileAuth.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
rename to base/server/cms/src/com/netscape/cms/authentication/FlatFileAuth.java
diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/server/cms/src/com/netscape/cms/authentication/HashAuthData.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/HashAuthData.java
rename to base/server/cms/src/com/netscape/cms/authentication/HashAuthData.java
diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/HashAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/HashAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/HashAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/server/cms/src/com/netscape/cms/authentication/PortalEnroll.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/PortalEnroll.java
rename to base/server/cms/src/com/netscape/cms/authentication/PortalEnroll.java
diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/server/cms/src/com/netscape/cms/authentication/RDNPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/RDNPattern.java
rename to base/server/cms/src/com/netscape/cms/authentication/RDNPattern.java
diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/base/server/cms/src/com/netscape/cms/authentication/SharedSecret.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/SharedSecret.java
rename to base/server/cms/src/com/netscape/cms/authentication/SharedSecret.java
diff --git a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/TokenAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/TokenAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
rename to base/server/cms/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/AAclAuthz.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authorization/AAclAuthz.java
rename to base/server/cms/src/com/netscape/cms/authorization/AAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/authorization/ACLInterceptor.java b/base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authorization/ACLInterceptor.java
rename to base/server/cms/src/com/netscape/cms/authorization/ACLInterceptor.java
diff --git a/base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java b/base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
rename to base/server/cms/src/com/netscape/cms/authorization/AuthMethodInterceptor.java
diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
rename to base/server/cms/src/com/netscape/cms/authorization/BasicAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java
similarity index 100%
rename from base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
rename to base/server/cms/src/com/netscape/cms/authorization/DirAclAuthz.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/server/cms/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
similarity index 100%
rename from base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
rename to base/server/cms/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
diff --git a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
similarity index 100%
rename from base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
rename to base/server/cms/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
similarity index 100%
rename from base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
rename to base/server/cms/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
similarity index 100%
rename from base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
rename to base/server/cms/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/server/cms/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
similarity index 100%
rename from base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
rename to base/server/cms/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
diff --git a/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/server/cms/src/com/netscape/cms/jobs/AJobBase.java
similarity index 100%
rename from base/common/src/com/netscape/cms/jobs/AJobBase.java
rename to base/server/cms/src/com/netscape/cms/jobs/AJobBase.java
diff --git a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/server/cms/src/com/netscape/cms/jobs/PublishCertsJob.java
similarity index 100%
rename from base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
rename to base/server/cms/src/com/netscape/cms/jobs/PublishCertsJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/server/cms/src/com/netscape/cms/jobs/RenewalNotificationJob.java
similarity index 100%
rename from base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
rename to base/server/cms/src/com/netscape/cms/jobs/RenewalNotificationJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/server/cms/src/com/netscape/cms/jobs/RequestInQueueJob.java
similarity index 100%
rename from base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
rename to base/server/cms/src/com/netscape/cms/jobs/RequestInQueueJob.java
diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/server/cms/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
similarity index 100%
rename from base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
rename to base/server/cms/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/server/cms/src/com/netscape/cms/listeners/CertificateIssuedListener.java
similarity index 100%
rename from base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
rename to base/server/cms/src/com/netscape/cms/listeners/CertificateIssuedListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/server/cms/src/com/netscape/cms/listeners/CertificateRevokedListener.java
similarity index 100%
rename from base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
rename to base/server/cms/src/com/netscape/cms/listeners/CertificateRevokedListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/server/cms/src/com/netscape/cms/listeners/PinRemovalListener.java
similarity index 100%
rename from base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
rename to base/server/cms/src/com/netscape/cms/listeners/PinRemovalListener.java
diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/server/cms/src/com/netscape/cms/listeners/RequestInQListener.java
similarity index 100%
rename from base/common/src/com/netscape/cms/listeners/RequestInQListener.java
rename to base/server/cms/src/com/netscape/cms/listeners/RequestInQListener.java
diff --git a/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/server/cms/src/com/netscape/cms/logging/LogEntry.java
similarity index 100%
rename from base/common/src/com/netscape/cms/logging/LogEntry.java
rename to base/server/cms/src/com/netscape/cms/logging/LogEntry.java
diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/server/cms/src/com/netscape/cms/logging/LogFile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/logging/LogFile.java
rename to base/server/cms/src/com/netscape/cms/logging/LogFile.java
diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/logging/RollingLogFile.java
rename to base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
diff --git a/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/server/cms/src/com/netscape/cms/notification/MailNotification.java
similarity index 100%
rename from base/common/src/com/netscape/cms/notification/MailNotification.java
rename to base/server/cms/src/com/netscape/cms/notification/MailNotification.java
diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
similarity index 100%
rename from base/common/src/com/netscape/cms/ocsp/DefStore.java
rename to base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java
similarity index 100%
rename from base/common/src/com/netscape/cms/ocsp/LDAPStore.java
rename to base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java
diff --git a/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/server/cms/src/com/netscape/cms/password/PasswordChecker.java
similarity index 100%
rename from base/common/src/com/netscape/cms/password/PasswordChecker.java
rename to base/server/cms/src/com/netscape/cms/password/PasswordChecker.java
diff --git a/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/APolicyRule.java
rename to base/server/cms/src/com/netscape/cms/policy/APolicyRule.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
rename to base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
similarity index 100%
rename from base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
rename to base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
diff --git a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/BasicProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfileContext.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
rename to base/server/cms/src/com/netscape/cms/profile/common/EnrollProfileContext.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/server/cms/src/com/netscape/cms/profile/common/ProfileContext.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/ProfileContext.java
rename to base/server/cms/src/com/netscape/cms/profile/common/ProfileContext.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/server/cms/src/com/netscape/cms/profile/common/ProfilePolicy.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
rename to base/server/cms/src/com/netscape/cms/profile/common/ProfilePolicy.java
diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/RAEnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/RAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
rename to base/server/cms/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/KeyConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/NoConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/NoConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/UserSubjectNameConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/server/cms/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
rename to base/server/cms/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AutoAssignDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/AutoAssignDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CAEnrollDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/CAEnrollDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CAValidityDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/CAValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/EnrollExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/EnrollExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/GenericExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/GenericExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ImageDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/ImageDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/ImageDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/NoDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/NoDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/NoDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/SubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserExtensionDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/UserExtensionDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserKeyDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/UserKeyDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/UserValidityDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/UserValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/ValidityDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/ValidityDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
rename to base/server/cms/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
diff --git a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/CMCCertReqInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/CMCCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/CertReqInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/CertReqInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/CertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/DualKeyGenInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/DualKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/EnrollInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/server/cms/src/com/netscape/cms/profile/input/FileSigningInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/FileSigningInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/server/cms/src/com/netscape/cms/profile/input/GenericInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/GenericInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/GenericInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/server/cms/src/com/netscape/cms/profile/input/ImageInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/ImageInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/ImageInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/KeyGenInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/KeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubjectDNInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/SubjectDNInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubjectNameInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/SubjectNameInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/server/cms/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
rename to base/server/cms/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/CMMFOutput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
rename to base/server/cms/src/com/netscape/cms/profile/output/CMMFOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/CertOutput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/output/CertOutput.java
rename to base/server/cms/src/com/netscape/cms/profile/output/CertOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/EnrollOutput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
rename to base/server/cms/src/com/netscape/cms/profile/output/EnrollOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/server/cms/src/com/netscape/cms/profile/output/PKCS7Output.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
rename to base/server/cms/src/com/netscape/cms/profile/output/PKCS7Output.java
diff --git a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/server/cms/src/com/netscape/cms/profile/output/nsNKeyOutput.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
rename to base/server/cms/src/com/netscape/cms/profile/output/nsNKeyOutput.java
diff --git a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
similarity index 100%
rename from base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
rename to base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/AVAPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/AVAPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapDNPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/MapDNPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/server/cms/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
diff --git a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/server/cms/src/com/netscape/cms/publish/mappers/NoMap.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/mappers/NoMap.java
rename to base/server/cms/src/com/netscape/cms/publish/mappers/NoMap.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/base/server/cms/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
diff --git a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/base/server/cms/src/com/netscape/cms/publish/publishers/PublisherUtils.java
similarity index 100%
rename from base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java
rename to base/server/cms/src/com/netscape/cms/publish/publishers/PublisherUtils.java
diff --git a/base/common/src/com/netscape/cms/realm/PKIPrincipal.java b/base/server/cms/src/com/netscape/cms/realm/PKIPrincipal.java
similarity index 100%
rename from base/common/src/com/netscape/cms/realm/PKIPrincipal.java
rename to base/server/cms/src/com/netscape/cms/realm/PKIPrincipal.java
diff --git a/base/common/src/com/netscape/cms/realm/PKIRealm.java b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
similarity index 100%
rename from base/common/src/com/netscape/cms/realm/PKIRealm.java
rename to base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/server/cms/src/com/netscape/cms/request/RequestScheduler.java
similarity index 100%
rename from base/common/src/com/netscape/cms/request/RequestScheduler.java
rename to base/server/cms/src/com/netscape/cms/request/RequestScheduler.java
diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/server/cms/src/com/netscape/cms/selftests/ASelfTest.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ASelfTest.java
rename to base/server/cms/src/com/netscape/cms/selftests/ASelfTest.java
diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ca/CAPresence.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
rename to base/server/cms/src/com/netscape/cms/selftests/ca/CAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/server/cms/src/com/netscape/cms/selftests/ca/CAValidity.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
rename to base/server/cms/src/com/netscape/cms/selftests/ca/CAValidity.java
diff --git a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/server/cms/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
rename to base/server/cms/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/kra/KRAPresence.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
rename to base/server/cms/src/com/netscape/cms/selftests/kra/KRAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
rename to base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
rename to base/server/cms/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/server/cms/src/com/netscape/cms/selftests/ra/RAPresence.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
rename to base/server/cms/src/com/netscape/cms/selftests/ra/RAPresence.java
diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/server/cms/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
similarity index 100%
rename from base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
rename to base/server/cms/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
diff --git a/base/common/src/com/netscape/cms/servlet/account/AccountService.java b/base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/account/AccountService.java
rename to base/server/cms/src/com/netscape/cms/servlet/account/AccountService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminResources.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/AdminResources.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthCredentials.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/AuthCredentials.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/GroupService.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/SystemCertService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/UserService.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/server/cms/src/com/netscape/cms/servlet/base/GetStats.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/GetStats.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/GetStats.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/IndexServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/IndexServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/PKIService.java b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/PKIService.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/PortsServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/PortsServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/ProxyServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/ProxyServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/RESTServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/RESTServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/RESTServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/RESTServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/server/cms/src/com/netscape/cms/servlet/base/UserInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/base/UserInfo.java
rename to base/server/cms/src/com/netscape/cms/servlet/base/UserInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertEnrollmentRequestFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertReviewResponseFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CertService.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CertService.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CertService.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CloneRedirect.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/CloneRedirect.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayCRL.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DisplayCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/EnrollmentProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java b/base/server/cms/src/com/netscape/cms/servlet/cert/FilterBuilder.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/FilterBuilder.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetBySerial.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCAChain.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetCAChain.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCRL.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/server/cms/src/com/netscape/cms/servlet/cert/GetInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/GetInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ListCerts.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/ListCerts.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/Monitor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/Monitor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/Monitor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RenewalServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RequestProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RevocationServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/server/cms/src/com/netscape/cms/servlet/cert/SrchCerts.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/SrchCerts.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateCRL.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/UpdateCRL.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/server/cms/src/com/netscape/cms/servlet/cert/UpdateDir.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/UpdateDir.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
rename to base/server/cms/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/server/cms/src/com/netscape/cms/servlet/common/AuthCredentials.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/AuthCredentials.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFile.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSFile.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSFile.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSFileLoader.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSFileLoader.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGWResources.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSGWResources.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSGateway.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSGateway.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSRequest.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/server/cms/src/com/netscape/cms/servlet/common/ECMSGWException.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/ECMSGWException.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/server/cms/src/com/netscape/cms/servlet/common/IRawJS.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/IRawJS.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/IRawJS.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/server/cms/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/server/cms/src/com/netscape/cms/servlet/common/RawJS.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/RawJS.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/RawJS.java
diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/server/cms/src/com/netscape/cms/servlet/common/ServletUtils.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
rename to base/server/cms/src/com/netscape/cms/servlet/common/ServletUtils.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/CloneServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/connector/CloneServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthDBPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/Cert.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/Cert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/DRMInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetStatus.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/NamePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/NamePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainService.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SizePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SizePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemCertDataFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/TKSInfoPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
rename to base/server/cms/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
rename to base/server/cms/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
rename to base/server/cms/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
rename to base/server/cms/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/base/server/cms/src/com/netscape/cms/servlet/filter/EERequestFilter.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
rename to base/server/cms/src/com/netscape/cms/servlet/filter/EERequestFilter.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerial.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/server/cms/src/com/netscape/cms/servlet/key/DisplayTransport.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/DisplayTransport.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/ExamineRecovery.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/ExamineRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/server/cms/src/com/netscape/cms/servlet/key/GetPk12.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/GetPk12.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/GetPk12.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/GrantRecovery.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/GrantRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRecordParser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/KeyRecordParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyService.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/KeyService.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/KeyService.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/server/cms/src/com/netscape/cms/servlet/key/RecoverBySerial.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/RecoverBySerial.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKey.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/SrchKey.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/SrchKey.java
diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/server/cms/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
rename to base/server/cms/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/server/cms/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CMCProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/CMCProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java
diff --git a/base/common/src/com/netscape/cms/servlet/processors/Processor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/processors/Processor.java
rename to base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/PolicyConstraintFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/PolicyDefaultFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileInputFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileOutputFactory.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileService.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileService.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/base/server/cms/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
rename to base/server/cms/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/CertReqParser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/CertReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/CertRequestService.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/CertRequestService.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/server/cms/src/com/netscape/cms/servlet/request/CheckRequest.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/CheckRequest.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/IReqParser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/IReqParser.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/IReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyReqParser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/KeyReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessReq.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/ProcessReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/QueryReq.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/QueryReq.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/QueryReq.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/server/cms/src/com/netscape/cms/servlet/request/ReqParser.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/ReqParser.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/ReqParser.java
diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/server/cms/src/com/netscape/cms/servlet/request/SearchReqs.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
rename to base/server/cms/src/com/netscape/cms/servlet/request/SearchReqs.java
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TPSConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
rename to base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java
diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/server/cms/src/com/netscape/cms/servlet/tks/TokenServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/tks/TokenServlet.java
diff --git a/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java b/base/server/cms/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
rename to base/server/cms/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/server/cms/src/com/netscape/cms/servlet/wizard/WizardServlet.java
similarity index 100%
rename from base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
rename to base/server/cms/src/com/netscape/cms/servlet/wizard/WizardServlet.java
diff --git a/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/server/cms/src/com/netscape/cms/shares/OldJoinShares.java
similarity index 100%
rename from base/common/src/com/netscape/cms/shares/OldJoinShares.java
rename to base/server/cms/src/com/netscape/cms/shares/OldJoinShares.java
diff --git a/base/common/src/com/netscape/cms/shares/OldShare.java b/base/server/cms/src/com/netscape/cms/shares/OldShare.java
similarity index 100%
rename from base/common/src/com/netscape/cms/shares/OldShare.java
rename to base/server/cms/src/com/netscape/cms/shares/OldShare.java
diff --git a/base/common/src/pki-cms.mf b/base/server/cms/src/pki-cms.mf
similarity index 100%
rename from base/common/src/pki-cms.mf
rename to base/server/cms/src/pki-cms.mf
diff --git a/base/server/cmscore/CMakeLists.txt b/base/server/cmscore/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..62ef6ec1855e6b6bdad59fa50943dd94bc79dd76
--- /dev/null
+++ b/base/server/cmscore/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(cmscore)
+
+add_subdirectory(src)
diff --git a/base/server/cmscore/src/CMakeLists.txt b/base/server/cmscore/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..94f5f138c4e48161392412770d85dbe1a0c8f28d
--- /dev/null
+++ b/base/server/cmscore/src/CMakeLists.txt
@@ -0,0 +1,166 @@
+project(pki-cmscore)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# build pki-cmscore
+javac(pki-cmscore-classes
+    SOURCES
+        com/netscape/cmscore/*.java
+    CLASSPATH
+        ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_TOMCAT_JAR}
+        ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
+        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${COMMONS_HTTPCLIENT_JAR}
+        ${APACHE_COMMONS_LANG_JAR}
+        ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_JAR} ${SYMKEY_JAR}
+        ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR}
+        ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    DEPENDS
+        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tomcat-jar
+)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pki-cmscore.mf
+    ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
+)
+
+jar(pki-cmscore-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
+    OPTIONS
+        m
+    PARAMS
+        ${CMAKE_CURRENT_BINARY_DIR}/pki-cmscore.mf
+    INPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    FILES
+        com/netscape/cmscore/*.class
+    DEPENDS
+        pki-cmscore-classes
+)
+
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
+
+set(PKI_CMSCORE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar CACHE INTERNAL "pki-cmscore jar file")
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/CMSEngine.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
diff --git a/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CommandQueue.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/CommandQueue.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/CommandQueue.java
diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerEvent.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerEvent.java
diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java b/base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerListener.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/PKIServerListener.java
diff --git a/base/common/src/com/netscape/cmscore/apps/Setup.java b/base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/Setup.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/Setup.java
diff --git a/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/base/server/cmscore/src/com/netscape/cmscore/apps/Upgrade.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/apps/Upgrade.java
rename to base/server/cmscore/src/com/netscape/cmscore/apps/Upgrade.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/AuthSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/NullAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/NullAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCert.java
diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCerts.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
rename to base/server/cmscore/src/com/netscape/cmscore/authentication/VerifiedCerts.java
diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/ArgBlock.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
diff --git a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/FileConfigStore.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/FileConfigStore.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/FileConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/base/server/cmscore/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
diff --git a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/PropConfigStore.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/PropConfigStore.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/PropConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/server/cmscore/src/com/netscape/cmscore/base/SimpleProperties.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/SimpleProperties.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/SimpleProperties.java
diff --git a/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/SourceConfigStore.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/SourceConfigStore.java
diff --git a/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemLoader.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/SubsystemLoader.java
diff --git a/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/base/SubsystemRegistry.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
rename to base/server/cmscore/src/com/netscape/cmscore/base/SubsystemRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertDateCompare.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CertDateCompare.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertPrettyPrint.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CertPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CertUtils.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertificatePair.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CertificatePair.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CertificatePair.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintResources.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/PrettyPrintResources.java
diff --git a/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/base/server/cmscore/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
diff --git a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/cert/X500NameSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/cert/X500NameSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnection.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/HttpConnection.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnection.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnector.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/HttpConnector.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/HttpConnector.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpPKIMessage.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/HttpPKIMessage.java
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/server/cmscore/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
diff --git a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/server/cmscore/src/com/netscape/cmscore/connector/LocalConnector.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/LocalConnector.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/LocalConnector.java
diff --git a/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/base/server/cmscore/src/com/netscape/cmscore/connector/RemoteAuthority.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/RemoteAuthority.java
diff --git a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/server/cmscore/src/com/netscape/cmscore/connector/RequestTransfer.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/RequestTransfer.java
diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/server/cmscore/src/com/netscape/cmscore/connector/Resender.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/connector/Resender.java
rename to base/server/cmscore/src/com/netscape/cmscore/connector/Resender.java
diff --git a/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/base/server/cmscore/src/com/netscape/cmscore/crmf/CRMFParser.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
rename to base/server/cmscore/src/com/netscape/cmscore/crmf/CRMFParser.java
diff --git a/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/base/server/cmscore/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
rename to base/server/cmscore/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLDBSchema.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CRLDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CRLRepository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CRLRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertDBSchema.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CertDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CertRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordList.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CertRecordMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/CertificateRepository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/CertificateRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBAttribute.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBAttribute.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBAttribute.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBAttribute.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBObjectClasses.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBObjectClasses.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBObjectClasses.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBObjectClasses.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBRegistry.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSSession.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBSSession.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBSSession.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSUtil.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBSUtil.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSearchResults.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBSearchResults.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DBVirtualList.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DBVirtualList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/Database.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/Database.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/Database.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/Database.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateArrayMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DateArrayMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/DateMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/DateMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/DateMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/IntegerMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/IntegerMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyDBSchema.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyDBSchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordList.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordList.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRepository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/KeyStateMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/KeyStateMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LDAPDatabase.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LDAPDatabase.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/LDAPDatabase.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/LDAPDatabase.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/LongMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/LongMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/LongMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/Repository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/Repository.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/Repository.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositoryRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/RepositoryRecord.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RepositorySchema.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/RepositorySchema.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfo.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/StringMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/StringMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/StringVectorMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/StringVectorMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/X500NameMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/X500NameMapper.java
diff --git a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/server/cmscore/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
rename to base/server/cmscore/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/server/cmscore/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
rename to base/server/cmscore/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
diff --git a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/server/cmscore/src/com/netscape/cmscore/extensions/KeyUsage.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
rename to base/server/cmscore/src/com/netscape/cmscore/extensions/KeyUsage.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronItem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/jobs/CronItem.java
rename to base/server/cmscore/src/com/netscape/cmscore/jobs/CronItem.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/CronRange.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/jobs/CronRange.java
rename to base/server/cmscore/src/com/netscape/cmscore/jobs/CronRange.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobCron.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/jobs/JobCron.java
rename to base/server/cmscore/src/com/netscape/cmscore/jobs/JobCron.java
diff --git a/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/base/server/cmscore/src/com/netscape/cmscore/jobs/JobsScheduler.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
rename to base/server/cmscore/src/com/netscape/cmscore/jobs/JobsScheduler.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapAndExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapAndExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapConnModule.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapConnModule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapOrExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapOrExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPublishModule.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapPublishModule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRequestListener.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRequestListener.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRule.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapRule.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapRule.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublishObject.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/PublishObject.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/PublishObject.java
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/ldap/PublisherProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldap/PublisherProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
diff --git a/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/base/server/cmscore/src/com/netscape/cmscore/listeners/ListenerPlugin.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
rename to base/server/cmscore/src/com/netscape/cmscore/listeners/ListenerPlugin.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditFormat.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/AuditFormat.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/AuditFormat.java
diff --git a/base/common/src/com/netscape/cmscore/logging/AuditService.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/AuditService.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java
diff --git a/base/common/src/com/netscape/cmscore/logging/Auditor.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/Auditor.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java
diff --git a/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/LogQueue.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java
diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/Logger.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java
diff --git a/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
rename to base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailFormProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
rename to base/server/cmscore/src/com/netscape/cmscore/notification/EmailFormProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailResolverKeys.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
rename to base/server/cmscore/src/com/netscape/cmscore/notification/EmailResolverKeys.java
diff --git a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/server/cmscore/src/com/netscape/cmscore/notification/EmailTemplate.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
rename to base/server/cmscore/src/com/netscape/cmscore/notification/EmailTemplate.java
diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
rename to base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
rename to base/server/cmscore/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
diff --git a/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/AndExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java
diff --git a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java
diff --git a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
diff --git a/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
diff --git a/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/OrExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
diff --git a/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/PolicySet.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java
diff --git a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
rename to base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java
diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/server/cmscore/src/com/netscape/cmscore/realm/ACL.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/realm/ACL.java
rename to base/server/cmscore/src/com/netscape/cmscore/realm/ACL.java
diff --git a/base/common/src/com/netscape/cmscore/realm/ACLEntry.java b/base/server/cmscore/src/com/netscape/cmscore/realm/ACLEntry.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/realm/ACLEntry.java
rename to base/server/cmscore/src/com/netscape/cmscore/realm/ACLEntry.java
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/registry/PluginInfo.java
rename to base/server/cmscore/src/com/netscape/cmscore/registry/PluginInfo.java
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/server/cmscore/src/com/netscape/cmscore/registry/PluginRegistry.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
rename to base/server/cmscore/src/com/netscape/cmscore/registry/PluginRegistry.java
diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/ARequestQueue.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java
diff --git a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/ARequestRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/ARequestRecord.java
diff --git a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/server/cmscore/src/com/netscape/cmscore/request/CertRequestConstants.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/CertRequestConstants.java
diff --git a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/server/cmscore/src/com/netscape/cmscore/request/ExtDataHashtable.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/ExtDataHashtable.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestAttr.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/RequestAttr.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/RequestAttr.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestQueue.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/RequestQueue.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/RequestQueue.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRecord.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/RequestRecord.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/RequestRecord.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestRepository.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/RequestRepository.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/RequestRepository.java
diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/request/RequestSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/RequestSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/request/Schema.java b/base/server/cmscore/src/com/netscape/cmscore/request/Schema.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/request/Schema.java
rename to base/server/cmscore/src/com/netscape/cmscore/request/Schema.java
diff --git a/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/CASigningCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/CASigningCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/CASigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/server/cmscore/src/com/netscape/cmscore/security/CertificateInfo.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/CertificateInfo.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/CertificateInfo.java
diff --git a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/JssSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/JssSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/KRATransportCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/KRATransportCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/KRATransportCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/server/cmscore/src/com/netscape/cmscore/security/KeyCertUtil.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/KeyCertUtil.java
diff --git a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/OCSPSigningCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/OCSPSigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWCBsdr.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/PWCBsdr.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/PWCBsdr.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWUtil.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWUtil.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/PWUtil.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/PWUtil.java
diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/server/cmscore/src/com/netscape/cmscore/security/PWsdrCache.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/PWsdrCache.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/PWsdrCache.java
diff --git a/base/common/src/com/netscape/cmscore/security/Provider.java b/base/server/cmscore/src/com/netscape/cmscore/security/Provider.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/Provider.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/Provider.java
diff --git a/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/RASigningCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/RASigningCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/RASigningCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SSLCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/SSLCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/SSLCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
diff --git a/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/base/server/cmscore/src/com/netscape/cmscore/security/SubsystemCert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/security/SubsystemCert.java
rename to base/server/cmscore/src/com/netscape/cmscore/security/SubsystemCert.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
rename to base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestService.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/selftests/SelfTestService.java
rename to base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java b/base/server/cmscore/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
rename to base/server/cmscore/src/com/netscape/cmscore/session/LDAPSecurityDomainSessionTable.java
diff --git a/base/common/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java b/base/server/cmscore/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
rename to base/server/cmscore/src/com/netscape/cmscore/session/SecurityDomainSessionTable.java
diff --git a/base/common/src/com/netscape/cmscore/session/SessionTimer.java b/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/session/SessionTimer.java
rename to base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java
diff --git a/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/base/server/cmscore/src/com/netscape/cmscore/time/SimpleTimeSource.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
rename to base/server/cmscore/src/com/netscape/cmscore/time/SimpleTimeSource.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
rename to base/server/cmscore/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
rename to base/server/cmscore/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/Group.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/usrgrp/Group.java
rename to base/server/cmscore/src/com/netscape/cmscore/usrgrp/Group.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/usrgrp/User.java
rename to base/server/cmscore/src/com/netscape/cmscore/usrgrp/User.java
diff --git a/base/common/src/com/netscape/cmscore/util/Assert.java b/base/server/cmscore/src/com/netscape/cmscore/util/Assert.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/Assert.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/Assert.java
diff --git a/base/common/src/com/netscape/cmscore/util/AssertionException.java b/base/server/cmscore/src/com/netscape/cmscore/util/AssertionException.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/AssertionException.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/AssertionException.java
diff --git a/base/common/src/com/netscape/cmscore/util/Debug.java b/base/server/cmscore/src/com/netscape/cmscore/util/Debug.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/Debug.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/Debug.java
diff --git a/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/base/server/cmscore/src/com/netscape/cmscore/util/ExceptionFormatter.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/ExceptionFormatter.java
diff --git a/base/common/src/com/netscape/cmscore/util/FileAsString.java b/base/server/cmscore/src/com/netscape/cmscore/util/FileAsString.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/FileAsString.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/FileAsString.java
diff --git a/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/base/server/cmscore/src/com/netscape/cmscore/util/FileDialogFilter.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/FileDialogFilter.java
diff --git a/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/base/server/cmscore/src/com/netscape/cmscore/util/PFXUtils.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/PFXUtils.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/PFXUtils.java
diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/util/ProfileSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/ProfileSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/util/StatsSubsystem.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/StatsSubsystem.java
diff --git a/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/base/server/cmscore/src/com/netscape/cmscore/util/UtilMessage.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/UtilMessage.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/UtilMessage.java
diff --git a/base/common/src/com/netscape/cmscore/util/UtilResources.java b/base/server/cmscore/src/com/netscape/cmscore/util/UtilResources.java
similarity index 100%
rename from base/common/src/com/netscape/cmscore/util/UtilResources.java
rename to base/server/cmscore/src/com/netscape/cmscore/util/UtilResources.java
diff --git a/base/common/src/pki-cmscore.mf b/base/server/cmscore/src/pki-cmscore.mf
similarity index 100%
rename from base/common/src/pki-cmscore.mf
rename to base/server/cmscore/src/pki-cmscore.mf
diff --git a/base/server/tomcat/CMakeLists.txt b/base/server/tomcat/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..555a9329dae47e5c38f072dce009078db17c819e
--- /dev/null
+++ b/base/server/tomcat/CMakeLists.txt
@@ -0,0 +1,3 @@
+project(tomcat)
+
+add_subdirectory(src)
diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d9808a8033e2c43a4653652f74e6e9b687be8e62
--- /dev/null
+++ b/base/server/tomcat/src/CMakeLists.txt
@@ -0,0 +1,158 @@
+project(pki-tomcat)
+
+find_file(JSS_JAR
+    NAMES
+        jss4.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(LDAPJDK_JAR
+    NAMES
+        ldapjdk.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(COMMONS_HTTPCLIENT_JAR
+    NAMES
+        commons-httpclient.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(APACHE_COMMONS_LANG_JAR
+    NAMES
+        apache-commons-lang.jar
+    PATHS
+        /usr/share/java
+)
+
+find_file(TOMCAT_CATALINA_JAR
+    NAMES
+        catalina.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(TOMCAT_UTIL_JAR
+    NAMES
+        tomcat-util.jar
+    PATHS
+        /usr/share/java/tomcat
+)
+
+find_file(SERVLET_JAR
+    NAMES
+        servlet.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(VELOCITY_JAR
+    NAMES
+        velocity.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XALAN_JAR
+    NAMES
+        xalan-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(XERCES_JAR
+    NAMES
+        xerces-j2.jar
+    PATHS
+        ${JAVA_LIB_INSTALL_DIR}
+        /usr/share/java
+)
+
+find_file(JAXRS_API_JAR
+    NAMES
+        jaxrs-api.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_JAXRS_JAR
+    NAMES
+        resteasy-jaxrs.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(RESTEASY_ATOM_PROVIDER_JAR
+    NAMES
+        resteasy-atom-provider.jar
+    PATHS
+        ${RESTEASY_LIB}
+)
+
+find_file(HTTPCLIENT_JAR
+    NAMES
+        httpclient.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+find_file(HTTPCORE_JAR
+    NAMES
+        httpcore.jar
+    PATHS
+        /usr/share/java/httpcomponents
+)
+
+# build pki-tomcat
+javac(pki-tomcat-classes
+    SOURCES
+        com/netscape/cms/tomcat/*.java
+    CLASSPATH
+        ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR}
+    OUTPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pki-tomcat.mf
+    ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
+)
+
+jar(pki-tomcat-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
+    OPTIONS
+        m
+    PARAMS
+        ${CMAKE_CURRENT_BINARY_DIR}/pki-tomcat.mf
+    INPUT_DIR
+        ${CMAKE_BINARY_DIR}/classes
+    FILES
+        com/netscape/cms/tomcat/*.class
+    DEPENDS
+        pki-tomcat-classes
+)
+
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
+
+set(PKI_TOMCAT_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar CACHE INTERNAL "pki-tomcat jar file")
diff --git a/base/common/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat/src/com/netscape/cms/tomcat/ProxyRealm.java
similarity index 100%
rename from base/common/src/com/netscape/cms/tomcat/ProxyRealm.java
rename to base/server/tomcat/src/com/netscape/cms/tomcat/ProxyRealm.java
diff --git a/base/common/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java b/base/server/tomcat/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
similarity index 100%
rename from base/common/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
rename to base/server/tomcat/src/com/netscape/cms/tomcat/SSLAuthenticatorWithFallback.java
diff --git a/base/common/src/pki-tomcat.mf b/base/server/tomcat/src/pki-tomcat.mf
similarity index 100%
rename from base/common/src/pki-tomcat.mf
rename to base/server/tomcat/src/pki-tomcat.mf
-- 
1.8.1.4

