diff --git a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java
index 28f895455f5..3c0f2d6b30c 100644
--- a/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java
+++ b/base/acme/src/main/java/org/dogtagpki/acme/server/ACMEApplication.java
@@ -14,7 +14,7 @@
 /**
  * @author Endi S. Dewata
  */
-@ApplicationPath("/rest")
+@ApplicationPath("/v1")
 public class ACMEApplication extends Application {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ACMEApplication.class);
diff --git a/base/acme/webapps/acme/WEB-INF/web.xml b/base/acme/webapps/acme/WEB-INF/web.xml
index 2b108970d04..f5e2e47ef30 100644
--- a/base/acme/webapps/acme/WEB-INF/web.xml
+++ b/base/acme/webapps/acme/WEB-INF/web.xml
@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Allow somebody with credentials to log in</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/login</url-pattern>
+            <url-pattern>/v1/login</url-pattern>
             <http-method>POST</http-method>
         </web-resource-collection>
         <auth-constraint>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Allow anybody to get login information</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/login</url-pattern>
+            <url-pattern>/v1/login</url-pattern>
             <http-method-omission>POST</http-method-omission>
         </web-resource-collection>
         <user-data-constraint>
@@ -37,7 +37,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
         <display-name>Allow anybody to log out</display-name>
         <web-resource-collection>
             <web-resource-name>Logout Service</web-resource-name>
-            <url-pattern>/rest/logout</url-pattern>
+            <url-pattern>/v1/logout</url-pattern>
         </web-resource-collection>
         <user-data-constraint>
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
@@ -47,7 +47,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Allow administrators to enable ACME services</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/enable</url-pattern>
+            <url-pattern>/v1/enable</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>Administrators</role-name>
@@ -61,7 +61,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Allow administrators to disable ACME services</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/disable</url-pattern>
+            <url-pattern>/v1/disable</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>Administrators</role-name>
diff --git a/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
index e6d26f34ef8..95381efccdc 100644
--- a/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml
@@ -6,7 +6,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
-            <url-pattern>/rest/account/*</url-pattern>
+            <url-pattern>/v1/account/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -19,7 +19,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Admin Services</web-resource-name>
-            <url-pattern>/rest/admin/*</url-pattern>
+            <url-pattern>/v1/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -32,7 +32,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Agent Services</web-resource-name>
-            <url-pattern>/rest/agent/*</url-pattern>
+            <url-pattern>/v1/agent/*</url-pattern>
             <url-pattern>/v2/agent/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
@@ -46,7 +46,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Audit</web-resource-name>
-            <url-pattern>/rest/audit/*</url-pattern>
+            <url-pattern>/v1/audit/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -59,7 +59,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Authority Services</web-resource-name>
-            <url-pattern>/rest/authorities/*</url-pattern>
+            <url-pattern>/v1/authorities/*</url-pattern>
         </web-resource-collection>
         <user-data-constraint>
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
@@ -69,7 +69,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Security Domain Services</web-resource-name>
-            <url-pattern>/rest/securityDomain/installToken</url-pattern>
+            <url-pattern>/v1/securityDomain/installToken</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -82,7 +82,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Self Tests</web-resource-name>
-            <url-pattern>/rest/selftests/*</url-pattern>
+            <url-pattern>/v1/selftests/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -95,7 +95,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Profile Services</web-resource-name>
-            <url-pattern>/rest/profiles/*</url-pattern>
+            <url-pattern>/v1/profiles/*</url-pattern>
         </web-resource-collection>
         <user-data-constraint>
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertRequestService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertRequestService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java
index 4f00b60a29d..78d54f409f0 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertRequestService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java
index 21eefd96efa..f4365aa1db8 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AgentCertService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AgentCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AuthorityService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/AuthorityService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java
index e342ea837b1..fdf20057d55 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/AuthorityService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/AuthorityService.java
@@ -16,7 +16,7 @@
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAApplication.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java
similarity index 72%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAApplication.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java
index e402a90b0b0..941f878ec62 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAApplication.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAApplication.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -6,22 +6,21 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.CAInfoService;
-import org.dogtagpki.server.rest.FeatureService;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SecurityDomainService;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
-
-@ApplicationPath("/rest")
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.FeatureService;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SecurityDomainService;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
+
+@ApplicationPath("/v1")
 public class CAApplication extends Application {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CAApplication.class);
diff --git a/base/ca/src/main/java/org/dogtagpki/server/rest/CAInfoService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java
similarity index 98%
rename from base/ca/src/main/java/org/dogtagpki/server/rest/CAInfoService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java
index 60e02b443b3..6ead8a4e1b8 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/rest/CAInfoService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInfoService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.servlet.http.HttpSession;
 import javax.ws.rs.core.Response;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAInstallerService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAInstallerService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java
index 71b7ad5f92e..b20343c14c4 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAInstallerService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CAInstallerService.java
@@ -15,7 +15,7 @@
 // (C) 2014 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.math.BigInteger;
 
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CASystemCertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java
similarity index 98%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CASystemCertService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java
index 3c8413269c8..e62e1a1f664 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CASystemCertService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CASystemCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestDAO.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestDAO.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java
index 40b4cb6a1b3..104c86ee322 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestDAO.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestDAO.java
@@ -15,7 +15,7 @@
 // (C) 2011 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.security.Principal;
 import java.security.SecureRandom;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java
index ea286769b6b..d22e7ef433f 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertRequestService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java
index 78dd242a450..66083793b03 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/CertService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/CertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.security.InvalidKeyException;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/KRAConnectorService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/KRAConnectorService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java
index 6fb868569c3..50d1551a736 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/KRAConnectorService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/KRAConnectorService.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import javax.ws.rs.core.Response;
 
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/rest/ProfileService.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java
index 43dcee4fb8d..b3e9492ae8f 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/rest/ProfileService.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v1/ProfileService.java
@@ -16,7 +16,7 @@
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.ca.rest;
+package org.dogtagpki.server.ca.rest.v1;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java
index 9ca794eeb8f..1937315894e 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertRequestServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.PrintWriter;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java
index 7cef5228df9..734026668dc 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/AgentCertServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAInfoServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java
similarity index 96%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAInfoServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java
index dfa568a576c..ed2fa06ac8c 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAInfoServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAInfoServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.PrintWriter;
 
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java
similarity index 91%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java
index 207ffbcbdb6..d377010aaa4 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CAServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CAServlet.java
@@ -3,14 +3,14 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.dogtagpki.server.ca.CAEngine;
-import org.dogtagpki.server.rest.PKIServlet;
+import org.dogtagpki.server.rest.v2.PKIServlet;
 
 /**
  * @author Marco Fargetta {@literal <mfargett@redhat.com>}
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertRequestServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java
index ea519d458cf..dfd03bd5378 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertRequestServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertRequestServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -21,7 +21,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.dogtagpki.server.ca.CAEngine;
-import org.dogtagpki.server.ca.rest.ProfileService;
+import org.dogtagpki.server.ca.rest.v1.ProfileService;
 import org.mozilla.jss.netscape.security.x509.X500Name;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java
similarity index 99%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertServlet.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java
index 62286fdb13b..c289e181555 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/CertServlet.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/CertServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2;
+package org.dogtagpki.server.ca.rest.v2;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java
similarity index 80%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertACL.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java
index 84400b6ae7e..2256cc93463 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertACL.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertACL.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = "caCert-agent")
 public class AgentCertACL extends ACLFilter {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java
similarity index 80%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertAuthMethod.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java
index a780604e8cd..0b0dc2d7580 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertAuthMethod.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertAuthMethod.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = "caCert-agent")
 public class AgentCertAuthMethod extends AuthMethodFilter {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java
similarity index 81%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestACL.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java
index dd278dea659..1512d879b0a 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestACL.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestACL.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = "caCertRequest-agent")
 public class AgentCertRequestACL extends ACLFilter {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java
similarity index 81%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestAuthMethod.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java
index 169119d0e78..737dd9514a4 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/AgentCertRequestAuthMethod.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/AgentCertRequestAuthMethod.java
@@ -3,12 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = "caCertRequest-agent")
 public class AgentCertRequestAuthMethod extends AuthMethodFilter {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyACL.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java
similarity index 75%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyACL.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java
index 24c6edd472a..40facdaf9ac 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyACL.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyACL.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = {"caInfo", "caCert", "caCertRequest"})
 public class EmptyACL extends ACLFilter {
diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyAuthMethod.java b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java
similarity index 74%
rename from base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyAuthMethod.java
rename to base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java
index cd5deea5f38..b10e8773365 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/filters/EmptyAuthMethod.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/rest/v2/filters/EmptyAuthMethod.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.ca.v2.filters;
+package org.dogtagpki.server.ca.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = {"caInfo", "caCert", "caCertRequest"})
 public class EmptyAuthMethod extends AuthMethodFilter {
diff --git a/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java b/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java
index 989664fcd91..adeccfc22a0 100644
--- a/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java
+++ b/base/est/src/main/java/org/dogtagpki/est/ESTApplication.java
@@ -11,9 +11,9 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
 
-@ApplicationPath("/rest")
+@ApplicationPath("/v1")
 public class ESTApplication extends Application {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ESTApplication.class);
diff --git a/base/est/webapps/est/WEB-INF/web.xml b/base/est/webapps/est/WEB-INF/web.xml
index 308b99469a9..6d7c881d0dd 100644
--- a/base/est/webapps/est/WEB-INF/web.xml
+++ b/base/est/webapps/est/WEB-INF/web.xml
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Require TLS for all resources</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/*</url-pattern>
+            <url-pattern>/v1/*</url-pattern>
             <http-method>GET</http-method>
         </web-resource-collection>
         <user-data-constraint>
@@ -41,7 +41,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Require authenticated client for POST resources</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/*</url-pattern>
+            <url-pattern>/v1/*</url-pattern>
             <http-method>POST</http-method>
         </web-resource-collection>
         <auth-constraint>
@@ -56,7 +56,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <security-constraint>
         <display-name>Reject unused methods</display-name>
         <web-resource-collection>
-            <url-pattern>/rest/*</url-pattern>
+            <url-pattern>/v1/*</url-pattern>
             <http-method-omission>GET</http-method-omission>
             <http-method-omission>POST</http-method-omission>
         </web-resource-collection>
diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 7ee15aa2bd7..ebdd026b64c 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -6,7 +6,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
-            <url-pattern>/rest/account/*</url-pattern>
+            <url-pattern>/v1/account/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -19,7 +19,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Admin Services</web-resource-name>
-            <url-pattern>/rest/admin/*</url-pattern>
+            <url-pattern>/v1/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -32,7 +32,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Agent Services</web-resource-name>
-            <url-pattern>/rest/agent/*</url-pattern>
+            <url-pattern>/v1/agent/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -45,7 +45,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Audit</web-resource-name>
-            <url-pattern>/rest/audit/*</url-pattern>
+            <url-pattern>/v1/audit/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -58,7 +58,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Security Domain Services</web-resource-name>
-            <url-pattern>/rest/securityDomain/installToken</url-pattern>
+            <url-pattern>/v1/securityDomain/installToken</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -71,7 +71,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Self Tests</web-resource-name>
-            <url-pattern>/rest/selftests/*</url-pattern>
+            <url-pattern>/v1/selftests/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
diff --git a/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java b/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java
index a69fb9e0eea..9b4bf575f85 100644
--- a/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java
+++ b/base/kra/src/main/java/com/netscape/kra/SecurityDataProcessor.java
@@ -13,7 +13,7 @@
 
 import org.dogtagpki.server.kra.KRAEngine;
 import org.dogtagpki.server.kra.KRAEngineConfig;
-import org.dogtagpki.server.kra.rest.KeyRequestService;
+import org.dogtagpki.server.kra.rest.v1.KeyRequestService;
 import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
 import org.mozilla.jss.asn1.OCTET_STRING;
 import org.mozilla.jss.crypto.CryptoToken;
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRAApplication.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java
similarity index 70%
rename from base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRAApplication.java
rename to base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java
index b61bfc70690..5f727baa85f 100644
--- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRAApplication.java
+++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRAApplication.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -6,21 +6,21 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
 import org.dogtagpki.server.rest.KRAInfoService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SecurityDomainService;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
-
-@ApplicationPath("/rest")
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SecurityDomainService;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
+
+@ApplicationPath("/v1")
 public class KRAApplication extends Application {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(KRAApplication.class);
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRASystemCertService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java
similarity index 98%
rename from base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRASystemCertService.java
rename to base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java
index fba517e1b34..9d66baf8684 100644
--- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRASystemCertService.java
+++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KRASystemCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import javax.ws.rs.core.Response;
 
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyRequestService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java
similarity index 99%
rename from base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyRequestService.java
rename to base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java
index 307cc60bc79..d27f9894796 100644
--- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyRequestService.java
+++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyRequestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyService.java b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java
similarity index 99%
rename from base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyService.java
rename to base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java
index 790400b1200..608a3a393b3 100644
--- a/base/kra/src/main/java/org/dogtagpki/server/kra/rest/KeyService.java
+++ b/base/kra/src/main/java/org/dogtagpki/server/kra/rest/v1/KeyService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.kra.rest;
+package org.dogtagpki.server.kra.rest.v1;
 
 
 import java.math.BigInteger;
diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 4c34e7cb6a8..793552c4c1b 100644
--- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -10,7 +10,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
-            <url-pattern>/rest/account/*</url-pattern>
+            <url-pattern>/v1/account/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -23,7 +23,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Admin Services</web-resource-name>
-            <url-pattern>/rest/admin/*</url-pattern>
+            <url-pattern>/v1/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -36,7 +36,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Audit</web-resource-name>
-            <url-pattern>/rest/audit/*</url-pattern>
+            <url-pattern>/v1/audit/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -49,7 +49,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Security Domain Services</web-resource-name>
-            <url-pattern>/rest/securityDomain/installToken</url-pattern>
+            <url-pattern>/v1/securityDomain/installToken</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -62,7 +62,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Self Tests</web-resource-name>
-            <url-pattern>/rest/selftests/*</url-pattern>
+            <url-pattern>/v1/selftests/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
diff --git a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/OCSPApplication.java b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java
similarity index 65%
rename from base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
rename to base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java
index de4031796d9..82f991e0a9a 100644
--- a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
+++ b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/v1/OCSPApplication.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.ocsp.rest;
+package org.dogtagpki.server.ocsp.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -6,20 +6,20 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SecurityDomainService;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
-
-@ApplicationPath("/rest")
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SecurityDomainService;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
+
+@ApplicationPath("/v1")
 public class OCSPApplication extends Application {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OCSPApplication.class);
diff --git a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java
index db7d5e18f7d..ab68ab845fd 100644
--- a/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java
+++ b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java
@@ -24,7 +24,10 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/rest")
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+
+@ApplicationPath("/v1")
 public class PKIApplication extends Application {
 
     private Set<Object> singletons = new LinkedHashSet<>();
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/ACLInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/ACLInterceptor.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java
index 09da6b0e093..0d475546407 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/ACLInterceptor.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/ACLInterceptor.java
@@ -15,7 +15,7 @@
 //(C) 2012 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/AccountService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java
similarity index 98%
rename from base/server/src/main/java/org/dogtagpki/server/rest/AccountService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java
index d01c08a44dd..7ff302d16c1 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/AccountService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AccountService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.security.Principal;
 import java.util.Arrays;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/AuditService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/AuditService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java
index 4d4b5e190fe..6b83dcd2de6 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/AuditService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuditService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/AuthMethodInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/AuthMethodInterceptor.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java
index 6d9fb47db45..fac258f8093 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/AuthMethodInterceptor.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/AuthMethodInterceptor.java
@@ -15,7 +15,7 @@
 //(C) 2013 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/FeatureService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java
similarity index 98%
rename from base/server/src/main/java/org/dogtagpki/server/rest/FeatureService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java
index 459d2c93548..4591f0776a9 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/FeatureService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/FeatureService.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/GroupService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/GroupService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java
index 3c32f1ab104..c3fc4d6a6c2 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/GroupService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/GroupService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/JobService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/JobService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java
index 9f88d6fef8e..31fd577bcb7 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/JobService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/JobService.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.security.Principal;
 import java.util.Arrays;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/MessageFormatInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java
similarity index 98%
rename from base/server/src/main/java/org/dogtagpki/server/rest/MessageFormatInterceptor.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java
index db5e1fb7161..bad126fef16 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/MessageFormatInterceptor.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/MessageFormatInterceptor.java
@@ -15,7 +15,7 @@
 //(C) 2014 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/PKIExceptionMapper.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java
similarity index 98%
rename from base/server/src/main/java/org/dogtagpki/server/rest/PKIExceptionMapper.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java
index b5a421e7478..4f4788dd16b 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/PKIExceptionMapper.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/PKIExceptionMapper.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/SecurityDomainService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/SecurityDomainService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java
index ec2e82cdb83..0b98c84d90c 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/SecurityDomainService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SecurityDomainService.java
@@ -15,7 +15,7 @@
 // (C) 2012 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/SelfTestService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/SelfTestService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java
index a8414d1d1d5..f6f1dd48820 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/SelfTestService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SelfTestService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/SessionContextInterceptor.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/SessionContextInterceptor.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java
index f8503fc417b..3125555bc91 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/SessionContextInterceptor.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/SessionContextInterceptor.java
@@ -15,7 +15,7 @@
 //(C) 2012 Red Hat, Inc.
 //All rights reserved.
 //--- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/UserService.java b/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/UserService.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java
index 67872cef25b..c763def5ba1 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/UserService.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v1/UserService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/server/src/main/java/org/dogtagpki/server/v2/ACLFilter.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/v2/ACLFilter.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java
index 420539aca2c..4a21a9a9720 100644
--- a/base/server/src/main/java/org/dogtagpki/server/v2/ACLFilter.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/ACLFilter.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.v2;
+package org.dogtagpki.server.rest.v2;
 
 import java.io.File;
 import java.io.FileReader;
@@ -212,7 +212,6 @@ protected void checkACL(HttpServletRequest request, String aclName) throws Forbi
                         null, //operation
                         LOGGING_ACL_PARSING_ERROR + ":" + auditInfo));
 
-            e.printStackTrace();
             throw new Failure(e);
         }
 
diff --git a/base/server/src/main/java/org/dogtagpki/server/v2/AuthMethodFilter.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java
similarity index 98%
rename from base/server/src/main/java/org/dogtagpki/server/v2/AuthMethodFilter.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java
index 34950b4bb0b..c62df5eade3 100644
--- a/base/server/src/main/java/org/dogtagpki/server/v2/AuthMethodFilter.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/AuthMethodFilter.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.v2;
+package org.dogtagpki.server.rest.v2;
 
 import java.io.File;
 import java.io.FileReader;
@@ -144,7 +144,6 @@ else if (principal instanceof GenericPrincipal genPrincipal)
             throw new ForbiddenException("Authentication method not allowed.");
 
         } catch (IOException e) {
-            e.printStackTrace();
             throw new Failure(e);
         }
     }
diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/PKIServlet.java b/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java
similarity index 99%
rename from base/server/src/main/java/org/dogtagpki/server/rest/PKIServlet.java
rename to base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java
index f67153be7f2..9179b37535c 100644
--- a/base/server/src/main/java/org/dogtagpki/server/rest/PKIServlet.java
+++ b/base/server/src/main/java/org/dogtagpki/server/rest/v2/PKIServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.rest;
+package org.dogtagpki.server.rest.v2;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
index c0410907a53..b7ca74228e0 100644
--- a/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -10,7 +10,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
-            <url-pattern>/rest/account/*</url-pattern>
+            <url-pattern>/v1/account/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -23,7 +23,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Admin Services</web-resource-name>
-            <url-pattern>/rest/admin/*</url-pattern>
+            <url-pattern>/v1/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -36,7 +36,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Audit</web-resource-name>
-            <url-pattern>/rest/audit/*</url-pattern>
+            <url-pattern>/v1/audit/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -49,7 +49,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Self Tests</web-resource-name>
-            <url-pattern>/rest/selftests/*</url-pattern>
+            <url-pattern>/v1/selftests/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/TKSApplication.java b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java
similarity index 66%
rename from base/tks/src/main/java/org/dogtagpki/server/tks/rest/TKSApplication.java
rename to base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java
index 372822548d7..c4c2545f3c1 100644
--- a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/TKSApplication.java
+++ b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TKSApplication.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.tks.rest;
+package org.dogtagpki.server.tks.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -6,19 +6,19 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AccountService;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
-
-@ApplicationPath("/rest")
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AccountService;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
+
+@ApplicationPath("/v1")
 public class TKSApplication extends Application {
 
     private Set<Object> singletons = new LinkedHashSet<>();
diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/TPSConnectorService.java b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java
similarity index 99%
rename from base/tks/src/main/java/org/dogtagpki/server/tks/rest/TPSConnectorService.java
rename to base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java
index 1f546350c57..6aa22954e8b 100644
--- a/base/tks/src/main/java/org/dogtagpki/server/tks/rest/TPSConnectorService.java
+++ b/base/tks/src/main/java/org/dogtagpki/server/tks/rest/v1/TPSConnectorService.java
@@ -1,4 +1,4 @@
-package org.dogtagpki.server.tks.rest;
+package org.dogtagpki.server.tks.rest.v1;
 
 import java.net.URI;
 import java.security.InvalidKeyException;
diff --git a/base/tomcat-9.0/conf/Catalina/localhost/rewrite.config b/base/tomcat-9.0/conf/Catalina/localhost/rewrite.config
index 50f5b4bbc2a..03451429a27 100644
--- a/base/tomcat-9.0/conf/Catalina/localhost/rewrite.config
+++ b/base/tomcat-9.0/conf/Catalina/localhost/rewrite.config
@@ -1,18 +1,21 @@
 # ACME
-RewriteRule ^/acme/login$ /acme/rest/login
-RewriteRule ^/acme/logout$ /acme/rest/logout
-RewriteRule ^/acme/enable$ /acme/rest/enable
-RewriteRule ^/acme/disable$ /acme/rest/disable
-RewriteRule ^/acme/directory$ /acme/rest/directory
-RewriteRule ^/acme/new-nonce$ /acme/rest/new-nonce
-RewriteRule ^/acme/new-account$ /acme/rest/new-account
-RewriteRule ^/acme/new-order$ /acme/rest/new-order
-RewriteRule ^/acme/authz/(.*)$ /acme/rest/authz/$1
-RewriteRule ^/acme/chall/(.*)$ /acme/rest/chall/$1
-RewriteRule ^/acme/order/(.*)$ /acme/rest/order/$1
-RewriteRule ^/acme/acct/(.*)$ /acme/rest/acct/$1
-RewriteRule ^/acme/cert/(.*)$ /acme/rest/cert/$1
-RewriteRule ^/acme/revoke-cert$ /acme/rest/revoke-cert
+RewriteRule ^/acme/login$ /acme/v1/login
+RewriteRule ^/acme/logout$ /acme/v1/logout
+RewriteRule ^/acme/enable$ /acme/v1/enable
+RewriteRule ^/acme/disable$ /acme/v1/disable
+RewriteRule ^/acme/directory$ /acme/v1/directory
+RewriteRule ^/acme/new-nonce$ /acme/v1/new-nonce
+RewriteRule ^/acme/new-account$ /acme/v1/new-account
+RewriteRule ^/acme/new-order$ /acme/v1/new-order
+RewriteRule ^/acme/authz/(.*)$ /acme/v1/authz/$1
+RewriteRule ^/acme/chall/(.*)$ /acme/v1/chall/$1
+RewriteRule ^/acme/order/(.*)$ /acme/v1/order/$1
+RewriteRule ^/acme/acct/(.*)$ /acme/v1/acct/$1
+RewriteRule ^/acme/cert/(.*)$ /acme/v1/cert/$1
+RewriteRule ^/acme/revoke-cert$ /acme/v1/revoke-cert
 
 # EST
-RewriteRule ^/.well-known/est/(.*)$ /est/rest/$1
+RewriteRule ^/.well-known/est/(.*)$ /est/v1/$1
+
+# REST APIs
+RewriteRule ^/(ca|tps|tks|ocsp|kra)/rest/(.*)$ /$1/v1/$2
diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt
index 515ea17fe07..3d006a20714 100644
--- a/base/tps/CMakeLists.txt
+++ b/base/tps/CMakeLists.txt
@@ -13,6 +13,7 @@ javac(pki-tps-classes
         ${COMMONS_CLI_JAR}
         ${COMMONS_CODEC_JAR}
         ${COMMONS_LANG3_JAR}
+        ${JACKSON2_CORE_JAR} ${JACKSON2_DATABIND_JAR}
         ${JACKSON2_ANNOTATIONS_JAR}
         ${LDAPJDK_JAR}
         ${JSS_JAR}
diff --git a/base/tps/shared/webapps/tps/WEB-INF/web.xml b/base/tps/shared/webapps/tps/WEB-INF/web.xml
index 3cc296edd46..e2c52412da0 100644
--- a/base/tps/shared/webapps/tps/WEB-INF/web.xml
+++ b/base/tps/shared/webapps/tps/WEB-INF/web.xml
@@ -10,7 +10,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
-            <url-pattern>/rest/account/*</url-pattern>
+            <url-pattern>/v1/account/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -23,7 +23,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Admin Services</web-resource-name>
-            <url-pattern>/rest/admin/*</url-pattern>
+            <url-pattern>/v1/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -36,7 +36,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Audit</web-resource-name>
-            <url-pattern>/rest/audit/*</url-pattern>
+            <url-pattern>/v1/audit/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -49,7 +49,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Authenticators</web-resource-name>
-            <url-pattern>/rest/authenticators/*</url-pattern>
+            <url-pattern>/v1/authenticators/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -62,7 +62,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Configuration</web-resource-name>
-            <url-pattern>/rest/config/*</url-pattern>
+            <url-pattern>/v1/config/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -75,7 +75,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Connectors</web-resource-name>
-            <url-pattern>/rest/connectors/*</url-pattern>
+            <url-pattern>/v1/connectors/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -88,7 +88,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Profiles</web-resource-name>
-            <url-pattern>/rest/profiles/*</url-pattern>
+            <url-pattern>/v1/profiles/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -101,7 +101,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Profile Mappings</web-resource-name>
-            <url-pattern>/rest/profile-mappings/*</url-pattern>
+            <url-pattern>/v1/profile-mappings/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -114,7 +114,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Self Tests</web-resource-name>
-            <url-pattern>/rest/selftests/*</url-pattern>
+            <url-pattern>/v1/selftests/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
@@ -127,7 +127,7 @@
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Token Services</web-resource-name>
-            <url-pattern>/rest/tokens/*</url-pattern>
+            <url-pattern>/v1/tokens/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>*</role-name>
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSAccountService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSAccountService.java
index 45d2529cdc4..d80f5bdfda4 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSAccountService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSAccountService.java
@@ -23,7 +23,7 @@
 import java.util.HashSet;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dogtagpki.server.rest.AccountService;
+import org.dogtagpki.server.rest.v1.AccountService;
 
 import com.netscape.certsrv.account.Account;
 import com.netscape.certsrv.base.EBaseException;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ActivityService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/ActivityService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java
index c606e9b61c0..9a315cf8070 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ActivityService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ActivityService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/AuthenticatorService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/AuthenticatorService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java
index d5788268e51..5fb8ac0417d 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/AuthenticatorService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/AuthenticatorService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ConnectorService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/ConnectorService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java
index b9a5d75841f..cdce73a4fe3 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ConnectorService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ConnectorService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ProfileMappingService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/ProfileMappingService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java
index 4a6c38d6db5..818c9848bc9 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/ProfileMappingService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/ProfileMappingService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.net.URI;
 import java.net.URLEncoder;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSApplication.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java
similarity index 81%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSApplication.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java
index 3feed1c547b..8bba5b587e7 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSApplication.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSApplication.java
@@ -15,7 +15,7 @@
 // (C) 2013 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -23,23 +23,23 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.dogtagpki.server.rest.ACLInterceptor;
-import org.dogtagpki.server.rest.AuditService;
-import org.dogtagpki.server.rest.AuthMethodInterceptor;
-import org.dogtagpki.server.rest.GroupService;
-import org.dogtagpki.server.rest.JobService;
-import org.dogtagpki.server.rest.MessageFormatInterceptor;
-import org.dogtagpki.server.rest.PKIExceptionMapper;
-import org.dogtagpki.server.rest.SelfTestService;
-import org.dogtagpki.server.rest.SessionContextInterceptor;
-import org.dogtagpki.server.rest.UserService;
+import org.dogtagpki.server.rest.v1.ACLInterceptor;
+import org.dogtagpki.server.rest.v1.AuditService;
+import org.dogtagpki.server.rest.v1.AuthMethodInterceptor;
+import org.dogtagpki.server.rest.v1.GroupService;
+import org.dogtagpki.server.rest.v1.JobService;
+import org.dogtagpki.server.rest.v1.MessageFormatInterceptor;
+import org.dogtagpki.server.rest.v1.PKIExceptionMapper;
+import org.dogtagpki.server.rest.v1.SelfTestService;
+import org.dogtagpki.server.rest.v1.SessionContextInterceptor;
+import org.dogtagpki.server.rest.v1.UserService;
 import org.dogtagpki.server.tps.TPSAccountService;
 import org.dogtagpki.server.tps.config.ConfigService;
 
 /**
  * @author Endi S. Dewata <edewata@redhat.com>
  */
-@ApplicationPath("/rest")
+@ApplicationPath("/v1")
 public class TPSApplication extends Application {
 
     private Set<Object> singletons = new LinkedHashSet<>();
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSCertService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSCertService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java
index 36ae92b6307..a731ca9f4b9 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSCertService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSCertService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSProfileService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSProfileService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java
index a177fc3d841..52ae0026d16 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSProfileService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TPSProfileService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/rest/TokenService.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java
index 847d5def5ce..b86a7e76cc3 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/rest/TokenService.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v1/TokenService.java
@@ -16,7 +16,7 @@
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
-package org.dogtagpki.server.tps.rest;
+package org.dogtagpki.server.tps.rest.v1;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/ActivityServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java
similarity index 99%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/v2/ActivityServlet.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java
index 3961cecaf5b..2633bdc3af0 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/ActivityServlet.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/ActivityServlet.java
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.tps.v2;
+package org.dogtagpki.server.tps.rest.v2;
 
 import java.io.PrintWriter;
 import java.util.Collections;
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/TPSServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java
similarity index 93%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/v2/TPSServlet.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java
index 81d0fb66182..b548e7a95b8 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/TPSServlet.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/TPSServlet.java
@@ -3,13 +3,13 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.tps.v2;
+package org.dogtagpki.server.tps.rest.v2;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.dogtagpki.server.rest.PKIServlet;
+import org.dogtagpki.server.rest.v2.PKIServlet;
 import org.dogtagpki.server.tps.TPSEngine;
 import org.dogtagpki.server.tps.TPSSubsystem;
 
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyACL.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java
similarity index 73%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyACL.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java
index 01742c82965..3722587d26e 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyACL.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyACL.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.tps.v2.filters;
+package org.dogtagpki.server.tps.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.ACLFilter;
+import org.dogtagpki.server.rest.v2.ACLFilter;
 
 @WebFilter(servletNames = {"activity"})
 public class EmptyACL extends ACLFilter {
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyAuthMethod.java b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java
similarity index 72%
rename from base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyAuthMethod.java
rename to base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java
index 84d05a220fe..f8634fef7fd 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/v2/filters/EmptyAuthMethod.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/rest/v2/filters/EmptyAuthMethod.java
@@ -3,11 +3,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 //
-package org.dogtagpki.server.tps.v2.filters;
+package org.dogtagpki.server.tps.rest.v2.filters;
 
 import javax.servlet.annotation.WebFilter;
 
-import org.dogtagpki.server.v2.AuthMethodFilter;
+import org.dogtagpki.server.rest.v2.AuthMethodFilter;
 
 @WebFilter(servletNames = {"activity"})
 public class EmptyAuthMethod extends AuthMethodFilter {