From 0f5ea13b32fe6198934ee6396fd012b740799f2f Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 9 Nov 2012 03:36:17 -0500
Subject: [PATCH] Reorganized CA, KRA, OCSP, TKS templates.

All remaining theme files for Tomcat subsystems which include
the templates and JS files have been moved from the theme folder
at <subsystem>-ui/shared/webapps/<subsystem> into the subsystem
webapp folder at base/<subsystem>/shared/webapps/<subsystem>.

The deployment tools have been updated to use the new location.

Ticket #407
---
 .../ca-ui => base/ca}/shared/webapps/ca/404.html   |   0
 .../ca-ui => base/ca}/shared/webapps/ca/500.html   |   0
 .../shared/webapps/ca/GenUnexpectedError.template  |   0
 .../webapps/ca/admin/GenUnexpectedError.template   |   0
 .../webapps/ca/admin/ca/EnrollSuccess.template     |   0
 .../webapps/ca/admin/ca/ImportAdminCert.template   |   0
 .../shared/webapps/ca/admin/ca/ImportCert.template |   0
 .../shared/webapps/ca/admin/ca/adminEnroll.html    |   0
 .../ca/admin/ca/securitydomainlogin.template       |   0
 .../shared/webapps/ca/admin/ca/sendCookie.template |   0
 .../ca}/shared/webapps/ca/admin/cms-funcs.js       |   0
 .../ca}/shared/webapps/ca/admin/helpfun.js         |   0
 .../ca}/shared/webapps/ca/admin/index.html         |   0
 .../ca}/shared/webapps/ca/agent/GenError.template  |   0
 .../shared/webapps/ca/agent/GenPending.template    |   0
 .../shared/webapps/ca/agent/GenRejected.template   |   0
 .../shared/webapps/ca/agent/GenSuccess.template    |   0
 .../shared/webapps/ca/agent/GenSvcPending.template |   0
 .../webapps/ca/agent/GenUnauthorized.template      |   0
 .../webapps/ca/agent/GenUnexpectedError.template   |   0
 .../webapps/ca/agent/ca/EnrollSuccess.template     |   0
 .../shared/webapps/ca/agent/ca/ImportCert.template |   0
 .../shared/webapps/ca/agent/ca/ListRequests.html   |   0
 .../webapps/ca/agent/ca/ProfileApprove.template    |   0
 .../webapps/ca/agent/ca/ProfileList.template       |   0
 .../webapps/ca/agent/ca/ProfileProcess.template    |   0
 .../webapps/ca/agent/ca/ProfileReview.template     |   0
 .../webapps/ca/agent/ca/ProfileSelect.template     |   0
 .../ca}/shared/webapps/ca/agent/ca/SrchCert.html   |   0
 .../shared/webapps/ca/agent/ca/SrchRequests.html   |   0
 .../shared/webapps/ca/agent/ca/SrchRevokeCert.html |   0
 .../ca}/shared/webapps/ca/agent/ca/UpdateDir.html  |   0
 .../ca}/shared/webapps/ca/agent/ca/blank.html      |   0
 .../webapps/ca/agent/ca/bulkissuance.template      |   0
 .../webapps/ca/agent/ca/cloneRedirect.template     |   0
 .../webapps/ca/agent/ca/confirmRevocation.template |   0
 .../webapps/ca/agent/ca/displayBySerial.template   |   0
 .../webapps/ca/agent/ca/displayBySerial2.template  |   0
 .../shared/webapps/ca/agent/ca/displayCRL.template |   0
 .../ca/agent/ca/displayCertFromRequest.template    |   0
 .../ca}/shared/webapps/ca/agent/ca/error.template  |   0
 .../ca}/shared/webapps/ca/agent/ca/frameCRL.html   |   0
 .../ca}/shared/webapps/ca/agent/ca/frameDir.html   |   0
 .../webapps/ca/agent/ca/frameDisplayCRL.html       |   0
 .../ca}/shared/webapps/ca/agent/ca/frameList.html  |   0
 .../shared/webapps/ca/agent/ca/frameListReq.html   |   0
 .../ca}/shared/webapps/ca/agent/ca/frameOCSP.html  |   0
 .../shared/webapps/ca/agent/ca/frameProfile.html   |   0
 .../shared/webapps/ca/agent/ca/frameRevoke.html    |   0
 .../shared/webapps/ca/agent/ca/frameSearch.html    |   0
 .../webapps/ca/agent/ca/frameSrchRequests.html     |   0
 .../ca}/shared/webapps/ca/agent/ca/frameStats.html |   0
 .../webapps/ca/agent/ca/getOCSPInfo.template       |   0
 .../shared/webapps/ca/agent/ca/getStats.template   |   0
 .../ca}/shared/webapps/ca/agent/ca/index.html      |   0
 .../ca}/shared/webapps/ca/agent/ca/menuCRL.html    |   0
 .../ca}/shared/webapps/ca/agent/ca/menuDir.html    |   0
 .../shared/webapps/ca/agent/ca/menuDisplayCRL.html |   0
 .../ca}/shared/webapps/ca/agent/ca/menuList.html   |   0
 .../shared/webapps/ca/agent/ca/menuListReq.html    |   0
 .../ca}/shared/webapps/ca/agent/ca/menuOCSP.html   |   0
 .../shared/webapps/ca/agent/ca/menuProfile.html    |   0
 .../ca}/shared/webapps/ca/agent/ca/menuRevoke.html |   0
 .../ca}/shared/webapps/ca/agent/ca/menuSearch.html |   0
 .../webapps/ca/agent/ca/menuSrchRequests.html      |   0
 .../ca}/shared/webapps/ca/agent/ca/menuStats.html  |   0
 .../ca}/shared/webapps/ca/agent/ca/monitor.html    |   0
 .../shared/webapps/ca/agent/ca/monitor.template    |   0
 .../shared/webapps/ca/agent/ca/notImplemented.html |   0
 .../webapps/ca/agent/ca/processCertReq.template    |   0
 .../shared/webapps/ca/agent/ca/processReq.template |   0
 .../shared/webapps/ca/agent/ca/queryBySerial.html  |   0
 .../ca}/shared/webapps/ca/agent/ca/queryCert.html  |   0
 .../shared/webapps/ca/agent/ca/queryCert.template  |   0
 .../shared/webapps/ca/agent/ca/queryReq.template   |   0
 .../webapps/ca/agent/ca/reasonToRevoke.template    |   0
 .../webapps/ca/agent/ca/revocationResult.template  |   0
 .../webapps/ca/agent/ca/revokeBySerial.template    |   0
 .../ca}/shared/webapps/ca/agent/ca/revokeCert.html |   0
 .../shared/webapps/ca/agent/ca/srchCert.template   |   0
 .../webapps/ca/agent/ca/toDisplayCRL.template      |   0
 .../webapps/ca/agent/ca/toUpdateCRL.template       |   0
 .../ca}/shared/webapps/ca/agent/ca/top.html        |   0
 .../ca/agent/ca/unrevocationResult.template        |   0
 .../ca}/shared/webapps/ca/agent/ca/updateCRL.html  |   0
 .../shared/webapps/ca/agent/ca/updateCRL.template  |   0
 .../shared/webapps/ca/agent/ca/updateDir.template  |   0
 .../ca}/shared/webapps/ca/agent/cms-funcs.js       |   0
 .../ca}/shared/webapps/ca/agent/funcs.js           |   0
 .../ca}/shared/webapps/ca/agent/header.template    |   0
 .../ca}/shared/webapps/ca/agent/helpfun.js         |   0
 .../ca}/shared/webapps/ca/agent/index.html         |   0
 .../ca}/shared/webapps/ca/agent/index.template     |   0
 .../ca}/shared/webapps/ca/agent/ports.template     |   0
 .../ca}/shared/webapps/ca/agent/xenroll.dll        | Bin
 .../ca}/shared/webapps/ca/ee/GenError.template     |   0
 .../ca}/shared/webapps/ca/ee/GenPending.template   |   0
 .../ca}/shared/webapps/ca/ee/GenRejected.template  |   0
 .../ca}/shared/webapps/ca/ee/GenSuccess.template   |   0
 .../shared/webapps/ca/ee/GenSvcPending.template    |   0
 .../shared/webapps/ca/ee/GenUnauthorized.template  |   0
 .../webapps/ca/ee/GenUnexpectedError.template      |   0
 .../ca}/shared/webapps/ca/ee/ca/AIMEnroll.html     |   0
 .../ca}/shared/webapps/ca/ee/ca/CMCEnrollment.html |   0
 .../ca}/shared/webapps/ca/ee/ca/CMCRevReq.html     |   0
 .../webapps/ca/ee/ca/CertBasedDualEnroll.html      |   0
 .../ca/ee/ca/CertBasedEncryptionEnroll.html        |   0
 .../webapps/ca/ee/ca/CertBasedSingleEnroll.html    |   0
 .../shared/webapps/ca/ee/ca/ChallengeRevoke1.html  |   0
 .../shared/webapps/ca/ee/ca/DirPinUserEnroll.html  |   0
 .../ca}/shared/webapps/ca/ee/ca/DirUserEnroll.html |   0
 .../ca}/shared/webapps/ca/ee/ca/DisplayCRL.html    |   0
 .../shared/webapps/ca/ee/ca/EnrollSuccess.template |   0
 .../ca}/shared/webapps/ca/ee/ca/GetCAChain.html    |   0
 .../webapps/ca/ee/ca/ImportAdminCert.template      |   0
 .../shared/webapps/ca/ee/ca/ImportCert.template    |   0
 .../ca}/shared/webapps/ca/ee/ca/KeyRecovery.html   |   0
 .../ca}/shared/webapps/ca/ee/ca/ManCAEnroll.html   |   0
 .../shared/webapps/ca/ee/ca/ManObjSignEnroll.html  |   0
 .../ca}/shared/webapps/ca/ee/ca/ManRAEnroll.html   |   0
 .../shared/webapps/ca/ee/ca/ManServerEnroll.html   |   0
 .../ca}/shared/webapps/ca/ee/ca/ManUserEnroll.html |   0
 .../ca}/shared/webapps/ca/ee/ca/NISUserEnroll.html |   0
 .../ca}/shared/webapps/ca/ee/ca/OCSPResponder.html |   0
 .../webapps/ca/ee/ca/ObjSignPKCS10Enroll.html      |   0
 .../shared/webapps/ca/ee/ca/PortalEnrollment.html  |   0
 .../shared/webapps/ca/ee/ca/ProfileList.template   |   0
 .../shared/webapps/ca/ee/ca/ProfileSelect.template |   0
 .../ca}/shared/webapps/ca/ee/ca/ProfileSubmit.html |   0
 .../shared/webapps/ca/ee/ca/ProfileSubmit.template |   0
 .../webapps/ca/ee/ca/RenewalSuccess.template       |   0
 .../webapps/ca/ee/ca/RevocationSuccess.template    |   0
 .../ca}/shared/webapps/ca/ee/ca/UserDnEnroll.html  |   0
 .../ca}/shared/webapps/ca/ee/ca/UserRenewal.html   |   0
 .../shared/webapps/ca/ee/ca/UserRevocation.html    |   0
 .../ca}/shared/webapps/ca/ee/ca/bench2k.html       |   0
 .../ca}/shared/webapps/ca/ee/ca/checkRequest.html  |   0
 .../webapps/ca/ee/ca/displayBySerial.template      |   0
 .../webapps/ca/ee/ca/displayBySerial2.template     |   0
 .../shared/webapps/ca/ee/ca/displayCRL.template    |   0
 .../shared/webapps/ca/ee/ca/displayCaCert.template |   0
 .../ca/ee/ca/displayCertFromRequest.template       |   0
 .../ca}/shared/webapps/ca/ee/ca/enrollMenu.html    |   0
 .../ca}/shared/webapps/ca/ee/ca/index.html         |   0
 .../webapps/ca/ee/ca/policyEnrollment/index.html   |   0
 .../ca/ee/ca/policyEnrollment/profileMenu.html     |   0
 .../ca/ee/ca/policyEnrollment/retrievalMenu.html   |   0
 .../ca/ee/ca/policyEnrollment/revocationMenu.html  |   0
 .../webapps/ca/ee/ca/profileEnrollment/index.html  |   0
 .../ca/ee/ca/profileEnrollment/profileMenu.html    |   0
 .../ca/ee/ca/profileEnrollment/retrievalMenu.html  |   0
 .../ca/ee/ca/profileEnrollment/revocationMenu.html |   0
 .../ca}/shared/webapps/ca/ee/ca/profileMenu.html   |   0
 .../ca}/shared/webapps/ca/ee/ca/queryBySerial.html |   0
 .../ca}/shared/webapps/ca/ee/ca/queryCert.html     |   0
 .../ca}/shared/webapps/ca/ee/ca/queryCert.template |   0
 .../webapps/ca/ee/ca/reasonToRevoke.template       |   0
 .../ca}/shared/webapps/ca/ee/ca/recoveryMenu.html  |   0
 .../webapps/ca/ee/ca/remoteAuthConfig.template     |   0
 .../ca}/shared/webapps/ca/ee/ca/renewalMenu.html   |   0
 .../shared/webapps/ca/ee/ca/requestStatus.template |   0
 .../ca}/shared/webapps/ca/ee/ca/retrievalMenu.html |   0
 .../shared/webapps/ca/ee/ca/revocationMenu.html    |   0
 .../webapps/ca/ee/ca/revocationResult.template     |   0
 .../ca}/shared/webapps/ca/ee/ca/srchCert.html      |   0
 .../ca}/shared/webapps/ca/ee/ca/srchCert.template  |   0
 .../ca}/shared/webapps/ca/ee/ca/tabs.html          |   0
 .../shared/webapps/ca/ee/ca/toDisplayCRL.template  |   0
 .../webapps/ca/ee/ca/unrevocationResult.template   |   0
 .../ca}/shared/webapps/ca/ee/cms-funcs.js          |   0
 .../ca}/shared/webapps/ca/ee/helpfun.js            |   0
 .../ca}/shared/webapps/ca/ee/index.html            |   0
 .../ca-ui => base/ca}/shared/webapps/ca/index.html |   0
 .../ca}/shared/webapps/ca/services.template        |   0
 base/deploy/src/scriptlets/webapp_deployment.py    |  22 ++++++---------------
 .../kra}/shared/webapps/kra/404.html               |   0
 .../kra}/shared/webapps/kra/500.html               |   0
 .../shared/webapps/kra/GenUnexpectedError.template |   0
 .../shared/webapps/kra/agent/GenError.template     |   0
 .../shared/webapps/kra/agent/GenPending.template   |   0
 .../shared/webapps/kra/agent/GenRejected.template  |   0
 .../shared/webapps/kra/agent/GenSuccess.template   |   0
 .../webapps/kra/agent/GenSvcPending.template       |   0
 .../webapps/kra/agent/GenUnauthorized.template     |   0
 .../webapps/kra/agent/GenUnexpectedError.template  |   0
 .../kra}/shared/webapps/kra/agent/cms-funcs.js     |   0
 .../kra}/shared/webapps/kra/agent/funcs.js         |   0
 .../kra}/shared/webapps/kra/agent/header.template  |   0
 .../kra}/shared/webapps/kra/agent/helpfun.js       |   0
 .../kra}/shared/webapps/kra/agent/index.html       |   0
 .../kra}/shared/webapps/kra/agent/index.template   |   0
 .../webapps/kra/agent/kra/GrantRecovery.html       |   0
 .../shared/webapps/kra/agent/kra/ListRequests.html |   0
 .../kra}/shared/webapps/kra/agent/kra/SrchKey.html |   0
 .../webapps/kra/agent/kra/SrchRecoverKey.html      |   0
 .../kra}/shared/webapps/kra/agent/kra/blank.html   |   0
 .../webapps/kra/agent/kra/confirmRecover.html      |   0
 .../kra/agent/kra/confirmRecoverBySerial.template  |   0
 .../webapps/kra/agent/kra/displayBySerial.template |   0
 .../kra/agent/kra/displayBySerial2.template        |   0
 .../agent/kra/displayBySerialForRecovery.template  |   0
 .../webapps/kra/agent/kra/examineRecovery.template |   0
 .../kra/agent/kra/finishAsyncRecovery.template     |   0
 .../webapps/kra/agent/kra/finishRecovery.template  |   0
 .../shared/webapps/kra/agent/kra/frameGrant.html   |   0
 .../shared/webapps/kra/agent/kra/frameRecover.html |   0
 .../shared/webapps/kra/agent/kra/frameRequest.html |   0
 .../shared/webapps/kra/agent/kra/frameSearch.html  |   0
 .../shared/webapps/kra/agent/kra/frameStats.html   |   0
 .../kra/agent/kra/getApprovalStatus.template       |   0
 .../shared/webapps/kra/agent/kra/getStats.template |   0
 .../kra/agent/kra/grantAsyncRecovery.template      |   0
 .../webapps/kra/agent/kra/grantRecovery.template   |   0
 .../kra}/shared/webapps/kra/agent/kra/index.html   |   0
 .../shared/webapps/kra/agent/kra/menuCheck.html    |   0
 .../shared/webapps/kra/agent/kra/menuGrant.html    |   0
 .../shared/webapps/kra/agent/kra/menuRecover.html  |   0
 .../shared/webapps/kra/agent/kra/menuRequest.html  |   0
 .../shared/webapps/kra/agent/kra/menuSearch.html   |   0
 .../shared/webapps/kra/agent/kra/menuStats.html    |   0
 .../shared/webapps/kra/agent/kra/monitor.template  |   0
 .../webapps/kra/agent/kra/processReq.template      |   0
 .../shared/webapps/kra/agent/kra/queryKey.template |   0
 .../kra/agent/kra/queryKeyForRecovery.template     |   0
 .../shared/webapps/kra/agent/kra/queryReq.template |   0
 .../webapps/kra/agent/kra/recoverBySerial.template |   0
 .../shared/webapps/kra/agent/kra/srchKey.template  |   0
 .../kra/agent/kra/srchKeyForRecovery.template      |   0
 .../kra}/shared/webapps/kra/agent/kra/top.html     |   0
 .../kra}/shared/webapps/kra/index.html             |   0
 .../kra}/shared/webapps/kra/services.template      |   0
 .../ocsp}/shared/webapps/ocsp/404.html             |   0
 .../ocsp}/shared/webapps/ocsp/500.html             |   0
 .../webapps/ocsp/GenUnexpectedError.template       |   0
 .../shared/webapps/ocsp/agent/GenError.template    |   0
 .../shared/webapps/ocsp/agent/GenPending.template  |   0
 .../shared/webapps/ocsp/agent/GenRejected.template |   0
 .../shared/webapps/ocsp/agent/GenSuccess.template  |   0
 .../webapps/ocsp/agent/GenSvcPending.template      |   0
 .../webapps/ocsp/agent/GenUnauthorized.template    |   0
 .../webapps/ocsp/agent/GenUnexpectedError.template |   0
 .../ocsp}/shared/webapps/ocsp/agent/cms-funcs.js   |   0
 .../ocsp}/shared/webapps/ocsp/agent/funcs.js       |   0
 .../shared/webapps/ocsp/agent/header.template      |   0
 .../ocsp}/shared/webapps/ocsp/agent/helpfun.js     |   0
 .../ocsp}/shared/webapps/ocsp/agent/index.html     |   0
 .../ocsp}/shared/webapps/ocsp/agent/index.template |   0
 .../shared/webapps/ocsp/agent/ocsp/AddCA.html      |   0
 .../shared/webapps/ocsp/agent/ocsp/AddCRL.html     |   0
 .../shared/webapps/ocsp/agent/ocsp/CheckCert.html  |   0
 .../shared/webapps/ocsp/agent/ocsp/addCA.template  |   0
 .../shared/webapps/ocsp/agent/ocsp/addCRL.template |   0
 .../webapps/ocsp/agent/ocsp/checkCert.template     |   0
 .../shared/webapps/ocsp/agent/ocsp/frameAddCA.html |   0
 .../webapps/ocsp/agent/ocsp/frameAddCRL.html       |   0
 .../webapps/ocsp/agent/ocsp/frameCheckCert.html    |   0
 .../webapps/ocsp/agent/ocsp/frameListCA.html       |   0
 .../shared/webapps/ocsp/agent/ocsp/frameOCSP.html  |   0
 .../shared/webapps/ocsp/agent/ocsp/frameStats.html |   0
 .../webapps/ocsp/agent/ocsp/getOCSPInfo.template   |   0
 .../webapps/ocsp/agent/ocsp/getStats.template      |   0
 .../shared/webapps/ocsp/agent/ocsp/index.html      |   0
 .../webapps/ocsp/agent/ocsp/listCAs.template       |   0
 .../shared/webapps/ocsp/agent/ocsp/menuAddCA.html  |   0
 .../shared/webapps/ocsp/agent/ocsp/menuAddCRL.html |   0
 .../webapps/ocsp/agent/ocsp/menuCheckCert.html     |   0
 .../shared/webapps/ocsp/agent/ocsp/menuListCA.html |   0
 .../shared/webapps/ocsp/agent/ocsp/menuOCSP.html   |   0
 .../shared/webapps/ocsp/agent/ocsp/menuStats.html  |   0
 .../webapps/ocsp/agent/ocsp/removeCA.template      |   0
 .../ocsp}/shared/webapps/ocsp/agent/ports.template |   0
 .../ocsp}/shared/webapps/ocsp/index.html           |   0
 .../ocsp}/shared/webapps/ocsp/services.template    |   0
 .../tks}/shared/webapps/tks/404.html               |   0
 .../tks}/shared/webapps/tks/500.html               |   0
 .../shared/webapps/tks/GenUnexpectedError.template |   0
 .../shared/webapps/tks/agent/GenError.template     |   0
 .../shared/webapps/tks/agent/GenPending.template   |   0
 .../shared/webapps/tks/agent/GenRejected.template  |   0
 .../shared/webapps/tks/agent/GenSuccess.template   |   0
 .../webapps/tks/agent/GenSvcPending.template       |   0
 .../webapps/tks/agent/GenUnauthorized.template     |   0
 .../webapps/tks/agent/GenUnexpectedError.template  |   0
 .../tks}/shared/webapps/tks/agent/cms-funcs.js     |   0
 .../tks}/shared/webapps/tks/agent/funcs.js         |   0
 .../tks}/shared/webapps/tks/agent/header.template  |   0
 .../tks}/shared/webapps/tks/agent/helpfun.js       |   0
 .../tks}/shared/webapps/tks/agent/index.html       |   0
 .../tks}/shared/webapps/tks/agent/index.template   |   0
 .../tks}/shared/webapps/tks/agent/ports.template   |   0
 .../shared/webapps/tks/agent/tks/getStats.template |   0
 .../tks}/shared/webapps/tks/agent/tks/index.html   |   0
 .../tks}/shared/webapps/tks/index.html             |   0
 .../tks}/shared/webapps/tks/services.template      |   0
 294 files changed, 6 insertions(+), 16 deletions(-)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/404.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/500.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/GenUnexpectedError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/GenUnexpectedError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/EnrollSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/ImportAdminCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/ImportCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/adminEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/securitydomainlogin.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/ca/sendCookie.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/cms-funcs.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/helpfun.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/admin/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenPending.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenRejected.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenSvcPending.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenUnauthorized.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/GenUnexpectedError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/EnrollSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ImportCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ListRequests.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ProfileApprove.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ProfileList.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ProfileProcess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ProfileReview.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/ProfileSelect.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/SrchCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/SrchRequests.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/SrchRevokeCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/UpdateDir.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/blank.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/bulkissuance.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/cloneRedirect.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/confirmRevocation.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/displayBySerial.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/displayBySerial2.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/displayCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/displayCertFromRequest.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/error.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameDir.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameDisplayCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameList.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameListReq.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameOCSP.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameProfile.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameRevoke.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameSearch.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameSrchRequests.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/frameStats.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/getOCSPInfo.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/getStats.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuDir.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuDisplayCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuList.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuListReq.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuOCSP.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuProfile.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuRevoke.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuSearch.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuSrchRequests.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/menuStats.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/monitor.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/monitor.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/notImplemented.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/processCertReq.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/processReq.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/queryBySerial.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/queryCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/queryCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/queryReq.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/reasonToRevoke.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/revocationResult.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/revokeBySerial.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/revokeCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/srchCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/toDisplayCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/toUpdateCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/top.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/unrevocationResult.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/updateCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/updateCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ca/updateDir.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/cms-funcs.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/funcs.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/header.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/helpfun.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/index.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/ports.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/agent/xenroll.dll (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenPending.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenRejected.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenSvcPending.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenUnauthorized.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/GenUnexpectedError.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/AIMEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/CMCEnrollment.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/CMCRevReq.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ChallengeRevoke1.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/DirPinUserEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/DirUserEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/DisplayCRL.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/EnrollSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/GetCAChain.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ImportAdminCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ImportCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/KeyRecovery.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ManCAEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ManObjSignEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ManRAEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ManServerEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ManUserEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/NISUserEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/OCSPResponder.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/PortalEnrollment.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ProfileList.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ProfileSelect.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ProfileSubmit.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/ProfileSubmit.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/RenewalSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/RevocationSuccess.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/UserDnEnroll.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/UserRenewal.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/UserRevocation.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/bench2k.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/checkRequest.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/displayBySerial.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/displayBySerial2.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/displayCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/displayCaCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/displayCertFromRequest.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/enrollMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/policyEnrollment/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/profileEnrollment/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/profileMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/queryBySerial.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/queryCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/queryCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/reasonToRevoke.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/recoveryMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/remoteAuthConfig.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/renewalMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/requestStatus.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/retrievalMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/revocationMenu.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/revocationResult.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/srchCert.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/srchCert.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/tabs.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/toDisplayCRL.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/ca/unrevocationResult.template (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/cms-funcs.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/helpfun.js (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/ee/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/index.html (100%)
 rename {dogtag/ca-ui => base/ca}/shared/webapps/ca/services.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/404.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/500.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/GenUnexpectedError.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenError.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenPending.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenRejected.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenSuccess.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenSvcPending.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenUnauthorized.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/GenUnexpectedError.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/cms-funcs.js (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/funcs.js (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/header.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/helpfun.js (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/index.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/index.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/GrantRecovery.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/ListRequests.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/SrchKey.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/SrchRecoverKey.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/blank.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/confirmRecover.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/displayBySerial.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/displayBySerial2.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/examineRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/finishAsyncRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/finishRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/frameGrant.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/frameRecover.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/frameRequest.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/frameSearch.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/frameStats.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/getApprovalStatus.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/getStats.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/grantAsyncRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/grantRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/index.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuCheck.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuGrant.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuRecover.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuRequest.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuSearch.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/menuStats.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/monitor.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/processReq.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/queryKey.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/queryKeyForRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/queryReq.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/recoverBySerial.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/srchKey.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/srchKeyForRecovery.template (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/agent/kra/top.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/index.html (100%)
 rename {dogtag/kra-ui => base/kra}/shared/webapps/kra/services.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/404.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/500.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/GenUnexpectedError.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenError.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenPending.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenRejected.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenSuccess.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenSvcPending.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenUnauthorized.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/GenUnexpectedError.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/cms-funcs.js (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/funcs.js (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/header.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/helpfun.js (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/index.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/index.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/AddCA.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/AddCRL.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/CheckCert.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/addCA.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/addCRL.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/checkCert.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameAddCA.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameListCA.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameOCSP.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/frameStats.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/getStats.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/index.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/listCAs.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuAddCA.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuListCA.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuOCSP.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/menuStats.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ocsp/removeCA.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/agent/ports.template (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/index.html (100%)
 rename {dogtag/ocsp-ui => base/ocsp}/shared/webapps/ocsp/services.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/404.html (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/500.html (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/GenUnexpectedError.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenError.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenPending.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenRejected.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenSuccess.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenSvcPending.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenUnauthorized.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/GenUnexpectedError.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/cms-funcs.js (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/funcs.js (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/header.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/helpfun.js (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/index.html (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/index.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/ports.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/tks/getStats.template (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/agent/tks/index.html (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/index.html (100%)
 rename {dogtag/tks-ui => base/tks}/shared/webapps/tks/services.template (100%)

diff --git a/dogtag/ca-ui/shared/webapps/ca/404.html b/base/ca/shared/webapps/ca/404.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/404.html
rename to base/ca/shared/webapps/ca/404.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/500.html b/base/ca/shared/webapps/ca/500.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/500.html
rename to base/ca/shared/webapps/ca/500.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/base/ca/shared/webapps/ca/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
rename to base/ca/shared/webapps/ca/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/base/ca/shared/webapps/ca/admin/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
rename to base/ca/shared/webapps/ca/admin/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/admin/ca/EnrollSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
rename to base/ca/shared/webapps/ca/admin/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template b/base/ca/shared/webapps/ca/admin/ca/ImportAdminCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
rename to base/ca/shared/webapps/ca/admin/ca/ImportAdminCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template b/base/ca/shared/webapps/ca/admin/ca/ImportCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
rename to base/ca/shared/webapps/ca/admin/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/base/ca/shared/webapps/ca/admin/ca/adminEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
rename to base/ca/shared/webapps/ca/admin/ca/adminEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
rename to base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
rename to base/ca/shared/webapps/ca/admin/ca/sendCookie.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js b/base/ca/shared/webapps/ca/admin/cms-funcs.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
rename to base/ca/shared/webapps/ca/admin/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js b/base/ca/shared/webapps/ca/admin/helpfun.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
rename to base/ca/shared/webapps/ca/admin/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/index.html b/base/ca/shared/webapps/ca/admin/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/admin/index.html
rename to base/ca/shared/webapps/ca/admin/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/base/ca/shared/webapps/ca/agent/GenError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
rename to base/ca/shared/webapps/ca/agent/GenError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template b/base/ca/shared/webapps/ca/agent/GenPending.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
rename to base/ca/shared/webapps/ca/agent/GenPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template b/base/ca/shared/webapps/ca/agent/GenRejected.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
rename to base/ca/shared/webapps/ca/agent/GenRejected.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/base/ca/shared/webapps/ca/agent/GenSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
rename to base/ca/shared/webapps/ca/agent/GenSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/base/ca/shared/webapps/ca/agent/GenSvcPending.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
rename to base/ca/shared/webapps/ca/agent/GenSvcPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/base/ca/shared/webapps/ca/agent/GenUnauthorized.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
rename to base/ca/shared/webapps/ca/agent/GenUnauthorized.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/base/ca/shared/webapps/ca/agent/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
rename to base/ca/shared/webapps/ca/agent/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/agent/ca/EnrollSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
rename to base/ca/shared/webapps/ca/agent/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template b/base/ca/shared/webapps/ca/agent/ca/ImportCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
rename to base/ca/shared/webapps/ca/agent/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/base/ca/shared/webapps/ca/agent/ca/ListRequests.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
rename to base/ca/shared/webapps/ca/agent/ca/ListRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/base/ca/shared/webapps/ca/agent/ca/ProfileApprove.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
rename to base/ca/shared/webapps/ca/agent/ca/ProfileApprove.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/base/ca/shared/webapps/ca/agent/ca/ProfileList.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
rename to base/ca/shared/webapps/ca/agent/ca/ProfileList.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/base/ca/shared/webapps/ca/agent/ca/ProfileProcess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
rename to base/ca/shared/webapps/ca/agent/ca/ProfileProcess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/base/ca/shared/webapps/ca/agent/ca/ProfileReview.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
rename to base/ca/shared/webapps/ca/agent/ca/ProfileReview.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/base/ca/shared/webapps/ca/agent/ca/ProfileSelect.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
rename to base/ca/shared/webapps/ca/agent/ca/ProfileSelect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/base/ca/shared/webapps/ca/agent/ca/SrchCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
rename to base/ca/shared/webapps/ca/agent/ca/SrchCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/SrchRequests.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
rename to base/ca/shared/webapps/ca/agent/ca/SrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/base/ca/shared/webapps/ca/agent/ca/SrchRevokeCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
rename to base/ca/shared/webapps/ca/agent/ca/SrchRevokeCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/base/ca/shared/webapps/ca/agent/ca/UpdateDir.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
rename to base/ca/shared/webapps/ca/agent/ca/UpdateDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html b/base/ca/shared/webapps/ca/agent/ca/blank.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
rename to base/ca/shared/webapps/ca/agent/ca/blank.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template b/base/ca/shared/webapps/ca/agent/ca/bulkissuance.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
rename to base/ca/shared/webapps/ca/agent/ca/bulkissuance.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/base/ca/shared/webapps/ca/agent/ca/cloneRedirect.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
rename to base/ca/shared/webapps/ca/agent/ca/cloneRedirect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template b/base/ca/shared/webapps/ca/agent/ca/confirmRevocation.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
rename to base/ca/shared/webapps/ca/agent/ca/confirmRevocation.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/base/ca/shared/webapps/ca/agent/ca/displayBySerial.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
rename to base/ca/shared/webapps/ca/agent/ca/displayBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/base/ca/shared/webapps/ca/agent/ca/displayBySerial2.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
rename to base/ca/shared/webapps/ca/agent/ca/displayBySerial2.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/base/ca/shared/webapps/ca/agent/ca/displayCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
rename to base/ca/shared/webapps/ca/agent/ca/displayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/base/ca/shared/webapps/ca/agent/ca/displayCertFromRequest.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
rename to base/ca/shared/webapps/ca/agent/ca/displayCertFromRequest.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template b/base/ca/shared/webapps/ca/agent/ca/error.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
rename to base/ca/shared/webapps/ca/agent/ca/error.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html b/base/ca/shared/webapps/ca/agent/ca/frameCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
rename to base/ca/shared/webapps/ca/agent/ca/frameCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html b/base/ca/shared/webapps/ca/agent/ca/frameDir.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
rename to base/ca/shared/webapps/ca/agent/ca/frameDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html b/base/ca/shared/webapps/ca/agent/ca/frameDisplayCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
rename to base/ca/shared/webapps/ca/agent/ca/frameDisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html b/base/ca/shared/webapps/ca/agent/ca/frameList.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
rename to base/ca/shared/webapps/ca/agent/ca/frameList.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html b/base/ca/shared/webapps/ca/agent/ca/frameListReq.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
rename to base/ca/shared/webapps/ca/agent/ca/frameListReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html b/base/ca/shared/webapps/ca/agent/ca/frameOCSP.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
rename to base/ca/shared/webapps/ca/agent/ca/frameOCSP.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html b/base/ca/shared/webapps/ca/agent/ca/frameProfile.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
rename to base/ca/shared/webapps/ca/agent/ca/frameProfile.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html b/base/ca/shared/webapps/ca/agent/ca/frameRevoke.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
rename to base/ca/shared/webapps/ca/agent/ca/frameRevoke.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html b/base/ca/shared/webapps/ca/agent/ca/frameSearch.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
rename to base/ca/shared/webapps/ca/agent/ca/frameSearch.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/frameSrchRequests.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
rename to base/ca/shared/webapps/ca/agent/ca/frameSrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html b/base/ca/shared/webapps/ca/agent/ca/frameStats.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
rename to base/ca/shared/webapps/ca/agent/ca/frameStats.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/base/ca/shared/webapps/ca/agent/ca/getOCSPInfo.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
rename to base/ca/shared/webapps/ca/agent/ca/getOCSPInfo.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/base/ca/shared/webapps/ca/agent/ca/getStats.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
rename to base/ca/shared/webapps/ca/agent/ca/getStats.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/base/ca/shared/webapps/ca/agent/ca/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
rename to base/ca/shared/webapps/ca/agent/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html b/base/ca/shared/webapps/ca/agent/ca/menuCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
rename to base/ca/shared/webapps/ca/agent/ca/menuCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html b/base/ca/shared/webapps/ca/agent/ca/menuDir.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
rename to base/ca/shared/webapps/ca/agent/ca/menuDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html b/base/ca/shared/webapps/ca/agent/ca/menuDisplayCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
rename to base/ca/shared/webapps/ca/agent/ca/menuDisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html b/base/ca/shared/webapps/ca/agent/ca/menuList.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
rename to base/ca/shared/webapps/ca/agent/ca/menuList.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html b/base/ca/shared/webapps/ca/agent/ca/menuListReq.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
rename to base/ca/shared/webapps/ca/agent/ca/menuListReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html b/base/ca/shared/webapps/ca/agent/ca/menuOCSP.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
rename to base/ca/shared/webapps/ca/agent/ca/menuOCSP.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html b/base/ca/shared/webapps/ca/agent/ca/menuProfile.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
rename to base/ca/shared/webapps/ca/agent/ca/menuProfile.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html b/base/ca/shared/webapps/ca/agent/ca/menuRevoke.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
rename to base/ca/shared/webapps/ca/agent/ca/menuRevoke.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html b/base/ca/shared/webapps/ca/agent/ca/menuSearch.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
rename to base/ca/shared/webapps/ca/agent/ca/menuSearch.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/menuSrchRequests.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
rename to base/ca/shared/webapps/ca/agent/ca/menuSrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html b/base/ca/shared/webapps/ca/agent/ca/menuStats.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
rename to base/ca/shared/webapps/ca/agent/ca/menuStats.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/base/ca/shared/webapps/ca/agent/ca/monitor.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
rename to base/ca/shared/webapps/ca/agent/ca/monitor.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/base/ca/shared/webapps/ca/agent/ca/monitor.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
rename to base/ca/shared/webapps/ca/agent/ca/monitor.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html b/base/ca/shared/webapps/ca/agent/ca/notImplemented.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
rename to base/ca/shared/webapps/ca/agent/ca/notImplemented.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/base/ca/shared/webapps/ca/agent/ca/processCertReq.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
rename to base/ca/shared/webapps/ca/agent/ca/processCertReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/base/ca/shared/webapps/ca/agent/ca/processReq.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
rename to base/ca/shared/webapps/ca/agent/ca/processReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/base/ca/shared/webapps/ca/agent/ca/queryBySerial.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
rename to base/ca/shared/webapps/ca/agent/ca/queryBySerial.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/base/ca/shared/webapps/ca/agent/ca/queryCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
rename to base/ca/shared/webapps/ca/agent/ca/queryCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/base/ca/shared/webapps/ca/agent/ca/queryCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
rename to base/ca/shared/webapps/ca/agent/ca/queryCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/base/ca/shared/webapps/ca/agent/ca/queryReq.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
rename to base/ca/shared/webapps/ca/agent/ca/queryReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/base/ca/shared/webapps/ca/agent/ca/reasonToRevoke.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
rename to base/ca/shared/webapps/ca/agent/ca/reasonToRevoke.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template b/base/ca/shared/webapps/ca/agent/ca/revocationResult.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
rename to base/ca/shared/webapps/ca/agent/ca/revocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template b/base/ca/shared/webapps/ca/agent/ca/revokeBySerial.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
rename to base/ca/shared/webapps/ca/agent/ca/revokeBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/base/ca/shared/webapps/ca/agent/ca/revokeCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
rename to base/ca/shared/webapps/ca/agent/ca/revokeCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/base/ca/shared/webapps/ca/agent/ca/srchCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
rename to base/ca/shared/webapps/ca/agent/ca/srchCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/base/ca/shared/webapps/ca/agent/ca/toDisplayCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
rename to base/ca/shared/webapps/ca/agent/ca/toDisplayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/base/ca/shared/webapps/ca/agent/ca/toUpdateCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
rename to base/ca/shared/webapps/ca/agent/ca/toUpdateCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html b/base/ca/shared/webapps/ca/agent/ca/top.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
rename to base/ca/shared/webapps/ca/agent/ca/top.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template b/base/ca/shared/webapps/ca/agent/ca/unrevocationResult.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
rename to base/ca/shared/webapps/ca/agent/ca/unrevocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/base/ca/shared/webapps/ca/agent/ca/updateCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
rename to base/ca/shared/webapps/ca/agent/ca/updateCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/base/ca/shared/webapps/ca/agent/ca/updateCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
rename to base/ca/shared/webapps/ca/agent/ca/updateCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/base/ca/shared/webapps/ca/agent/ca/updateDir.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
rename to base/ca/shared/webapps/ca/agent/ca/updateDir.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js b/base/ca/shared/webapps/ca/agent/cms-funcs.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
rename to base/ca/shared/webapps/ca/agent/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js b/base/ca/shared/webapps/ca/agent/funcs.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
rename to base/ca/shared/webapps/ca/agent/funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/base/ca/shared/webapps/ca/agent/header.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/header.template
rename to base/ca/shared/webapps/ca/agent/header.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js b/base/ca/shared/webapps/ca/agent/helpfun.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
rename to base/ca/shared/webapps/ca/agent/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/index.html b/base/ca/shared/webapps/ca/agent/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/index.html
rename to base/ca/shared/webapps/ca/agent/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/base/ca/shared/webapps/ca/agent/index.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/index.template
rename to base/ca/shared/webapps/ca/agent/index.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/base/ca/shared/webapps/ca/agent/ports.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/ports.template
rename to base/ca/shared/webapps/ca/agent/ports.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll b/base/ca/shared/webapps/ca/agent/xenroll.dll
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
rename to base/ca/shared/webapps/ca/agent/xenroll.dll
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template b/base/ca/shared/webapps/ca/ee/GenError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
rename to base/ca/shared/webapps/ca/ee/GenError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template b/base/ca/shared/webapps/ca/ee/GenPending.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
rename to base/ca/shared/webapps/ca/ee/GenPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template b/base/ca/shared/webapps/ca/ee/GenRejected.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
rename to base/ca/shared/webapps/ca/ee/GenRejected.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/base/ca/shared/webapps/ca/ee/GenSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
rename to base/ca/shared/webapps/ca/ee/GenSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/base/ca/shared/webapps/ca/ee/GenSvcPending.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
rename to base/ca/shared/webapps/ca/ee/GenSvcPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/base/ca/shared/webapps/ca/ee/GenUnauthorized.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
rename to base/ca/shared/webapps/ca/ee/GenUnauthorized.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/base/ca/shared/webapps/ca/ee/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
rename to base/ca/shared/webapps/ca/ee/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/base/ca/shared/webapps/ca/ee/ca/AIMEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/AIMEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html b/base/ca/shared/webapps/ca/ee/ca/CMCEnrollment.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
rename to base/ca/shared/webapps/ca/ee/ca/CMCEnrollment.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html b/base/ca/shared/webapps/ca/ee/ca/CMCRevReq.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
rename to base/ca/shared/webapps/ca/ee/ca/CMCRevReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html b/base/ca/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
rename to base/ca/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/DirUserEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/DirUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/base/ca/shared/webapps/ca/ee/ca/DisplayCRL.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
rename to base/ca/shared/webapps/ca/ee/ca/DisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/ee/ca/EnrollSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
rename to base/ca/shared/webapps/ca/ee/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/base/ca/shared/webapps/ca/ee/ca/GetCAChain.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
rename to base/ca/shared/webapps/ca/ee/ca/GetCAChain.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template b/base/ca/shared/webapps/ca/ee/ca/ImportAdminCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
rename to base/ca/shared/webapps/ca/ee/ca/ImportAdminCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template b/base/ca/shared/webapps/ca/ee/ca/ImportCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
rename to base/ca/shared/webapps/ca/ee/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html b/base/ca/shared/webapps/ca/ee/ca/KeyRecovery.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
rename to base/ca/shared/webapps/ca/ee/ca/KeyRecovery.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManCAEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ManCAEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManRAEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ManRAEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManServerEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ManServerEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManUserEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ManUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html b/base/ca/shared/webapps/ca/ee/ca/OCSPResponder.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
rename to base/ca/shared/webapps/ca/ee/ca/OCSPResponder.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html b/base/ca/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
rename to base/ca/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/base/ca/shared/webapps/ca/ee/ca/PortalEnrollment.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
rename to base/ca/shared/webapps/ca/ee/ca/PortalEnrollment.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/base/ca/shared/webapps/ca/ee/ca/ProfileList.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
rename to base/ca/shared/webapps/ca/ee/ca/ProfileList.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
rename to base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
rename to base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
rename to base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template b/base/ca/shared/webapps/ca/ee/ca/RenewalSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
rename to base/ca/shared/webapps/ca/ee/ca/RenewalSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template b/base/ca/shared/webapps/ca/ee/ca/RevocationSuccess.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
rename to base/ca/shared/webapps/ca/ee/ca/RevocationSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/base/ca/shared/webapps/ca/ee/ca/UserDnEnroll.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
rename to base/ca/shared/webapps/ca/ee/ca/UserDnEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/base/ca/shared/webapps/ca/ee/ca/UserRenewal.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
rename to base/ca/shared/webapps/ca/ee/ca/UserRenewal.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/base/ca/shared/webapps/ca/ee/ca/UserRevocation.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
rename to base/ca/shared/webapps/ca/ee/ca/UserRevocation.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html b/base/ca/shared/webapps/ca/ee/ca/bench2k.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
rename to base/ca/shared/webapps/ca/ee/ca/bench2k.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/base/ca/shared/webapps/ca/ee/ca/checkRequest.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
rename to base/ca/shared/webapps/ca/ee/ca/checkRequest.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/base/ca/shared/webapps/ca/ee/ca/displayBySerial.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
rename to base/ca/shared/webapps/ca/ee/ca/displayBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/base/ca/shared/webapps/ca/ee/ca/displayBySerial2.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
rename to base/ca/shared/webapps/ca/ee/ca/displayBySerial2.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/base/ca/shared/webapps/ca/ee/ca/displayCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
rename to base/ca/shared/webapps/ca/ee/ca/displayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/base/ca/shared/webapps/ca/ee/ca/displayCaCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
rename to base/ca/shared/webapps/ca/ee/ca/displayCaCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/base/ca/shared/webapps/ca/ee/ca/displayCertFromRequest.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
rename to base/ca/shared/webapps/ca/ee/ca/displayCertFromRequest.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html b/base/ca/shared/webapps/ca/ee/ca/enrollMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/enrollMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/base/ca/shared/webapps/ca/ee/ca/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
rename to base/ca/shared/webapps/ca/ee/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
rename to base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
rename to base/ca/shared/webapps/ca/ee/ca/profileEnrollment/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/base/ca/shared/webapps/ca/ee/ca/queryBySerial.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
rename to base/ca/shared/webapps/ca/ee/ca/queryBySerial.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/base/ca/shared/webapps/ca/ee/ca/queryCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
rename to base/ca/shared/webapps/ca/ee/ca/queryCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/base/ca/shared/webapps/ca/ee/ca/queryCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
rename to base/ca/shared/webapps/ca/ee/ca/queryCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
rename to base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html b/base/ca/shared/webapps/ca/ee/ca/recoveryMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/recoveryMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/base/ca/shared/webapps/ca/ee/ca/remoteAuthConfig.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
rename to base/ca/shared/webapps/ca/ee/ca/remoteAuthConfig.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html b/base/ca/shared/webapps/ca/ee/ca/renewalMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/renewalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/base/ca/shared/webapps/ca/ee/ca/requestStatus.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
rename to base/ca/shared/webapps/ca/ee/ca/requestStatus.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/retrievalMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/revocationMenu.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
rename to base/ca/shared/webapps/ca/ee/ca/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template b/base/ca/shared/webapps/ca/ee/ca/revocationResult.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
rename to base/ca/shared/webapps/ca/ee/ca/revocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/base/ca/shared/webapps/ca/ee/ca/srchCert.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
rename to base/ca/shared/webapps/ca/ee/ca/srchCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/base/ca/shared/webapps/ca/ee/ca/srchCert.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
rename to base/ca/shared/webapps/ca/ee/ca/srchCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/base/ca/shared/webapps/ca/ee/ca/tabs.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
rename to base/ca/shared/webapps/ca/ee/ca/tabs.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/base/ca/shared/webapps/ca/ee/ca/toDisplayCRL.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
rename to base/ca/shared/webapps/ca/ee/ca/toDisplayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template b/base/ca/shared/webapps/ca/ee/ca/unrevocationResult.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
rename to base/ca/shared/webapps/ca/ee/ca/unrevocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js b/base/ca/shared/webapps/ca/ee/cms-funcs.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
rename to base/ca/shared/webapps/ca/ee/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js b/base/ca/shared/webapps/ca/ee/helpfun.js
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
rename to base/ca/shared/webapps/ca/ee/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/index.html b/base/ca/shared/webapps/ca/ee/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/ee/index.html
rename to base/ca/shared/webapps/ca/ee/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/index.html b/base/ca/shared/webapps/ca/index.html
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/index.html
rename to base/ca/shared/webapps/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/services.template b/base/ca/shared/webapps/ca/services.template
similarity index 100%
rename from dogtag/ca-ui/shared/webapps/ca/services.template
rename to base/ca/shared/webapps/ca/services.template
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 68fff20bd3c99973b1052e1b7834093dcb1b5e96..a4afbfb8d1caf2e104ea9bbc2f0eff8b8b6cbd93 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -62,14 +62,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "admin"),
                 overwrite_flag=True)
 
-            util.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower()),
-                master['pki_tomcat_webapps_subsystem_path'],
-                overwrite_flag=True)
+            # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
+            # to <instance>/webapps/<subsystem>
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
@@ -78,6 +72,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     master['pki_subsystem'].lower()),
                 master['pki_tomcat_webapps_subsystem_path'],
                 overwrite_flag=True)
+
             util.directory.create(
                 master['pki_tomcat_webapps_subsystem_webinf_classes_path'])
             util.directory.create(
@@ -133,14 +128,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "admin"),
                 overwrite_flag=True)
 
-            util.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower()),
-                master['pki_tomcat_webapps_subsystem_path'],
-                overwrite_flag=True)
+            # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
+            # to <instance>/webapps/<subsystem>
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
@@ -149,6 +138,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     master['pki_subsystem'].lower()),
                 master['pki_tomcat_webapps_subsystem_path'],
                 overwrite_flag=True)
+
             # update Tomcat webapps subsystem WEB-INF lib symbolic links
             if master['pki_subsystem'] == "CA":
                 util.symlink.modify(master['pki_ca_jar_link'])
diff --git a/dogtag/kra-ui/shared/webapps/kra/404.html b/base/kra/shared/webapps/kra/404.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/404.html
rename to base/kra/shared/webapps/kra/404.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/500.html b/base/kra/shared/webapps/kra/500.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/500.html
rename to base/kra/shared/webapps/kra/500.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/base/kra/shared/webapps/kra/GenUnexpectedError.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
rename to base/kra/shared/webapps/kra/GenUnexpectedError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/base/kra/shared/webapps/kra/agent/GenError.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
rename to base/kra/shared/webapps/kra/agent/GenError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template b/base/kra/shared/webapps/kra/agent/GenPending.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
rename to base/kra/shared/webapps/kra/agent/GenPending.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template b/base/kra/shared/webapps/kra/agent/GenRejected.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
rename to base/kra/shared/webapps/kra/agent/GenRejected.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/base/kra/shared/webapps/kra/agent/GenSuccess.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
rename to base/kra/shared/webapps/kra/agent/GenSuccess.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/base/kra/shared/webapps/kra/agent/GenSvcPending.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
rename to base/kra/shared/webapps/kra/agent/GenSvcPending.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/base/kra/shared/webapps/kra/agent/GenUnauthorized.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
rename to base/kra/shared/webapps/kra/agent/GenUnauthorized.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/base/kra/shared/webapps/kra/agent/GenUnexpectedError.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
rename to base/kra/shared/webapps/kra/agent/GenUnexpectedError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js b/base/kra/shared/webapps/kra/agent/cms-funcs.js
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
rename to base/kra/shared/webapps/kra/agent/cms-funcs.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js b/base/kra/shared/webapps/kra/agent/funcs.js
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
rename to base/kra/shared/webapps/kra/agent/funcs.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/base/kra/shared/webapps/kra/agent/header.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/header.template
rename to base/kra/shared/webapps/kra/agent/header.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js b/base/kra/shared/webapps/kra/agent/helpfun.js
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
rename to base/kra/shared/webapps/kra/agent/helpfun.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/index.html b/base/kra/shared/webapps/kra/agent/index.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/index.html
rename to base/kra/shared/webapps/kra/agent/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/base/kra/shared/webapps/kra/agent/index.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/index.template
rename to base/kra/shared/webapps/kra/agent/index.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/base/kra/shared/webapps/kra/agent/kra/GrantRecovery.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
rename to base/kra/shared/webapps/kra/agent/kra/GrantRecovery.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/base/kra/shared/webapps/kra/agent/kra/ListRequests.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
rename to base/kra/shared/webapps/kra/agent/kra/ListRequests.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/base/kra/shared/webapps/kra/agent/kra/SrchKey.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
rename to base/kra/shared/webapps/kra/agent/kra/SrchKey.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/base/kra/shared/webapps/kra/agent/kra/SrchRecoverKey.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
rename to base/kra/shared/webapps/kra/agent/kra/SrchRecoverKey.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html b/base/kra/shared/webapps/kra/agent/kra/blank.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
rename to base/kra/shared/webapps/kra/agent/kra/blank.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html b/base/kra/shared/webapps/kra/agent/kra/confirmRecover.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
rename to base/kra/shared/webapps/kra/agent/kra/confirmRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template b/base/kra/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
rename to base/kra/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
rename to base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerial2.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
rename to base/kra/shared/webapps/kra/agent/kra/displayBySerial2.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/base/kra/shared/webapps/kra/agent/kra/examineRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/examineRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html b/base/kra/shared/webapps/kra/agent/kra/frameGrant.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
rename to base/kra/shared/webapps/kra/agent/kra/frameGrant.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html b/base/kra/shared/webapps/kra/agent/kra/frameRecover.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
rename to base/kra/shared/webapps/kra/agent/kra/frameRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html b/base/kra/shared/webapps/kra/agent/kra/frameRequest.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
rename to base/kra/shared/webapps/kra/agent/kra/frameRequest.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html b/base/kra/shared/webapps/kra/agent/kra/frameSearch.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
rename to base/kra/shared/webapps/kra/agent/kra/frameSearch.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html b/base/kra/shared/webapps/kra/agent/kra/frameStats.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
rename to base/kra/shared/webapps/kra/agent/kra/frameStats.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template b/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
rename to base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/base/kra/shared/webapps/kra/agent/kra/getStats.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
rename to base/kra/shared/webapps/kra/agent/kra/getStats.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template b/base/kra/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template b/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/base/kra/shared/webapps/kra/agent/kra/index.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
rename to base/kra/shared/webapps/kra/agent/kra/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html b/base/kra/shared/webapps/kra/agent/kra/menuCheck.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
rename to base/kra/shared/webapps/kra/agent/kra/menuCheck.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html b/base/kra/shared/webapps/kra/agent/kra/menuGrant.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
rename to base/kra/shared/webapps/kra/agent/kra/menuGrant.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html b/base/kra/shared/webapps/kra/agent/kra/menuRecover.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
rename to base/kra/shared/webapps/kra/agent/kra/menuRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html b/base/kra/shared/webapps/kra/agent/kra/menuRequest.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
rename to base/kra/shared/webapps/kra/agent/kra/menuRequest.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html b/base/kra/shared/webapps/kra/agent/kra/menuSearch.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
rename to base/kra/shared/webapps/kra/agent/kra/menuSearch.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html b/base/kra/shared/webapps/kra/agent/kra/menuStats.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
rename to base/kra/shared/webapps/kra/agent/kra/menuStats.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/base/kra/shared/webapps/kra/agent/kra/monitor.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
rename to base/kra/shared/webapps/kra/agent/kra/monitor.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/base/kra/shared/webapps/kra/agent/kra/processReq.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
rename to base/kra/shared/webapps/kra/agent/kra/processReq.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/base/kra/shared/webapps/kra/agent/kra/queryKey.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
rename to base/kra/shared/webapps/kra/agent/kra/queryKey.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/base/kra/shared/webapps/kra/agent/kra/queryReq.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
rename to base/kra/shared/webapps/kra/agent/kra/queryReq.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template b/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
rename to base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/base/kra/shared/webapps/kra/agent/kra/srchKey.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
rename to base/kra/shared/webapps/kra/agent/kra/srchKey.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
rename to base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html b/base/kra/shared/webapps/kra/agent/kra/top.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
rename to base/kra/shared/webapps/kra/agent/kra/top.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/index.html b/base/kra/shared/webapps/kra/index.html
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/index.html
rename to base/kra/shared/webapps/kra/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/services.template b/base/kra/shared/webapps/kra/services.template
similarity index 100%
rename from dogtag/kra-ui/shared/webapps/kra/services.template
rename to base/kra/shared/webapps/kra/services.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/base/ocsp/shared/webapps/ocsp/404.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/404.html
rename to base/ocsp/shared/webapps/ocsp/404.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/base/ocsp/shared/webapps/ocsp/500.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/500.html
rename to base/ocsp/shared/webapps/ocsp/500.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
rename to base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/base/ocsp/shared/webapps/ocsp/agent/GenError.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenPending.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenPending.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
rename to base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
rename to base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/base/ocsp/shared/webapps/ocsp/agent/funcs.js
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
rename to base/ocsp/shared/webapps/ocsp/agent/funcs.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/base/ocsp/shared/webapps/ocsp/agent/header.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
rename to base/ocsp/shared/webapps/ocsp/agent/header.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/base/ocsp/shared/webapps/ocsp/agent/helpfun.js
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
rename to base/ocsp/shared/webapps/ocsp/agent/helpfun.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html b/base/ocsp/shared/webapps/ocsp/agent/index.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
rename to base/ocsp/shared/webapps/ocsp/agent/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/base/ocsp/shared/webapps/ocsp/agent/index.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
rename to base/ocsp/shared/webapps/ocsp/agent/index.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
rename to base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/base/ocsp/shared/webapps/ocsp/agent/ports.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
rename to base/ocsp/shared/webapps/ocsp/agent/ports.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/index.html
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/index.html
rename to base/ocsp/shared/webapps/ocsp/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/base/ocsp/shared/webapps/ocsp/services.template
similarity index 100%
rename from dogtag/ocsp-ui/shared/webapps/ocsp/services.template
rename to base/ocsp/shared/webapps/ocsp/services.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/404.html b/base/tks/shared/webapps/tks/404.html
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/404.html
rename to base/tks/shared/webapps/tks/404.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/500.html b/base/tks/shared/webapps/tks/500.html
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/500.html
rename to base/tks/shared/webapps/tks/500.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/base/tks/shared/webapps/tks/GenUnexpectedError.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
rename to base/tks/shared/webapps/tks/GenUnexpectedError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/base/tks/shared/webapps/tks/agent/GenError.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
rename to base/tks/shared/webapps/tks/agent/GenError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template b/base/tks/shared/webapps/tks/agent/GenPending.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
rename to base/tks/shared/webapps/tks/agent/GenPending.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template b/base/tks/shared/webapps/tks/agent/GenRejected.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
rename to base/tks/shared/webapps/tks/agent/GenRejected.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/base/tks/shared/webapps/tks/agent/GenSuccess.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
rename to base/tks/shared/webapps/tks/agent/GenSuccess.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/base/tks/shared/webapps/tks/agent/GenSvcPending.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
rename to base/tks/shared/webapps/tks/agent/GenSvcPending.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/base/tks/shared/webapps/tks/agent/GenUnauthorized.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
rename to base/tks/shared/webapps/tks/agent/GenUnauthorized.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/base/tks/shared/webapps/tks/agent/GenUnexpectedError.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
rename to base/tks/shared/webapps/tks/agent/GenUnexpectedError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js b/base/tks/shared/webapps/tks/agent/cms-funcs.js
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
rename to base/tks/shared/webapps/tks/agent/cms-funcs.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js b/base/tks/shared/webapps/tks/agent/funcs.js
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
rename to base/tks/shared/webapps/tks/agent/funcs.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/base/tks/shared/webapps/tks/agent/header.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/header.template
rename to base/tks/shared/webapps/tks/agent/header.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js b/base/tks/shared/webapps/tks/agent/helpfun.js
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
rename to base/tks/shared/webapps/tks/agent/helpfun.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/index.html b/base/tks/shared/webapps/tks/agent/index.html
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/index.html
rename to base/tks/shared/webapps/tks/agent/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/base/tks/shared/webapps/tks/agent/index.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/index.template
rename to base/tks/shared/webapps/tks/agent/index.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/base/tks/shared/webapps/tks/agent/ports.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/ports.template
rename to base/tks/shared/webapps/tks/agent/ports.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/base/tks/shared/webapps/tks/agent/tks/getStats.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
rename to base/tks/shared/webapps/tks/agent/tks/getStats.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/base/tks/shared/webapps/tks/agent/tks/index.html
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
rename to base/tks/shared/webapps/tks/agent/tks/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/index.html b/base/tks/shared/webapps/tks/index.html
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/index.html
rename to base/tks/shared/webapps/tks/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/services.template b/base/tks/shared/webapps/tks/services.template
similarity index 100%
rename from dogtag/tks-ui/shared/webapps/tks/services.template
rename to base/tks/shared/webapps/tks/services.template
-- 
1.7.12.1

