diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
index 5a19ab3..3d74216 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth;
+package org.onap.aaf.auth.batch;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java
index 15bec4e..dbb2dc3 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth;
+package org.onap.aaf.auth.batch;
 
 public class BatchException extends Exception {
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java
index 66431c8..0bc58ad 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  *
  */
-package org.onap.aaf.auth;
+package org.onap.aaf.auth.batch;
 
 import org.onap.aaf.cadi.principal.TaggedPrincipal;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java
index 4ebb3a9..1fc16e4 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth;
+package org.onap.aaf.auth.batch;
 
 import java.io.IOException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java
index 54e2ee2..544d049 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java
index 5275cf9..416a13c 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java
index ed032c9..37abbaf 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.Date;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java
index 269edc7..a4f4dcf 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java
index ceb0453..61da609 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java
index 658ef8b..9780f2b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java
index 33151d9..ef6bb94 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.Date;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java
index f40eeb5..461d3fc 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java
index 141e382..3ab481f 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.PrintStream;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java
similarity index 94%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java
index eda9662..f95e922 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java
@@ -19,10 +19,10 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
+import org.onap.aaf.auth.batch.helpers.Future;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Future;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.util.Chrono;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java
index ee2e8c3..fb43a42 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 public interface Key<HELPER> {
     public String key(HELPER H);
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java
index f1eadb2..8bef131 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java
index 58a8c4b..567bccf 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.NsAttrib;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.NsAttrib;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java
index c8a1c82..86eff7e 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.NsAttrib;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.NsAttrib;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java
index d5d93b3..2542e04 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.NS;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.NS;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java
index a6c02f2..6555570 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.Perm;
 import org.onap.aaf.auth.dao.cass.PermDAO;
 import org.onap.aaf.auth.dao.cass.PermDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Perm;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java
index db54994..b9ae8d5 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.Perm;
 import org.onap.aaf.auth.dao.cass.PermDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Perm;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java
index a3d4bb6..4b76baf 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.Perm;
+import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.dao.cass.PermDAO;
 import org.onap.aaf.auth.dao.cass.RoleDAO;
 import org.onap.aaf.auth.dao.cass.Status;
 import org.onap.aaf.auth.dao.cass.PermDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Perm;
-import org.onap.aaf.auth.helpers.Role;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
index cdbe92b..512d4a3 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.dao.cass.RoleDAO;
 import org.onap.aaf.auth.dao.cass.RoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Role;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java
index 67491b5..3e109b2 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.dao.cass.RoleDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Role;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java
index 75937ef..388e669 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.Perm;
+import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.dao.cass.PermDAO;
 import org.onap.aaf.auth.dao.cass.RoleDAO;
 import org.onap.aaf.auth.dao.cass.Status;
 import org.onap.aaf.auth.dao.cass.RoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Perm;
-import org.onap.aaf.auth.helpers.Role;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java
index 4538c56..e0c1bb80 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.util.Chrono;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java
index cf519f6..00208ad 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.util.Chrono;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java
index 63d4ef7..a228a8c 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java
@@ -19,20 +19,20 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+import org.onap.aaf.auth.batch.helpers.Approval;
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.dao.cass.NsDAO;
 import org.onap.aaf.auth.dao.hl.Function;
 import org.onap.aaf.auth.dao.hl.Question;
 import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Approval;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.org.Organization.Expiration;
 import org.onap.aaf.misc.env.APIException;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
index 75bbd81..631a811 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java
@@ -19,12 +19,15 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.Approval;
+import org.onap.aaf.auth.batch.helpers.Future;
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO.Data;
@@ -32,9 +35,6 @@
 import org.onap.aaf.auth.dao.hl.Function.Lookup;
 import org.onap.aaf.auth.dao.hl.Function.OP_STATUS;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Approval;
-import org.onap.aaf.auth.helpers.Future;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java
similarity index 94%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java
index b749c64..bf6ead3 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java
@@ -19,10 +19,10 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.util.Chrono;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java
index 12460c9..a17c4fd 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.Status;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java
similarity index 94%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java
index be464d4..12eb115 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java
@@ -19,10 +19,10 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.util.Chrono;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java
index 6371ebb..18705fb 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.aaf.auth.actions;
+package org.onap.aaf.auth.batch.actions;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.util.Chrono;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
index a4c4efb..fb3aefb 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java
index 977964f..6e27495 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.actions.Message;
 import org.onap.aaf.auth.org.Organization;
 
 public class Approver {
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
index e4d487d..5df5dcd 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java
index 1407bdd..a4cfcbe 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
index a3eb836..152c633 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import com.datastax.driver.core.Row;
 
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
index ec60948..979cdf0 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
similarity index 98%
rename from auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
index c21b2be..f6a25e7 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  */
 
-package org.onap.aaf.auth.org;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
index 8a11479..ac4a132 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
similarity index 99%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
index cffb55a..a172738 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java
index 5fb3e5d..04d9a01 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java
index 1ec64b7..ea533b8 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 public interface Loader<T> {
     public void exec(T t);
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
index 8eecb65..45875a2 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.BatchException;
+import org.onap.aaf.auth.batch.BatchException;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java
index e15a6bc..35ad6a1 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java
index 5692d11..3df72e1 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java
index b178c37..5c7a826 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.actions.Message;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.Organization;
 import org.onap.aaf.misc.env.Env;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java
index a3354f3..c8419d5 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java
index ee588f3..21bd71e 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java
index 04a5dce..4b4a255 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
similarity index 97%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
index d9e6bed..30069d6 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.actions.URDelete;
+import org.onap.aaf.auth.batch.actions.URDelete;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
@@ -106,6 +106,10 @@
         return byRole;
     }
 
+    public static void load(Trans trans, Session session, Creator<UserRole> creator) {
+        load(trans,session,creator,null,new DataLoadVisitor());
+    }
+    
     public static void load(Trans trans, Session session, Creator<UserRole> creator, Visitor<UserRole> visitor ) {
         load(trans,session,creator,null,visitor);
     }
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java
index 1eb9ffe..a59064e 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 public interface Visitor<T> {
 	void visit(T t);
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
index 95fe3c0..8bdcd10 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.helpers;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
index 289da58..1a7db05 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.reports;
+package org.onap.aaf.auth.batch.reports;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -35,16 +35,16 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.Batch;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.helpers.Cred;
+import org.onap.aaf.auth.batch.helpers.ExpireRange;
+import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.helpers.Visitor;
+import org.onap.aaf.auth.batch.helpers.X509;
+import org.onap.aaf.auth.batch.helpers.Cred.Instance;
+import org.onap.aaf.auth.batch.helpers.ExpireRange.Range;
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Cred;
-import org.onap.aaf.auth.helpers.Cred.Instance;
-import org.onap.aaf.auth.helpers.UserRole;
-import org.onap.aaf.auth.helpers.Visitor;
-import org.onap.aaf.auth.helpers.X509;
-import org.onap.aaf.auth.org.ExpireRange;
-import org.onap.aaf.auth.org.ExpireRange.Range;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.cadi.configure.Factory;
 import org.onap.aaf.cadi.util.CSV;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java
similarity index 95%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java
index 36d08b7..7b6487a 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,32 +32,32 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.onap.aaf.auth.Batch;
-import org.onap.aaf.auth.BatchPrincipal;
-import org.onap.aaf.auth.actions.Action;
-import org.onap.aaf.auth.actions.ActionDAO;
-import org.onap.aaf.auth.actions.CacheTouch;
-import org.onap.aaf.auth.actions.CredDelete;
-import org.onap.aaf.auth.actions.CredPrint;
-import org.onap.aaf.auth.actions.Email;
-import org.onap.aaf.auth.actions.Message;
-import org.onap.aaf.auth.actions.URDelete;
-import org.onap.aaf.auth.actions.URFutureApprove;
-import org.onap.aaf.auth.actions.URFutureApproveExec;
-import org.onap.aaf.auth.actions.URPrint;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.BatchPrincipal;
+import org.onap.aaf.auth.batch.actions.Action;
+import org.onap.aaf.auth.batch.actions.ActionDAO;
+import org.onap.aaf.auth.batch.actions.CacheTouch;
+import org.onap.aaf.auth.batch.actions.CredDelete;
+import org.onap.aaf.auth.batch.actions.CredPrint;
+import org.onap.aaf.auth.batch.actions.Email;
+import org.onap.aaf.auth.batch.actions.Message;
+import org.onap.aaf.auth.batch.actions.URDelete;
+import org.onap.aaf.auth.batch.actions.URFutureApprove;
+import org.onap.aaf.auth.batch.actions.URFutureApproveExec;
+import org.onap.aaf.auth.batch.actions.URPrint;
+import org.onap.aaf.auth.batch.helpers.Approval;
+import org.onap.aaf.auth.batch.helpers.Cred;
+import org.onap.aaf.auth.batch.helpers.Future;
+import org.onap.aaf.auth.batch.helpers.NS;
+import org.onap.aaf.auth.batch.helpers.Role;
+import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.helpers.Cred.Instance;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP;
 import org.onap.aaf.auth.dao.hl.Function.OP_STATUS;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Approval;
-import org.onap.aaf.auth.helpers.Cred;
-import org.onap.aaf.auth.helpers.Future;
-import org.onap.aaf.auth.helpers.NS;
-import org.onap.aaf.auth.helpers.Role;
-import org.onap.aaf.auth.helpers.UserRole;
-import org.onap.aaf.auth.helpers.Cred.Instance;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.auth.org.Organization.Identity;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java
similarity index 93%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java
index dae6257..a75f0a1 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -30,14 +30,14 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.onap.aaf.auth.Batch;
-import org.onap.aaf.auth.BatchPrincipal;
-import org.onap.aaf.auth.actions.Action;
-import org.onap.aaf.auth.actions.ActionDAO;
-import org.onap.aaf.auth.actions.CacheTouch;
-import org.onap.aaf.auth.actions.URDelete;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.BatchPrincipal;
+import org.onap.aaf.auth.batch.actions.Action;
+import org.onap.aaf.auth.batch.actions.ActionDAO;
+import org.onap.aaf.auth.batch.actions.CacheTouch;
+import org.onap.aaf.auth.batch.actions.URDelete;
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.cadi.util.Split;
 import org.onap.aaf.misc.env.APIException;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
index 50c6dc2..c88eecd 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -30,18 +30,18 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.onap.aaf.auth.Batch;
-import org.onap.aaf.auth.BatchPrincipal;
-import org.onap.aaf.auth.actions.Email;
-import org.onap.aaf.auth.actions.EmailPrint;
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.BatchPrincipal;
+import org.onap.aaf.auth.batch.actions.Email;
+import org.onap.aaf.auth.batch.actions.EmailPrint;
+import org.onap.aaf.auth.batch.actions.Message;
+import org.onap.aaf.auth.batch.helpers.Approval;
+import org.onap.aaf.auth.batch.helpers.Future;
 import org.onap.aaf.auth.dao.CassAccess;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.dao.cass.HistoryDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Approval;
-import org.onap.aaf.auth.helpers.Future;
 import org.onap.aaf.auth.org.Organization;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.auth.org.OrganizationFactory;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java
similarity index 96%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java
index 848b54e..ab7525b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -38,19 +38,19 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.Batch;
-import org.onap.aaf.auth.BatchPrincipal;
-import org.onap.aaf.auth.actions.Email;
-import org.onap.aaf.auth.actions.EmailPrint;
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.BatchPrincipal;
+import org.onap.aaf.auth.batch.actions.Email;
+import org.onap.aaf.auth.batch.actions.EmailPrint;
+import org.onap.aaf.auth.batch.actions.Message;
+import org.onap.aaf.auth.batch.helpers.Cred;
+import org.onap.aaf.auth.batch.helpers.NS;
+import org.onap.aaf.auth.batch.helpers.Notification;
+import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.helpers.Notification.TYPE;
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.dao.hl.Question;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Cred;
-import org.onap.aaf.auth.helpers.NS;
-import org.onap.aaf.auth.helpers.Notification;
-import org.onap.aaf.auth.helpers.Notification.TYPE;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.org.EmailWarnings;
 import org.onap.aaf.auth.org.Organization;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
similarity index 90%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
index d35cfd3..a884006 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
@@ -19,20 +19,20 @@
  *
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import org.onap.aaf.auth.Batch;
-import org.onap.aaf.auth.BatchPrincipal;
-import org.onap.aaf.auth.actions.CacheTouch;
+import org.onap.aaf.auth.batch.Batch;
+import org.onap.aaf.auth.batch.BatchPrincipal;
+import org.onap.aaf.auth.batch.actions.CacheTouch;
+import org.onap.aaf.auth.batch.helpers.CQLBatch;
+import org.onap.aaf.auth.batch.helpers.Cred;
+import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.helpers.X509;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.CQLBatch;
-import org.onap.aaf.auth.helpers.Cred;
-import org.onap.aaf.auth.helpers.UserRole;
-import org.onap.aaf.auth.helpers.X509;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.client.Holder;
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java
similarity index 98%
rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java
rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java
index a670f37..76472b5 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  */
 
-package org.onap.aaf.auth.update;
+package org.onap.aaf.auth.batch.update;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.onap.aaf.auth.Batch;
+import org.onap.aaf.auth.batch.Batch;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.misc.env.APIException;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java
similarity index 96%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java
index 254a6ad..9376da4 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.actions.ActionDAO;
+import org.onap.aaf.auth.batch.actions.ActionDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.APIException;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java
index 2e6ad09..ebb307c 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -28,7 +28,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.onap.aaf.auth.actions.CredPrint;
+import org.onap.aaf.auth.batch.actions.CredPrint;
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.dao.cass.CredDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java
similarity index 96%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java
index d3d4719..3a17067 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -28,8 +28,8 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.actions.Email;
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.actions.Email;
+import org.onap.aaf.auth.batch.actions.Message;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.Organization.Identity;
 import org.onap.aaf.auth.org.Organization;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java
similarity index 96%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java
index fe87219..64d02ee 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.actions.EmailPrint;
+import org.onap.aaf.auth.batch.actions.EmailPrint;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.Organization;
 import org.onap.aaf.cadi.client.Future;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java
similarity index 92%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java
index 121bf48..00542a2 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -31,9 +31,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.onap.aaf.auth.actions.FuturePrint;
+import org.onap.aaf.auth.batch.actions.FuturePrint;
+import org.onap.aaf.auth.batch.helpers.Future;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Future;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.LogTarget;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java
index ada1dba..86bab83 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.actions.Message;
 
 import static org.mockito.Mockito.*;
 import org.junit.Test;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java
similarity index 92%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java
index 9540642..9f569d6 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  *
  */
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -29,9 +29,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.onap.aaf.auth.actions.URFuturePrint;
+import org.onap.aaf.auth.batch.actions.URFuturePrint;
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.LogTarget;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java
similarity index 92%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java
index 1e99ec6..8a037ec 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.actions.test;
+package org.onap.aaf.auth.batch.actions.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -30,9 +30,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.onap.aaf.auth.actions.URPrint;
+import org.onap.aaf.auth.batch.actions.URPrint;
+import org.onap.aaf.auth.batch.helpers.UserRole;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.UserRole;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.LogTarget;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java
similarity index 99%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java
index 078c383..661105d 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  *
  */
-package org.onap.aaf.auth.helpers.creators;
+package org.onap.aaf.auth.batch.helpers.creators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java
similarity index 97%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java
index 6020dcc..44c7276 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -33,10 +33,10 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aaf.auth.batch.helpers.Approval;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Approval;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.LogTarget;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java
similarity index 92%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java
index b4ae121..bd498f5 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,8 +27,8 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.actions.Message;
-import org.onap.aaf.auth.helpers.Approver;
+import org.onap.aaf.auth.batch.actions.Message;
+import org.onap.aaf.auth.batch.helpers.Approver;
 import org.onap.aaf.auth.org.Organization;
 
 import static org.mockito.Mockito.*;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java
index fc934e6..27d2d3c 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.CacheChange;
+import org.onap.aaf.auth.batch.helpers.CacheChange;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java
index ad4d202..2a266f5 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java
@@ -20,7 +20,7 @@
  */
 
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.Creator;
+import org.onap.aaf.auth.batch.helpers.Creator;
 
 import com.datastax.driver.core.Row;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
index 35a6305..20831c6 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
@@ -20,7 +20,7 @@
  */
 
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -28,10 +28,10 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.onap.aaf.auth.batch.helpers.Cred;
+import org.onap.aaf.auth.batch.helpers.Cred.CredCount;
+import org.onap.aaf.auth.batch.helpers.Cred.Instance;
 import org.onap.aaf.auth.common.Define;
-import org.onap.aaf.auth.helpers.Cred;
-import org.onap.aaf.auth.helpers.Cred.CredCount;
-import org.onap.aaf.auth.helpers.Cred.Instance;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.config.Config;
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
similarity index 95%
rename from auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
index c42cf53..4ed167e 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  */
 
-package org.onap.aaf.auth.org.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 import org.junit.Test;
-import org.onap.aaf.auth.org.ExpireRange;
+import org.onap.aaf.auth.batch.helpers.ExpireRange;
 import org.onap.aaf.cadi.PropAccess;
 
 public class JU_ExpireRange {
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
index fe3d5d9..91950c6 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -34,11 +34,11 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aaf.auth.batch.helpers.Creator;
+import org.onap.aaf.auth.batch.helpers.Future;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Creator;
-import org.onap.aaf.auth.helpers.Future;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.LogTarget;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java
index 3346f22..beaaad3 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.History;
+import org.onap.aaf.auth.batch.helpers.History;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java
index 07fd65f..f30ad3c 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.InputIterator;
+import org.onap.aaf.auth.batch.helpers.InputIterator;
 
 import static org.mockito.Mockito.*;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java
index 6f44b39..d8a2682 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,8 +27,8 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.BatchException;
-import org.onap.aaf.auth.helpers.MiscID;
+import org.onap.aaf.auth.batch.BatchException;
+import org.onap.aaf.auth.batch.helpers.MiscID;
 
 import com.datastax.driver.core.Row;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java
index 97b6c56..d9d9d01 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,8 +27,8 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.MonthData;
-import org.onap.aaf.auth.helpers.MonthData.Row;
+import org.onap.aaf.auth.batch.helpers.MonthData;
+import org.onap.aaf.auth.batch.helpers.MonthData.Row;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java
index b69f887..1208ba9 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -30,10 +30,10 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aaf.auth.helpers.Creator;
-import org.onap.aaf.auth.helpers.NS;
-import org.onap.aaf.auth.helpers.NS.NSSplit;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
+import org.onap.aaf.auth.batch.helpers.Creator;
+import org.onap.aaf.auth.batch.helpers.NS;
+import org.onap.aaf.auth.batch.helpers.NS.NSSplit;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.LogTarget;
 import org.onap.aaf.misc.env.TimeTaken;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java
similarity index 90%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java
index acf9b47..6df877f 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aaf.auth.helpers.NsAttrib;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
+import org.onap.aaf.auth.batch.helpers.NsAttrib;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java
similarity index 96%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java
index 0ccc77a..10cbd35 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.Perm;
+import org.onap.aaf.auth.batch.helpers.Perm;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java
index 3fd9f87..250c7a1 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,8 +27,8 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.helpers.Perm;
-import org.onap.aaf.auth.helpers.Role;
+import org.onap.aaf.auth.batch.helpers.Perm;
+import org.onap.aaf.auth.batch.helpers.Role;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java
index b20f9de..6b7011c 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.helpers.test;
+package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -33,12 +33,12 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aaf.auth.actions.URDelete;
+import org.onap.aaf.auth.batch.actions.URDelete;
+import org.onap.aaf.auth.batch.helpers.Creator;
+import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Creator;
-import org.onap.aaf.auth.helpers.UserRole;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.LogTarget;
 import org.onap.aaf.misc.env.TimeTaken;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java
similarity index 97%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java
index 5394c32..1ef6f3b 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.test;
+package org.onap.aaf.auth.batch.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.Batch;
+import org.onap.aaf.auth.batch.Batch;
 import org.onap.aaf.auth.env.AuthzEnv;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.Organization;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java
similarity index 95%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java
index c56a76c..47a7c27 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java
@@ -20,7 +20,7 @@
  */
 
 
-package org.onap.aaf.auth.test;
+package org.onap.aaf.auth.batch.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.BatchException;
+import org.onap.aaf.auth.batch.BatchException;
 
 import static org.mockito.Mockito.*;
 import org.junit.Test;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java
similarity index 94%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java
index 6186df9..4e5ad67 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.test;
+package org.onap.aaf.auth.batch.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.BatchPrincipal;
+import org.onap.aaf.auth.batch.BatchPrincipal;
 
 import junit.framework.Assert;
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java
similarity index 96%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java
index d1934a4..dfb3081 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.auth.test;
+package org.onap.aaf.auth.batch.test;
 
 import static org.junit.Assert.*;
 import org.junit.After;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.aaf.auth.CassBatch;
+import org.onap.aaf.auth.batch.CassBatch;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.misc.env.APIException;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java
similarity index 88%
rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java
rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java
index d3a1258..79e4168 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END====================================================
  *
  */
-package org.onap.aaf.auth.helpers;
+package org.onap.aaf.auth.batch.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -29,10 +29,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.onap.aaf.auth.actions.Message;
+import org.onap.aaf.auth.batch.actions.Message;
+import org.onap.aaf.auth.batch.helpers.Creator;
+import org.onap.aaf.auth.batch.helpers.Notification;
+import org.onap.aaf.auth.batch.helpers.Notification.TYPE;
+import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.auth.env.AuthzTrans;
-import org.onap.aaf.auth.helpers.Notification.TYPE;
-import org.onap.aaf.auth.helpers.creators.RowCreator;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.LogTarget;
 import org.onap.aaf.misc.env.TimeTaken;