diff --git a/README.md b/README.md
index 9410eb86..c12c14a4 100644
--- a/README.md
+++ b/README.md
@@ -257,8 +257,8 @@ To add own code binding or hook into execution process, you can create your own
 #### Example extension script
 
 ```groovy
-import com.vml.es.aem.acm.core.code.ExecutionContext
-import com.vml.es.aem.acm.core.code.Execution
+import dev.vml.es.acm.core.code.ExecutionContext
+import dev.vml.es.acm.core.code.Execution
 
 void prepareRun(ExecutionContext executionContext) {
     executionContext.variable("acme", new AcmeFacade())
diff --git a/aem/default/etc/aem.yml b/aem/default/etc/aem.yml
index 077c82e9..685c33cb 100755
--- a/aem/default/etc/aem.yml
+++ b/aem/default/etc/aem.yml
@@ -96,7 +96,7 @@ instance:
     component_stable:
       skip: false
       pids:
-        include: ['com.vml.es.aem.acm.core.*', 'com.day.crx.packaging.*', 'org.apache.sling.installer.*']
+        include: ['dev.vml.es.acm.core.*', 'com.day.crx.packaging.*', 'org.apache.sling.installer.*']
         exclude: ['org.apache.sling.installer.hc.*', 'org.apache.sling.installer.core.impl.console.*']
         match:
           "disabled": []
diff --git a/all/pom.xml b/all/pom.xml
index a41d4c28..3e0bb98b 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -7,7 +7,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -37,39 +37,39 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <packageType>container</packageType>
                     <!-- skip sub package validation for now as some vendor packages like CIF apps will not pass -->
                     <skipSubPackageValidation>true</skipSubPackageValidation>
                     <embeddeds>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.apps</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.content</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/content/install</target>
                         </embedded>
                         <!-- TODO make it deployable on AEMaaCS as well
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.content.index</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/content/install</target>
                         </embedded>
                         -->
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.config</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.core</artifactId>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
@@ -173,19 +173,19 @@
     <!-- ====================================================================== -->
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.content</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.config</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
diff --git a/archetype.properties b/archetype.properties
index 586dca33..783e6b05 100644
--- a/archetype.properties
+++ b/archetype.properties
@@ -1,9 +1,9 @@
 # Parameters used to generate this project with aem-project-archetype
 
-groupId=com.vml.es.aem
+groupId=dev.vml.es
 artifactId=acm
 version=1.0.0-SNAPSHOT
-package=com.vml.es.aem.acm
+package=dev.vml.es.acm
 appId=acm
 appTitle=AEM Content Manager
 aemVersion=6.5.20
diff --git a/core/pom.xml b/core/pom.xml
index 748dd791..e8d72524 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -47,7 +47,7 @@
                         </goals>
                         <configuration>
                             <bnd><![CDATA[
-Export-Package com.vml.es.aem.acm.core.*
+Export-Package dev.vml.es.acm.core.*
 Import-Package: javax.annotation;version=0.0.0,*
 Private-Package: com.fasterxml.jackson.core.*,com.fasterxml.jackson.annotation.*,com.fasterxml.jackson.dataformat.*,com.fasterxml.jackson.databind.*,com.fasterxml.jackson.datatype.*,org.yaml.snakeyaml.*
 DynamicImport-Package: *
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/RemovePropertyOptions.java b/core/src/main/java/com/vml/es/aem/acm/core/acl/RemovePropertyOptions.java
deleted file mode 100644
index cda3f906..00000000
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/RemovePropertyOptions.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vml.es.aem.acm.core.acl;
-
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
-
-public class RemovePropertyOptions extends com.vml.es.aem.acm.core.acl.authorizable.RemovePropertyOptions {
-
-    private AclAuthorizable authorizable;
-
-    private String authorizableId;
-
-    public AclAuthorizable getAuthorizable() {
-        return authorizable;
-    }
-
-    public void setAuthorizable(AclAuthorizable authorizable) {
-        this.authorizable = authorizable;
-    }
-
-    public String getAuthorizableId() {
-        return authorizableId;
-    }
-
-    public void setAuthorizableId(String authorizableId) {
-        this.authorizableId = authorizableId;
-    }
-}
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/AcmException.java b/core/src/main/java/dev/vml/es/acm/core/AcmException.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/AcmException.java
rename to core/src/main/java/dev/vml/es/acm/core/AcmException.java
index 38e0ec8d..f9cb94d6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/AcmException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/AcmException.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core;
+package dev.vml.es.acm.core;
 
 public class AcmException extends RuntimeException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/Acl.java b/core/src/main/java/dev/vml/es/acm/core/acl/Acl.java
similarity index 99%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/Acl.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/Acl.java
index 138e6bfb..66da904a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/Acl.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/Acl.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
-import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
-import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclGroup;
+import dev.vml.es.acm.core.acl.authorizable.AclUser;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclChecker.java b/core/src/main/java/dev/vml/es/acm/core/acl/AclChecker.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/AclChecker.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/AclChecker.java
index 561cd275..99f0952b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclChecker.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/AclChecker.java
@@ -1,12 +1,12 @@
-package com.vml.es.aem.acm.core.acl;
-
-import com.vml.es.aem.acm.core.acl.check.AuthorizableOptions;
-import com.vml.es.aem.acm.core.acl.check.ExistsOptions;
-import com.vml.es.aem.acm.core.acl.check.MemberOptions;
-import com.vml.es.aem.acm.core.acl.check.PasswordOptions;
-import com.vml.es.aem.acm.core.acl.check.PermissionsOptions;
-import com.vml.es.aem.acm.core.acl.check.PropertyOptions;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+package dev.vml.es.acm.core.acl;
+
+import dev.vml.es.acm.core.acl.check.AuthorizableOptions;
+import dev.vml.es.acm.core.acl.check.ExistsOptions;
+import dev.vml.es.acm.core.acl.check.MemberOptions;
+import dev.vml.es.acm.core.acl.check.PasswordOptions;
+import dev.vml.es.acm.core.acl.check.PermissionsOptions;
+import dev.vml.es.acm.core.acl.check.PropertyOptions;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclContext.java b/core/src/main/java/dev/vml/es/acm/core/acl/AclContext.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/AclContext.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/AclContext.java
index 27c143dd..3189255d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclContext.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/AclContext.java
@@ -1,11 +1,11 @@
-package com.vml.es.aem.acm.core.acl;
-
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
-import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
-import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
-import com.vml.es.aem.acm.core.acl.utils.AuthorizableManager;
-import com.vml.es.aem.acm.core.acl.utils.PermissionsManager;
-import com.vml.es.aem.acm.core.repo.Repo;
+package dev.vml.es.acm.core.acl;
+
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclGroup;
+import dev.vml.es.acm.core.acl.authorizable.AclUser;
+import dev.vml.es.acm.core.acl.utils.AuthorizableManager;
+import dev.vml.es.acm.core.acl.utils.PermissionsManager;
+import dev.vml.es.acm.core.repo.Repo;
 import java.util.Optional;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclException.java b/core/src/main/java/dev/vml/es/acm/core/acl/AclException.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/AclException.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/AclException.java
index 55a450e9..e3bb0fb2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/AclException.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 
 public class AclException extends AcmException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclResult.java b/core/src/main/java/dev/vml/es/acm/core/acl/AclResult.java
similarity index 90%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/AclResult.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/AclResult.java
index 9a3da03b..b3d060e1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/AclResult.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/AclResult.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 import java.util.Arrays;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/AuthorizableOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/AuthorizableOptions.java
similarity index 83%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/AuthorizableOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/AuthorizableOptions.java
index b6b88cd5..bebebce9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/AuthorizableOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/AuthorizableOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
 
 public class AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/ClearOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/ClearOptions.java
similarity index 70%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/ClearOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/ClearOptions.java
index 6948c0e1..b72f0667 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/ClearOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/ClearOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
 
-public class ClearOptions extends com.vml.es.aem.acm.core.acl.authorizable.ClearOptions {
+public class ClearOptions extends dev.vml.es.acm.core.acl.authorizable.ClearOptions {
 
     private AclAuthorizable authorizable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateAuthorizableOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/CreateAuthorizableOptions.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/CreateAuthorizableOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/CreateAuthorizableOptions.java
index f78ec05e..0a2da831 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateAuthorizableOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/CreateAuthorizableOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateGroupOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/CreateGroupOptions.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/CreateGroupOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/CreateGroupOptions.java
index 31b3a602..80cfbd09 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateGroupOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/CreateGroupOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 public class CreateGroupOptions extends CreateAuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateUserOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/CreateUserOptions.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/CreateUserOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/CreateUserOptions.java
index 6346a882..c53c297a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/CreateUserOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/CreateUserOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteGroupOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/DeleteGroupOptions.java
similarity index 78%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteGroupOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/DeleteGroupOptions.java
index b6f0eaed..dcdc3b5d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteGroupOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/DeleteGroupOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
+import dev.vml.es.acm.core.acl.authorizable.AclGroup;
 
 public class DeleteGroupOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteUserOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/DeleteUserOptions.java
similarity index 78%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteUserOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/DeleteUserOptions.java
index 67b6e597..0661cab1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/DeleteUserOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/DeleteUserOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
+import dev.vml.es.acm.core.acl.authorizable.AclUser;
 
 public class DeleteUserOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/GetAuthorizableOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/GetAuthorizableOptions.java
similarity index 83%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/GetAuthorizableOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/GetAuthorizableOptions.java
index a724410c..3c8ce003 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/GetAuthorizableOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/GetAuthorizableOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 public class GetAuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/GroupOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/GroupOptions.java
similarity index 70%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/GroupOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/GroupOptions.java
index e59a87b6..e3e53423 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/GroupOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/GroupOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
 
-public class GroupOptions extends com.vml.es.aem.acm.core.acl.authorizable.GroupOptions {
+public class GroupOptions extends dev.vml.es.acm.core.acl.authorizable.GroupOptions {
 
     private AclAuthorizable authorizable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/MemberOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/MemberOptions.java
similarity index 65%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/MemberOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/MemberOptions.java
index 7f2f33f5..452427b8 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/MemberOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/MemberOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
+import dev.vml.es.acm.core.acl.authorizable.AclGroup;
 
-public class MemberOptions extends com.vml.es.aem.acm.core.acl.authorizable.MemberOptions {
+public class MemberOptions extends dev.vml.es.acm.core.acl.authorizable.MemberOptions {
 
     private AclGroup group;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/PasswordOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/PasswordOptions.java
similarity index 63%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/PasswordOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/PasswordOptions.java
index 5f751d6a..009b851c 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/PasswordOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/PasswordOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
+import dev.vml.es.acm.core.acl.authorizable.AclUser;
 
-public class PasswordOptions extends com.vml.es.aem.acm.core.acl.authorizable.PasswordOptions {
+public class PasswordOptions extends dev.vml.es.acm.core.acl.authorizable.PasswordOptions {
 
     private AclUser user;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/PermissionsOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/PermissionsOptions.java
similarity index 69%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/PermissionsOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/PermissionsOptions.java
index 7b1f7e52..68448009 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/PermissionsOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/PermissionsOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
 
-public class PermissionsOptions extends com.vml.es.aem.acm.core.acl.authorizable.PermissionsOptions {
+public class PermissionsOptions extends dev.vml.es.acm.core.acl.authorizable.PermissionsOptions {
 
     private AclAuthorizable authorizable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/RemoveAllMembersOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/RemoveAllMembersOptions.java
similarity index 80%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/RemoveAllMembersOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/RemoveAllMembersOptions.java
index 46ae81df..c110fa30 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/RemoveAllMembersOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/RemoveAllMembersOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
+import dev.vml.es.acm.core.acl.authorizable.AclGroup;
 
 public class RemoveAllMembersOptions {
 
diff --git a/core/src/main/java/dev/vml/es/acm/core/acl/RemovePropertyOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/RemovePropertyOptions.java
new file mode 100644
index 00000000..95272e17
--- /dev/null
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/RemovePropertyOptions.java
@@ -0,0 +1,26 @@
+package dev.vml.es.acm.core.acl;
+
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
+
+public class RemovePropertyOptions extends dev.vml.es.acm.core.acl.authorizable.RemovePropertyOptions {
+
+    private AclAuthorizable authorizable;
+
+    private String authorizableId;
+
+    public AclAuthorizable getAuthorizable() {
+        return authorizable;
+    }
+
+    public void setAuthorizable(AclAuthorizable authorizable) {
+        this.authorizable = authorizable;
+    }
+
+    public String getAuthorizableId() {
+        return authorizableId;
+    }
+
+    public void setAuthorizableId(String authorizableId) {
+        this.authorizableId = authorizableId;
+    }
+}
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/SetPropertyOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/SetPropertyOptions.java
similarity index 69%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/SetPropertyOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/SetPropertyOptions.java
index 0664a103..670afd92 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/SetPropertyOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/SetPropertyOptions.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
-import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
+import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
 
-public class SetPropertyOptions extends com.vml.es.aem.acm.core.acl.authorizable.SetPropertyOptions {
+public class SetPropertyOptions extends dev.vml.es.acm.core.acl.authorizable.SetPropertyOptions {
 
     private AclAuthorizable authorizable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclAuthorizable.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclAuthorizable.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclAuthorizable.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclAuthorizable.java
index fa76de3c..eaeb5e27 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclAuthorizable.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclAuthorizable.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
-import com.vml.es.aem.acm.core.acl.AclContext;
-import com.vml.es.aem.acm.core.acl.AclException;
-import com.vml.es.aem.acm.core.acl.AclResult;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+import dev.vml.es.acm.core.acl.AclContext;
+import dev.vml.es.acm.core.acl.AclException;
+import dev.vml.es.acm.core.acl.AclResult;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclGroup.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclGroup.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclGroup.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclGroup.java
index 3091d9de..7298bf1c 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclGroup.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclGroup.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
-import com.vml.es.aem.acm.core.acl.AclContext;
-import com.vml.es.aem.acm.core.acl.AclException;
-import com.vml.es.aem.acm.core.acl.AclResult;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+import dev.vml.es.acm.core.acl.AclContext;
+import dev.vml.es.acm.core.acl.AclException;
+import dev.vml.es.acm.core.acl.AclResult;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import java.util.Iterator;
 import javax.jcr.RepositoryException;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclUser.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclUser.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclUser.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclUser.java
index 837dbc2a..7dfaa801 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/AclUser.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclUser.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
-import com.vml.es.aem.acm.core.acl.AclContext;
-import com.vml.es.aem.acm.core.acl.AclResult;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+import dev.vml.es.acm.core.acl.AclContext;
+import dev.vml.es.acm.core.acl.AclResult;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import org.apache.jackrabbit.api.security.user.User;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/ClearOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/ClearOptions.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/ClearOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/ClearOptions.java
index 85d73a13..8ff64902 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/ClearOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/ClearOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class ClearOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/GroupOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/GroupOptions.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/GroupOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/GroupOptions.java
index 5d444708..761d3713 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/GroupOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/GroupOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class GroupOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/MemberOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/MemberOptions.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/MemberOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/MemberOptions.java
index f12d75bf..bde3bfc6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/MemberOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/MemberOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class MemberOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PasswordOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PasswordOptions.java
similarity index 81%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PasswordOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PasswordOptions.java
index 4b2f805a..1e79c703 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PasswordOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PasswordOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class PasswordOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PermissionsOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PermissionsOptions.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PermissionsOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PermissionsOptions.java
index 8587bb04..5c6ff2c6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/PermissionsOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/PermissionsOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
-import com.vml.es.aem.acm.core.acl.utils.PrivilegeGroup;
+import dev.vml.es.acm.core.acl.utils.PrivilegeGroup;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/RemovePropertyOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/RemovePropertyOptions.java
similarity index 81%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/RemovePropertyOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/RemovePropertyOptions.java
index 82205e96..d974b7ad 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/RemovePropertyOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/RemovePropertyOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class RemovePropertyOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/SetPropertyOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/SetPropertyOptions.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/SetPropertyOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/authorizable/SetPropertyOptions.java
index be9a2ba0..14a14410 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/authorizable/SetPropertyOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/authorizable/SetPropertyOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.authorizable;
+package dev.vml.es.acm.core.acl.authorizable;
 
 public class SetPropertyOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/AuthorizableOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/AuthorizableOptions.java
similarity index 80%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/AuthorizableOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/AuthorizableOptions.java
index 8a6340c8..6e67893f 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/AuthorizableOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/AuthorizableOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
 public class AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/ExistsOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/ExistsOptions.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/ExistsOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/ExistsOptions.java
index d8a30da3..1894497d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/ExistsOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/ExistsOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
 public class ExistsOptions extends AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/MemberOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/MemberOptions.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/MemberOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/MemberOptions.java
index 60ba2a99..53e7f87d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/MemberOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/MemberOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
 public class MemberOptions extends AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PasswordOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/PasswordOptions.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/PasswordOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/PasswordOptions.java
index 8a939b7e..a3476a1a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PasswordOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/PasswordOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
 public class PasswordOptions extends AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PermissionsOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/PermissionsOptions.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/PermissionsOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/PermissionsOptions.java
index ad26105d..c8022ae9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PermissionsOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/PermissionsOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
-import com.vml.es.aem.acm.core.acl.utils.PrivilegeGroup;
+import dev.vml.es.acm.core.acl.utils.PrivilegeGroup;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PropertyOptions.java b/core/src/main/java/dev/vml/es/acm/core/acl/check/PropertyOptions.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/check/PropertyOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/check/PropertyOptions.java
index 3f35293a..6d3f8ecf 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/check/PropertyOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/check/PropertyOptions.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.check;
+package dev.vml.es.acm.core.acl.check;
 
 public class PropertyOptions extends AuthorizableOptions {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/AuthorizableManager.java b/core/src/main/java/dev/vml/es/acm/core/acl/utils/AuthorizableManager.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/utils/AuthorizableManager.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/utils/AuthorizableManager.java
index a9d66b0f..ce64364d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/AuthorizableManager.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/utils/AuthorizableManager.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl.utils;
+package dev.vml.es.acm.core.acl.utils;
 
-import com.vml.es.aem.acm.core.acl.AclException;
+import dev.vml.es.acm.core.acl.AclException;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/JcrAclUtils.java b/core/src/main/java/dev/vml/es/acm/core/acl/utils/JcrAclUtils.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/utils/JcrAclUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/utils/JcrAclUtils.java
index 580b84a2..8c666dab 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/JcrAclUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/utils/JcrAclUtils.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl.utils;
+package dev.vml.es.acm.core.acl.utils;
 
-import com.vml.es.aem.acm.core.acl.AclException;
+import dev.vml.es.acm.core.acl.AclException;
 import javax.jcr.RepositoryException;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.AccessControlPolicy;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PasswordUtils.java b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PasswordUtils.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PasswordUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/utils/PasswordUtils.java
index 2bf95729..94137fb3 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PasswordUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PasswordUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.utils;
+package dev.vml.es.acm.core.acl.utils;
 
 import java.security.SecureRandom;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PermissionsManager.java b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PermissionsManager.java
similarity index 99%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PermissionsManager.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/utils/PermissionsManager.java
index 5154aac9..d846a128 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PermissionsManager.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PermissionsManager.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.acl.utils;
+package dev.vml.es.acm.core.acl.utils;
 
-import com.vml.es.aem.acm.core.acl.AclException;
+import dev.vml.es.acm.core.acl.AclException;
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PrivilegeGroup.java b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PrivilegeGroup.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PrivilegeGroup.java
rename to core/src/main/java/dev/vml/es/acm/core/acl/utils/PrivilegeGroup.java
index 46b6c202..957aebe4 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/acl/utils/PrivilegeGroup.java
+++ b/core/src/main/java/dev/vml/es/acm/core/acl/utils/PrivilegeGroup.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl.utils;
+package dev.vml.es.acm.core.acl.utils;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/Assistance.java b/core/src/main/java/dev/vml/es/acm/core/assist/Assistance.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/Assistance.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/Assistance.java
index 538fdd82..83eea936 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/Assistance.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/Assistance.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/Assistancer.java b/core/src/main/java/dev/vml/es/acm/core/assist/Assistancer.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/Assistancer.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/Assistancer.java
index 8576a13e..4e8a7c2e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/Assistancer.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/Assistancer.java
@@ -1,12 +1,12 @@
-package com.vml.es.aem.acm.core.assist;
-
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.assist.resource.ResourceScanner;
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.osgi.ClassInfo;
-import com.vml.es.aem.acm.core.osgi.OsgiScanner;
-import com.vml.es.aem.acm.core.snippet.SnippetRepository;
-import com.vml.es.aem.acm.core.util.SearchUtils;
+package dev.vml.es.acm.core.assist;
+
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.assist.resource.ResourceScanner;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.osgi.ClassInfo;
+import dev.vml.es.acm.core.osgi.OsgiScanner;
+import dev.vml.es.acm.core.snippet.SnippetRepository;
+import dev.vml.es.acm.core.util.SearchUtils;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/ClassSuggestion.java b/core/src/main/java/dev/vml/es/acm/core/assist/ClassSuggestion.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/ClassSuggestion.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/ClassSuggestion.java
index 8ee8ba80..353aa382 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/ClassSuggestion.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/ClassSuggestion.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
-import com.vml.es.aem.acm.core.code.CodeRepository;
-import com.vml.es.aem.acm.core.osgi.ClassInfo;
+import dev.vml.es.acm.core.code.CodeRepository;
+import dev.vml.es.acm.core.osgi.ClassInfo;
 import java.util.LinkedList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/JavaClassDictionary.java b/core/src/main/java/dev/vml/es/acm/core/assist/JavaClassDictionary.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/JavaClassDictionary.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/JavaClassDictionary.java
index 6371e0ae..94b5eb2f 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/JavaClassDictionary.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/JavaClassDictionary.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.repo.RepoResource;
-import com.vml.es.aem.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.repo.RepoResource;
+import dev.vml.es.acm.core.util.StreamUtils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/ResourceSuggestion.java b/core/src/main/java/dev/vml/es/acm/core/assist/ResourceSuggestion.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/ResourceSuggestion.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/ResourceSuggestion.java
index 73530a39..202013b6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/ResourceSuggestion.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/ResourceSuggestion.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
 import org.apache.sling.api.resource.Resource;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/SnippetSuggestion.java b/core/src/main/java/dev/vml/es/acm/core/assist/SnippetSuggestion.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/SnippetSuggestion.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/SnippetSuggestion.java
index c655c574..4fdaea07 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/SnippetSuggestion.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/SnippetSuggestion.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
-import com.vml.es.aem.acm.core.snippet.Snippet;
+import dev.vml.es.acm.core.snippet.Snippet;
 import org.apache.commons.lang3.StringUtils;
 
 public class SnippetSuggestion implements Suggestion {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/Suggestion.java b/core/src/main/java/dev/vml/es/acm/core/assist/Suggestion.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/Suggestion.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/Suggestion.java
index 913ef07d..5b09a4d2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/Suggestion.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/Suggestion.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/SuggestionType.java b/core/src/main/java/dev/vml/es/acm/core/assist/SuggestionType.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/SuggestionType.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/SuggestionType.java
index 720a1103..8d79a0b5 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/SuggestionType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/SuggestionType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
 import java.util.Arrays;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/VariableSuggestion.java b/core/src/main/java/dev/vml/es/acm/core/assist/VariableSuggestion.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/VariableSuggestion.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/VariableSuggestion.java
index 72504133..23f14b1b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/VariableSuggestion.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/VariableSuggestion.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.assist;
+package dev.vml.es.acm.core.assist;
 
-import com.vml.es.aem.acm.core.code.CodeRepository;
-import com.vml.es.aem.acm.core.code.Variable;
+import dev.vml.es.acm.core.code.CodeRepository;
+import dev.vml.es.acm.core.code.Variable;
 import java.util.LinkedList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/assist/resource/ResourceScanner.java b/core/src/main/java/dev/vml/es/acm/core/assist/resource/ResourceScanner.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/assist/resource/ResourceScanner.java
rename to core/src/main/java/dev/vml/es/acm/core/assist/resource/ResourceScanner.java
index 3c03415f..094504e3 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/assist/resource/ResourceScanner.java
+++ b/core/src/main/java/dev/vml/es/acm/core/assist/resource/ResourceScanner.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.assist.resource;
+package dev.vml.es.acm.core.assist.resource;
 
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Argument.java b/core/src/main/java/dev/vml/es/acm/core/code/Argument.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Argument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Argument.java
index 599e3beb..0ab2d7a2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Argument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Argument.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 public abstract class Argument<V> {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentType.java b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentType.java
similarity index 80%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentType.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ArgumentType.java
index b45f9f4c..2486ba80 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 public enum ArgumentType {
     BOOL,
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentValues.java b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentValues.java
similarity index 70%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentValues.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ArgumentValues.java
index ecec19b7..f790eeab 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentValues.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentValues.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.HashMap;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Arguments.java b/core/src/main/java/dev/vml/es/acm/core/code/Arguments.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Arguments.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Arguments.java
index e39d36d5..06fb3d67 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Arguments.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Arguments.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vml.es.aem.acm.core.code.arg.*;
-import com.vml.es.aem.acm.core.util.GroovyUtils;
+import dev.vml.es.acm.core.code.arg.*;
+import dev.vml.es.acm.core.util.GroovyUtils;
 import groovy.lang.Closure;
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentsValueMap.java b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentsValueMap.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentsValueMap.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ArgumentsValueMap.java
index 7c1276ae..bcfb681b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentsValueMap.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ArgumentsValueMap.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.util.DateUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Code.java b/core/src/main/java/dev/vml/es/acm/core/code/Code.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Code.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Code.java
index 5a8c4650..b78c4a71 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Code.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Code.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/CodeContext.java b/core/src/main/java/dev/vml/es/acm/core/code/CodeContext.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/CodeContext.java
rename to core/src/main/java/dev/vml/es/acm/core/code/CodeContext.java
index ebe85e48..5a9c60f2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/CodeContext.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/CodeContext.java
@@ -1,14 +1,14 @@
-package com.vml.es.aem.acm.core.code;
-
-import com.vml.es.aem.acm.core.acl.Acl;
-import com.vml.es.aem.acm.core.code.script.ExtensionScript;
-import com.vml.es.aem.acm.core.format.Formatter;
-import com.vml.es.aem.acm.core.mock.MockContext;
-import com.vml.es.aem.acm.core.osgi.OsgiContext;
-import com.vml.es.aem.acm.core.replication.Activator;
-import com.vml.es.aem.acm.core.repo.Repo;
-import com.vml.es.aem.acm.core.script.ScriptRepository;
-import com.vml.es.aem.acm.core.script.ScriptType;
+package dev.vml.es.acm.core.code;
+
+import dev.vml.es.acm.core.acl.Acl;
+import dev.vml.es.acm.core.code.script.ExtensionScript;
+import dev.vml.es.acm.core.format.Formatter;
+import dev.vml.es.acm.core.mock.MockContext;
+import dev.vml.es.acm.core.osgi.OsgiContext;
+import dev.vml.es.acm.core.replication.Activator;
+import dev.vml.es.acm.core.repo.Repo;
+import dev.vml.es.acm.core.script.ScriptRepository;
+import dev.vml.es.acm.core.script.ScriptType;
 import groovy.lang.Binding;
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/CodePrintStream.java b/core/src/main/java/dev/vml/es/acm/core/code/CodePrintStream.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/CodePrintStream.java
rename to core/src/main/java/dev/vml/es/acm/core/code/CodePrintStream.java
index 1db557e2..3263113a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/CodePrintStream.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/CodePrintStream.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
@@ -43,11 +43,11 @@ public void fromLogs() {
     }
 
     public void fromAclLogs() {
-        fromLogger("com.vml.es.aem.acm.core.acl");
+        fromLogger("dev.vml.es.acm.core.acl");
     }
 
     public void fromRepoLogs() {
-        fromLogger("com.vml.es.aem.acm.core.repo");
+        fromLogger("dev.vml.es.acm.core.repo");
     }
 
     public List<String> fromLogger(String loggerName) {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/CodeRepository.java b/core/src/main/java/dev/vml/es/acm/core/code/CodeRepository.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/CodeRepository.java
rename to core/src/main/java/dev/vml/es/acm/core/code/CodeRepository.java
index cc7ddcf1..8012e4cf 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/CodeRepository.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/CodeRepository.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -21,9 +21,9 @@ public class CodeRepository {
         @AttributeDefinition(
                 name = "Class Links",
                 description =
-                        "Mapping of class prefixes to their corresponding documentation URLs in the format 'package=url'.")
+                        "Mapping of class prefixes to their corresponding documentation URLs in the format 'package=url'. Used to generate links to class documentation in code assistance.")
         String[] classLinks() default {
-            "com.vml.es.aem.acm.core=https://github.com/wttech/acm/blob/main/core/src/main/java",
+            "dev.vml.es.acm.core=https://github.com/wttech/acm/blob/main/core/src/main/java",
             "org.apache.sling.api=https://github.com/apache/sling-org-apache-sling-api/tree/master/src/main/java"
         };
     }
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Condition.java b/core/src/main/java/dev/vml/es/acm/core/code/Condition.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Condition.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Condition.java
index 9f4163e2..cd30de74 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Condition.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Condition.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.osgi.InstanceInfo;
-import com.vml.es.aem.acm.core.osgi.InstanceType;
-import com.vml.es.aem.acm.core.script.ScriptScheduler;
-import com.vml.es.aem.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.osgi.InstanceInfo;
+import dev.vml.es.acm.core.osgi.InstanceType;
+import dev.vml.es.acm.core.script.ScriptScheduler;
+import dev.vml.es.acm.core.util.DateUtils;
 import java.time.*;
 import java.util.Date;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Description.java b/core/src/main/java/dev/vml/es/acm/core/code/Description.java
similarity index 92%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Description.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Description.java
index 78fe908e..743bab32 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Description.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Description.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Executable.java b/core/src/main/java/dev/vml/es/acm/core/code/Executable.java
similarity index 69%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Executable.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Executable.java
index 215acb12..3fa87253 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Executable.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Executable.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 import java.io.Serializable;
 
 public interface Executable extends Serializable {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Execution.java b/core/src/main/java/dev/vml/es/acm/core/code/Execution.java
similarity index 92%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Execution.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Execution.java
index ace92c05..933773cc 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Execution.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Execution.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContext.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionContext.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContext.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionContext.java
index a8ba7c34..541feba1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContext.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionContext.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import groovy.lang.Binding;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContextOptions.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionContextOptions.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContextOptions.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionContextOptions.java
index 411f6af3..692d0d63 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionContextOptions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionContextOptions.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionFormat.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionFormat.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionFormat.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionFormat.java
index d9043727..df79ec63 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionFormat.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionFormat.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionHistory.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionHistory.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionHistory.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionHistory.java
index 4212238e..716449c7 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionHistory.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionHistory.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
-import com.vml.es.aem.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.util.StreamUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.*;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionId.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionId.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionId.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionId.java
index e7602f30..7598adcd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionId.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionId.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionJob.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionJob.java
similarity index 92%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionJob.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionJob.java
index 2ee1812b..0c0e75c0 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionJob.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionJob.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 public final class ExecutionJob {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionMode.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionMode.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionMode.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionMode.java
index 927e9355..7cd679c9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionMode.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionMode.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQuery.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQuery.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQuery.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionQuery.java
index 99f6b59d..c96e3241 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQuery.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQuery.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.util.DateUtils;
-import com.vml.es.aem.acm.core.util.Range;
-import com.vml.es.aem.acm.core.util.ServletUtils;
+import dev.vml.es.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.util.Range;
+import dev.vml.es.acm.core.util.ServletUtils;
 import java.util.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQueue.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQueue.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
index 9dfb428b..0fc72ffe 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionQueue.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.*;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutorService;
@@ -29,7 +29,7 @@
         property = {JobExecutor.PROPERTY_TOPICS + "=" + ExecutionQueue.TOPIC})
 public class ExecutionQueue implements JobExecutor {
 
-    public static final String TOPIC = "com/vml/es/aem/acm/ExecutionQueue";
+    public static final String TOPIC = "com/vml/es/acm/ExecutionQueue";
 
     private static final Logger LOG = LoggerFactory.getLogger(ExecutionQueue.class);
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionResolver.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionResolver.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionResolver.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionResolver.java
index b96efd9b..e1753bd6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionResolver.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionResolver.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionStatus.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionStatus.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionStatus.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionStatus.java
index d347c1e1..5bb5d645 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionStatus.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionStatus.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionSummary.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionSummary.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionSummary.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ExecutionSummary.java
index f985b52e..ada6c86e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ExecutionSummary.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionSummary.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Executor.java b/core/src/main/java/dev/vml/es/acm/core/code/Executor.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Executor.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Executor.java
index 8003a888..af48e237 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Executor.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Executor.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.code.script.ContentScript;
-import com.vml.es.aem.acm.core.osgi.OsgiContext;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.code.script.ContentScript;
+import dev.vml.es.acm.core.osgi.OsgiContext;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -19,7 +19,7 @@
 @Designate(ocd = Executor.Config.class)
 public class Executor {
 
-    @ObjectClassDefinition(name = "AEM Content Manager - Executor")
+    @ObjectClassDefinition(name = "AEM Content Manager - Code Executor")
     public @interface Config {
 
         @AttributeDefinition(name = "Keep history", description = "Save executions in history.")
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecution.java b/core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecution.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecution.java
rename to core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecution.java
index 7f5c24a4..2debe491 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecution.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecution.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.DateUtils;
-import com.vml.es.aem.acm.core.util.JsonUtils;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.io.InputStream;
 import java.util.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecutionSummary.java b/core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecutionSummary.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecutionSummary.java
rename to core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecutionSummary.java
index d0ff6a31..eaf55190 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/HistoricalExecutionSummary.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/HistoricalExecutionSummary.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.DateUtils;
 import java.util.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ImmediateExecution.java b/core/src/main/java/dev/vml/es/acm/core/code/ImmediateExecution.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/ImmediateExecution.java
rename to core/src/main/java/dev/vml/es/acm/core/code/ImmediateExecution.java
index 4c22309f..93c68c74 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/ImmediateExecution.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ImmediateExecution.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ExceptionUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ExceptionUtils;
 import java.io.InputStream;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Output.java b/core/src/main/java/dev/vml/es/acm/core/code/Output.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Output.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Output.java
index e72c638b..c90c5b43 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Output.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Output.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/OutputFile.java b/core/src/main/java/dev/vml/es/acm/core/code/OutputFile.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/OutputFile.java
rename to core/src/main/java/dev/vml/es/acm/core/code/OutputFile.java
index 25167347..9889b36e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/OutputFile.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/OutputFile.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/OutputString.java b/core/src/main/java/dev/vml/es/acm/core/code/OutputString.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/OutputString.java
rename to core/src/main/java/dev/vml/es/acm/core/code/OutputString.java
index cd46e7e4..5010bd96 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/OutputString.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/OutputString.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecution.java b/core/src/main/java/dev/vml/es/acm/core/code/QueuedExecution.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecution.java
rename to core/src/main/java/dev/vml/es/acm/core/code/QueuedExecution.java
index a467e333..9d70a233 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecution.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/QueuedExecution.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vml.es.aem.acm.core.util.DateUtils;
-import com.vml.es.aem.acm.core.util.NumberUtils;
+import dev.vml.es.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.util.NumberUtils;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecutionSummary.java b/core/src/main/java/dev/vml/es/acm/core/code/QueuedExecutionSummary.java
similarity index 92%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecutionSummary.java
rename to core/src/main/java/dev/vml/es/acm/core/code/QueuedExecutionSummary.java
index a3e44f13..878c0e16 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedExecutionSummary.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/QueuedExecutionSummary.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vml.es.aem.acm.core.util.DateUtils;
-import com.vml.es.aem.acm.core.util.NumberUtils;
+import dev.vml.es.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.util.NumberUtils;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedMessage.java b/core/src/main/java/dev/vml/es/acm/core/code/QueuedMessage.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/QueuedMessage.java
rename to core/src/main/java/dev/vml/es/acm/core/code/QueuedMessage.java
index 086b0ebf..5134e50d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/QueuedMessage.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/QueuedMessage.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Variable.java b/core/src/main/java/dev/vml/es/acm/core/code/Variable.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/Variable.java
rename to core/src/main/java/dev/vml/es/acm/core/code/Variable.java
index 7800c129..7900906f 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/Variable.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Variable.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code;
+package dev.vml.es.acm.core.code;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/BoolArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/BoolArgument.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/BoolArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/BoolArgument.java
index 7a3d5fa8..b0acc968 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/BoolArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/BoolArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 import java.util.Arrays;
 
 public class BoolArgument extends Argument<Boolean> {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/ColorArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/ColorArgument.java
similarity index 90%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/ColorArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/ColorArgument.java
index 83d15eac..953a5ad0 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/ColorArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/ColorArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 import java.util.Arrays;
 
 public class ColorArgument extends Argument<String> {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DateTimeArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/DateTimeArgument.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/DateTimeArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/DateTimeArgument.java
index decb2857..8b75c4d7 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DateTimeArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/DateTimeArgument.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
-import com.vml.es.aem.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.util.DateUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Arrays;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalArgument.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalArgument.java
index 2ed751c3..abbf272d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 import java.math.BigDecimal;
 import java.util.Arrays;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalRangeArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalRangeArgument.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalRangeArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalRangeArgument.java
index b8b27a77..98b7cf30 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalRangeArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/DecimalRangeArgument.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
-import com.vml.es.aem.acm.core.util.Range;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.util.Range;
 import java.math.BigDecimal;
 import java.util.List;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerArgument.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerArgument.java
index 96f52556..2d3bbe64 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 import java.util.Arrays;
 
 public class IntegerArgument extends Argument<Integer> {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerRangeArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerRangeArgument.java
similarity index 84%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerRangeArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerRangeArgument.java
index 2d79e370..d53453cc 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerRangeArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/IntegerRangeArgument.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
-import com.vml.es.aem.acm.core.util.Range;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.util.Range;
 import java.util.List;
 
 public class IntegerRangeArgument extends Argument<Range<Integer>> {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/MultiSelectArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/MultiSelectArgument.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/MultiSelectArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/MultiSelectArgument.java
index 7f493193..fb56c8a1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/MultiSelectArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/MultiSelectArgument.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
-import com.vml.es.aem.acm.core.util.ObjectUtils;
-import com.vml.es.aem.acm.core.util.StringUtil;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.util.ObjectUtils;
+import dev.vml.es.acm.core.util.StringUtil;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/SelectArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/SelectArgument.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/SelectArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/SelectArgument.java
index 4003d9d8..24610757 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/SelectArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/SelectArgument.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
-import com.vml.es.aem.acm.core.util.ObjectUtils;
-import com.vml.es.aem.acm.core.util.StringUtil;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.util.ObjectUtils;
+import dev.vml.es.acm.core.util.StringUtil;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/StringArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/StringArgument.java
similarity index 51%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/StringArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/StringArgument.java
index ba886982..7c17eb14 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/StringArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/StringArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 
 public class StringArgument extends Argument<String> {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/TextArgument.java b/core/src/main/java/dev/vml/es/acm/core/code/arg/TextArgument.java
similarity index 70%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/arg/TextArgument.java
rename to core/src/main/java/dev/vml/es/acm/core/code/arg/TextArgument.java
index 122458e0..c1b243bd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/TextArgument.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/arg/TextArgument.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.code.arg;
+package dev.vml.es.acm.core.code.arg;
 
-import com.vml.es.aem.acm.core.code.Argument;
-import com.vml.es.aem.acm.core.code.ArgumentType;
+import dev.vml.es.acm.core.code.Argument;
+import dev.vml.es.acm.core.code.ArgumentType;
 
 public class TextArgument extends Argument<String> {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScript.java b/core/src/main/java/dev/vml/es/acm/core/code/script/ContentScript.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScript.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/ContentScript.java
index 8c872492..36356013 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScript.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/ContentScript.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
-import com.vml.es.aem.acm.core.code.*;
+import dev.vml.es.acm.core.code.*;
 import groovy.lang.GroovyShell;
 import groovy.lang.MissingMethodException;
 import groovy.lang.Script;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScriptSyntax.java b/core/src/main/java/dev/vml/es/acm/core/code/script/ContentScriptSyntax.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScriptSyntax.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/ContentScriptSyntax.java
index 4dd8c0fe..1cf8804b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ContentScriptSyntax.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/ContentScriptSyntax.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
-import static com.vml.es.aem.acm.core.code.script.ScriptUtils.*;
+import static dev.vml.es.acm.core.code.script.ScriptUtils.*;
 
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScript.java b/core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScript.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScript.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScript.java
index 850c2403..9d8297c9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScript.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScript.java
@@ -1,11 +1,11 @@
-package com.vml.es.aem.acm.core.code.script;
-
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.code.CodeContext;
-import com.vml.es.aem.acm.core.code.Executable;
-import com.vml.es.aem.acm.core.code.Execution;
-import com.vml.es.aem.acm.core.code.ExecutionContext;
-import com.vml.es.aem.acm.core.mock.MockContext;
+package dev.vml.es.acm.core.code.script;
+
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.code.CodeContext;
+import dev.vml.es.acm.core.code.Executable;
+import dev.vml.es.acm.core.code.Execution;
+import dev.vml.es.acm.core.code.ExecutionContext;
+import dev.vml.es.acm.core.mock.MockContext;
 import groovy.lang.MissingMethodException;
 import groovy.lang.Script;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScriptSyntax.java b/core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScriptSyntax.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScriptSyntax.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScriptSyntax.java
index eb57495f..d11b5306 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ExtensionScriptSyntax.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/ExtensionScriptSyntax.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
-import static com.vml.es.aem.acm.core.code.script.ScriptUtils.*;
+import static dev.vml.es.acm.core.code.script.ScriptUtils.*;
 
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScript.java b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScript.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScript.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/MockScript.java
index ea38ba38..ac300454 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScript.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScript.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
-import com.vml.es.aem.acm.core.mock.MockContext;
-import com.vml.es.aem.acm.core.mock.MockException;
-import com.vml.es.aem.acm.core.mock.MockRequestException;
-import com.vml.es.aem.acm.core.mock.MockResponseException;
+import dev.vml.es.acm.core.mock.MockContext;
+import dev.vml.es.acm.core.mock.MockException;
+import dev.vml.es.acm.core.mock.MockRequestException;
+import dev.vml.es.acm.core.mock.MockResponseException;
 import groovy.lang.GroovyShell;
 import groovy.lang.Script;
 import javax.servlet.http.HttpServletRequest;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptSyntax.java b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptSyntax.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptSyntax.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptSyntax.java
index ed6902e6..8bc79b45 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptSyntax.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptSyntax.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
-import static com.vml.es.aem.acm.core.code.script.ScriptUtils.*;
+import static dev.vml.es.acm.core.code.script.ScriptUtils.*;
 
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptType.java b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptType.java
similarity index 59%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptType.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptType.java
index 94cd39b5..2802af1b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/MockScriptType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/MockScriptType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
 public enum MockScriptType {
     REGULAR,
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ScriptUtils.java b/core/src/main/java/dev/vml/es/acm/core/code/script/ScriptUtils.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/code/script/ScriptUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/code/script/ScriptUtils.java
index 8f6a8f45..99c09f36 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/code/script/ScriptUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/script/ScriptUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.code.script;
+package dev.vml.es.acm.core.code.script;
 
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/Base64Formatter.java b/core/src/main/java/dev/vml/es/acm/core/format/Base64Formatter.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/Base64Formatter.java
rename to core/src/main/java/dev/vml/es/acm/core/format/Base64Formatter.java
index 9e7fb69a..9362f823 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/Base64Formatter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/Base64Formatter.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/FormatException.java b/core/src/main/java/dev/vml/es/acm/core/format/FormatException.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/FormatException.java
rename to core/src/main/java/dev/vml/es/acm/core/format/FormatException.java
index b3e6ef59..872c9636 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/FormatException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/FormatException.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 
 public class FormatException extends AcmException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/Formatter.java b/core/src/main/java/dev/vml/es/acm/core/format/Formatter.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/Formatter.java
rename to core/src/main/java/dev/vml/es/acm/core/format/Formatter.java
index 963250ec..5aaa2116 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/Formatter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/Formatter.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
 public class Formatter {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/JsonFormatter.java b/core/src/main/java/dev/vml/es/acm/core/format/JsonFormatter.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/JsonFormatter.java
rename to core/src/main/java/dev/vml/es/acm/core/format/JsonFormatter.java
index fdc057e1..41df2311 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/JsonFormatter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/JsonFormatter.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/TemplateFormatter.java b/core/src/main/java/dev/vml/es/acm/core/format/TemplateFormatter.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/TemplateFormatter.java
rename to core/src/main/java/dev/vml/es/acm/core/format/TemplateFormatter.java
index 0ef6e635..999ddaca 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/TemplateFormatter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/TemplateFormatter.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
 import groovy.text.GStringTemplateEngine;
 import java.io.*;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/format/YamlFormatter.java b/core/src/main/java/dev/vml/es/acm/core/format/YamlFormatter.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/format/YamlFormatter.java
rename to core/src/main/java/dev/vml/es/acm/core/format/YamlFormatter.java
index 12dba03d..23a84962 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/format/YamlFormatter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/format/YamlFormatter.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.format;
+package dev.vml.es.acm.core.format;
 
-import com.vml.es.aem.acm.core.util.YamlUtils;
+import dev.vml.es.acm.core.util.YamlUtils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/gui/Spa.java b/core/src/main/java/dev/vml/es/acm/core/gui/Spa.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/gui/Spa.java
rename to core/src/main/java/dev/vml/es/acm/core/gui/Spa.java
index 75dfb1a7..ee348061 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/gui/Spa.java
+++ b/core/src/main/java/dev/vml/es/acm/core/gui/Spa.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.gui;
+package dev.vml.es.acm.core.gui;
 
 import java.util.Optional;
 import java.util.regex.Matcher;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/gui/SpaSettings.java b/core/src/main/java/dev/vml/es/acm/core/gui/SpaSettings.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/gui/SpaSettings.java
rename to core/src/main/java/dev/vml/es/acm/core/gui/SpaSettings.java
index 015b9023..10f9cb1b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/gui/SpaSettings.java
+++ b/core/src/main/java/dev/vml/es/acm/core/gui/SpaSettings.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.gui;
+package dev.vml.es.acm.core.gui;
 
 import java.io.Serializable;
 import org.osgi.service.component.annotations.Activate;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthChecker.java b/core/src/main/java/dev/vml/es/acm/core/instance/HealthChecker.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/HealthChecker.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/HealthChecker.java
index 5d690ae4..7c77706a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthChecker.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/HealthChecker.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
-import com.vml.es.aem.acm.core.osgi.*;
-import com.vml.es.aem.acm.core.repo.Repo;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.osgi.*;
+import dev.vml.es.acm.core.repo.Repo;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssue.java b/core/src/main/java/dev/vml/es/acm/core/instance/HealthIssue.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssue.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/HealthIssue.java
index f9032b25..fdfcedae 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssue.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/HealthIssue.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
 import java.io.Serializable;
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssueSeverity.java b/core/src/main/java/dev/vml/es/acm/core/instance/HealthIssueSeverity.java
similarity index 63%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssueSeverity.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/HealthIssueSeverity.java
index 35a4b7b6..6a6db625 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthIssueSeverity.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/HealthIssueSeverity.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
 public enum HealthIssueSeverity {
     CRITICAL,
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthStatus.java b/core/src/main/java/dev/vml/es/acm/core/instance/HealthStatus.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/HealthStatus.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/HealthStatus.java
index b613c383..505daa60 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/HealthStatus.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/HealthStatus.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
 import java.io.Serializable;
 import java.util.LinkedList;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/InstanceSettings.java b/core/src/main/java/dev/vml/es/acm/core/instance/InstanceSettings.java
similarity index 71%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/InstanceSettings.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/InstanceSettings.java
index 76d3c623..3733937b 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/InstanceSettings.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/InstanceSettings.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
-import com.vml.es.aem.acm.core.osgi.InstanceInfo;
-import com.vml.es.aem.acm.core.osgi.InstanceRole;
-import com.vml.es.aem.acm.core.osgi.InstanceType;
-import com.vml.es.aem.acm.core.util.DateUtils;
+import dev.vml.es.acm.core.osgi.InstanceInfo;
+import dev.vml.es.acm.core.osgi.InstanceRole;
+import dev.vml.es.acm.core.osgi.InstanceType;
+import dev.vml.es.acm.core.util.DateUtils;
 import java.io.Serializable;
 
 public class InstanceSettings implements Serializable {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstaller.java b/core/src/main/java/dev/vml/es/acm/core/instance/SlingInstaller.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstaller.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/SlingInstaller.java
index fade31ab..02d43097 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstaller.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/SlingInstaller.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ObjectUtils;
-import com.vml.es.aem.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ObjectUtils;
+import dev.vml.es.acm.core.util.StreamUtils;
 import java.util.Optional;
 import java.util.Set;
 import javax.management.MBeanServer;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstallerState.java b/core/src/main/java/dev/vml/es/acm/core/instance/SlingInstallerState.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstallerState.java
rename to core/src/main/java/dev/vml/es/acm/core/instance/SlingInstallerState.java
index ff954f5c..b35c4e51 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/instance/SlingInstallerState.java
+++ b/core/src/main/java/dev/vml/es/acm/core/instance/SlingInstallerState.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.instance;
+package dev.vml.es.acm.core.instance;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/Mock.java b/core/src/main/java/dev/vml/es/acm/core/mock/Mock.java
similarity index 76%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/Mock.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/Mock.java
index 78980e16..d30c6b9d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/Mock.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/Mock.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.repo.RepoResource;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.repo.RepoResource;
 import org.apache.sling.api.resource.Resource;
 
 public class Mock {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockContext.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockContext.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockContext.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockContext.java
index 29cced9c..6f5c4626 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockContext.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockContext.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.repo.RepoResource;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.repo.RepoResource;
 import groovy.lang.Binding;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockException.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockException.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockException.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockException.java
index 83022d0b..1d8152e0 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockException.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 
 public class MockException extends AcmException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockHttpFilter.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockHttpFilter.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockHttpFilter.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockHttpFilter.java
index a25dd52a..4707f7a3 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockHttpFilter.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockHttpFilter.java
@@ -1,10 +1,10 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
-import com.vml.es.aem.acm.core.code.CodeContext;
-import com.vml.es.aem.acm.core.code.script.MockScript;
-import com.vml.es.aem.acm.core.code.script.MockScriptType;
-import com.vml.es.aem.acm.core.osgi.OsgiContext;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.code.CodeContext;
+import dev.vml.es.acm.core.code.script.MockScript;
+import dev.vml.es.acm.core.code.script.MockScriptType;
+import dev.vml.es.acm.core.osgi.OsgiContext;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.io.IOException;
 import java.util.Iterator;
 import javax.servlet.*;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockRepository.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockRepository.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockRepository.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockRepository.java
index 4b4d3b38..2921b874 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockRepository.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockRepository.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.script.ScriptType;
-import com.vml.es.aem.acm.core.util.ResourceSpliterator;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.script.ScriptType;
+import dev.vml.es.acm.core.util.ResourceSpliterator;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockRequestException.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockRequestException.java
similarity index 80%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockRequestException.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockRequestException.java
index 66cf842d..5640e403 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockRequestException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockRequestException.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
 public class MockRequestException extends MockException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockResponseException.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockResponseException.java
similarity index 86%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockResponseException.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockResponseException.java
index c223b923..25ff2075 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockResponseException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockResponseException.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
 public class MockResponseException extends MockException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockStatus.java b/core/src/main/java/dev/vml/es/acm/core/mock/MockStatus.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/mock/MockStatus.java
rename to core/src/main/java/dev/vml/es/acm/core/mock/MockStatus.java
index 65059020..cadd7aed 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/mock/MockStatus.java
+++ b/core/src/main/java/dev/vml/es/acm/core/mock/MockStatus.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.mock;
+package dev.vml.es.acm.core.mock;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/ClassInfo.java b/core/src/main/java/dev/vml/es/acm/core/osgi/ClassInfo.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/ClassInfo.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/ClassInfo.java
index ab3cab18..80166211 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/ClassInfo.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/ClassInfo.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceInfo.java b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceInfo.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceInfo.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/InstanceInfo.java
index d89f9edd..4d3cfb98 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceInfo.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceInfo.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
-import com.vml.es.aem.acm.core.instance.InstanceSettings;
+import dev.vml.es.acm.core.instance.InstanceSettings;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceRole.java b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceRole.java
similarity index 58%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceRole.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/InstanceRole.java
index afdc9e06..12037bb8 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceRole.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceRole.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 public enum InstanceRole {
     AUTHOR,
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceType.java b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceType.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceType.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/InstanceType.java
index 708f5591..7364a62d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/InstanceType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/InstanceType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiContext.java b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiContext.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiContext.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/OsgiContext.java
index cb098213..924edee4 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiContext.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiContext.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 import com.day.cq.replication.Replicator;
-import com.vml.es.aem.acm.core.code.ExecutionQueue;
+import dev.vml.es.acm.core.code.ExecutionQueue;
 import java.util.Optional;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEvent.java b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEvent.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEvent.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEvent.java
index 9a2d2f7b..bcfac4a0 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEvent.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEvent.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 public class OsgiEvent {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEventCollector.java b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEventCollector.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEventCollector.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEventCollector.java
index ca41b8f6..0de59b01 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiEventCollector.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiEventCollector.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiScanner.java b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiScanner.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiScanner.java
rename to core/src/main/java/dev/vml/es/acm/core/osgi/OsgiScanner.java
index 913e531d..6c5255f2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/osgi/OsgiScanner.java
+++ b/core/src/main/java/dev/vml/es/acm/core/osgi/OsgiScanner.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.osgi;
+package dev.vml.es.acm.core.osgi;
 
-import com.vml.es.aem.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.util.StreamUtils;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Enumeration;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/replication/Activator.java b/core/src/main/java/dev/vml/es/acm/core/replication/Activator.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/replication/Activator.java
rename to core/src/main/java/dev/vml/es/acm/core/replication/Activator.java
index 8f95ec81..0f182687 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/replication/Activator.java
+++ b/core/src/main/java/dev/vml/es/acm/core/replication/Activator.java
@@ -1,10 +1,10 @@
-package com.vml.es.aem.acm.core.replication;
+package dev.vml.es.acm.core.replication;
 
 import com.day.cq.replication.ReplicationActionType;
 import com.day.cq.replication.ReplicationException;
 import com.day.cq.replication.Replicator;
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ResourceSpliterator;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ResourceSpliterator;
 import java.util.Optional;
 import java.util.stream.Stream;
 import javax.jcr.Node;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/repo/Repo.java b/core/src/main/java/dev/vml/es/acm/core/repo/Repo.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/repo/Repo.java
rename to core/src/main/java/dev/vml/es/acm/core/repo/Repo.java
index 1a9766b7..96cc1dd1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/repo/Repo.java
+++ b/core/src/main/java/dev/vml/es/acm/core/repo/Repo.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.repo;
+package dev.vml.es.acm.core.repo;
 
-import com.vml.es.aem.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.util.StreamUtils;
 import java.util.stream.Stream;
 import javax.jcr.Node;
 import javax.jcr.Session;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoException.java b/core/src/main/java/dev/vml/es/acm/core/repo/RepoException.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/repo/RepoException.java
rename to core/src/main/java/dev/vml/es/acm/core/repo/RepoException.java
index 4e6d23db..040b68c6 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/repo/RepoException.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.repo;
+package dev.vml.es.acm.core.repo;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 
 public class RepoException extends AcmException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResource.java b/core/src/main/java/dev/vml/es/acm/core/repo/RepoResource.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResource.java
rename to core/src/main/java/dev/vml/es/acm/core/repo/RepoResource.java
index 37b69de2..6ab9d7f9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResource.java
+++ b/core/src/main/java/dev/vml/es/acm/core/repo/RepoResource.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.repo;
+package dev.vml.es.acm.core.repo;
 
-import com.vml.es.aem.acm.core.util.ResourceSpliterator;
-import com.vml.es.aem.acm.core.util.StreamUtils;
-import com.vml.es.aem.acm.core.util.StringUtil;
+import dev.vml.es.acm.core.util.ResourceSpliterator;
+import dev.vml.es.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.util.StringUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResourceState.java b/core/src/main/java/dev/vml/es/acm/core/repo/RepoResourceState.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResourceState.java
rename to core/src/main/java/dev/vml/es/acm/core/repo/RepoResourceState.java
index c8e7f05c..b17615b4 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/repo/RepoResourceState.java
+++ b/core/src/main/java/dev/vml/es/acm/core/repo/RepoResourceState.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.repo;
+package dev.vml.es.acm.core.repo;
 
-import com.vml.es.aem.acm.core.code.ArgumentsValueMap;
-import com.vml.es.aem.acm.core.util.StringUtil;
+import dev.vml.es.acm.core.code.ArgumentsValueMap;
+import dev.vml.es.acm.core.util.StringUtil;
 import java.io.Serializable;
 import java.util.Map;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/Script.java b/core/src/main/java/dev/vml/es/acm/core/script/Script.java
similarity index 93%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/Script.java
rename to core/src/main/java/dev/vml/es/acm/core/script/Script.java
index 385c5fc4..1599ef4d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/Script.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/Script.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.script;
+package dev.vml.es.acm.core.script;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.code.ArgumentValues;
-import com.vml.es.aem.acm.core.code.Executable;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.code.ArgumentValues;
+import dev.vml.es.acm.core.code.Executable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptException.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptException.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/ScriptException.java
rename to core/src/main/java/dev/vml/es/acm/core/script/ScriptException.java
index d195b6d1..94427d03 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptException.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptException.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.script;
+package dev.vml.es.acm.core.script;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 
 public class ScriptException extends AcmException {
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptRepository.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptRepository.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/ScriptRepository.java
rename to core/src/main/java/dev/vml/es/acm/core/script/ScriptRepository.java
index c09ff142..6309d9c1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptRepository.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptRepository.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.script;
+package dev.vml.es.acm.core.script;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.util.ResourceSpliterator;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.util.ResourceSpliterator;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptScheduler.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
similarity index 88%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/ScriptScheduler.java
rename to core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
index 41dd9471..d5ac41bd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptScheduler.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
@@ -1,14 +1,14 @@
-package com.vml.es.aem.acm.core.script;
-
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.code.ExecutionContextOptions;
-import com.vml.es.aem.acm.core.code.ExecutionMode;
-import com.vml.es.aem.acm.core.code.ExecutionQueue;
-import com.vml.es.aem.acm.core.code.Executor;
-import com.vml.es.aem.acm.core.instance.HealthChecker;
-import com.vml.es.aem.acm.core.instance.HealthStatus;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
-import com.vml.es.aem.acm.core.util.quartz.CronExpression;
+package dev.vml.es.acm.core.script;
+
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.code.ExecutionContextOptions;
+import dev.vml.es.acm.core.code.ExecutionMode;
+import dev.vml.es.acm.core.code.ExecutionQueue;
+import dev.vml.es.acm.core.code.Executor;
+import dev.vml.es.acm.core.instance.HealthChecker;
+import dev.vml.es.acm.core.instance.HealthStatus;
+import dev.vml.es.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.util.quartz.CronExpression;
 import java.text.ParseException;
 import java.util.Date;
 import org.apache.sling.api.resource.ResourceResolver;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptStats.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptStats.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/ScriptStats.java
rename to core/src/main/java/dev/vml/es/acm/core/script/ScriptStats.java
index a08fd37c..ecccef5a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptStats.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptStats.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.script;
+package dev.vml.es.acm.core.script;
 
-import com.vml.es.aem.acm.core.code.*;
+import dev.vml.es.acm.core.code.*;
 import java.io.Serializable;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptType.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptType.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/script/ScriptType.java
rename to core/src/main/java/dev/vml/es/acm/core/script/ScriptType.java
index 7ef1f9c1..5501aa0e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/script/ScriptType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.script;
+package dev.vml.es.acm.core.script;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/AssistCodeServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/AssistCodeServlet.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/AssistCodeServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/AssistCodeServlet.java
index 8ef1e1b7..d5f4d9fd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/AssistCodeServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/AssistCodeServlet.java
@@ -1,12 +1,12 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
-import static com.vml.es.aem.acm.core.util.ServletUtils.stringParam;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletUtils.stringParam;
 
-import com.vml.es.aem.acm.core.assist.Assistance;
-import com.vml.es.aem.acm.core.assist.Assistancer;
-import com.vml.es.aem.acm.core.assist.SuggestionType;
+import dev.vml.es.acm.core.assist.Assistance;
+import dev.vml.es.acm.core.assist.Assistancer;
+import dev.vml.es.acm.core.assist.SuggestionType;
 import java.io.IOException;
 import javax.servlet.Servlet;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeInput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeInput.java
similarity index 74%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeInput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeInput.java
index 413eaae8..b3d363f8 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeInput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeInput.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.code.Code;
+import dev.vml.es.acm.core.code.Code;
 import java.io.Serializable;
 
 public class DescribeCodeInput implements Serializable {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeServlet.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeServlet.java
index 2120f6fe..65f0dfef 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/DescribeCodeServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/DescribeCodeServlet.java
@@ -1,11 +1,11 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJsonBuffered;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJsonBuffered;
 
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import java.util.Optional;
 import javax.servlet.Servlet;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeInput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeInput.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeInput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeInput.java
index 6e250db6..b3c2bd2d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeInput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeInput.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.code.Code;
+import dev.vml.es.acm.core.code.Code;
 import java.io.Serializable;
 import java.util.Map;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeServlet.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeServlet.java
index 1086738c..810d9792 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteCodeServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteCodeServlet.java
@@ -1,11 +1,11 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJsonBuffered;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJsonBuffered;
 
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import javax.servlet.Servlet;
 import org.apache.sling.api.SlingHttpServletRequest;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteScriptServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteScriptServlet.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteScriptServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteScriptServlet.java
index 7547f410..67d33a3e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecuteScriptServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecuteScriptServlet.java
@@ -1,12 +1,12 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
-import static com.vml.es.aem.acm.core.util.ServletUtils.stringParam;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletUtils.stringParam;
 
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.script.Script;
-import com.vml.es.aem.acm.core.script.ScriptRepository;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.script.Script;
+import dev.vml.es.acm.core.script.ScriptRepository;
 import java.io.IOException;
 import javax.servlet.Servlet;
 import org.apache.sling.api.SlingHttpServletRequest;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionOutput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionOutput.java
similarity index 87%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionOutput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionOutput.java
index 3c0ff86c..e4ea675d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionOutput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionOutput.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionServlet.java
similarity index 94%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionServlet.java
index 6df3b588..2e94fb5a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ExecutionServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ExecutionServlet.java
@@ -1,9 +1,9 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.*;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.*;
 
-import com.vml.es.aem.acm.core.code.*;
+import dev.vml.es.acm.core.code.*;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeInput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeInput.java
similarity index 73%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeInput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeInput.java
index 303d61ab..5bdaed6f 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeInput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeInput.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.code.Code;
+import dev.vml.es.acm.core.code.Code;
 import java.io.Serializable;
 
 public class QueueCodeInput implements Serializable {
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
similarity index 95%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
index 1e83188e..6225b3d9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueCodeServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
@@ -1,10 +1,10 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.*;
-import static com.vml.es.aem.acm.core.util.ServletUtils.*;
+import static dev.vml.es.acm.core.util.ServletResult.*;
+import static dev.vml.es.acm.core.util.ServletUtils.*;
 
-import com.vml.es.aem.acm.core.code.*;
-import com.vml.es.aem.acm.core.util.JsonUtils;
+import dev.vml.es.acm.core.code.*;
+import dev.vml.es.acm.core.util.JsonUtils;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueOutput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueOutput.java
similarity index 78%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueOutput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/QueueOutput.java
index 0a015adb..992d7543 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/QueueOutput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueOutput.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.code.Execution;
+import dev.vml.es.acm.core.code.Execution;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptOutput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ScriptOutput.java
similarity index 77%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptOutput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ScriptOutput.java
index 1b59606c..470c43dd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptOutput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ScriptOutput.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.script.Script;
-import com.vml.es.aem.acm.core.script.ScriptStats;
+import dev.vml.es.acm.core.script.Script;
+import dev.vml.es.acm.core.script.ScriptStats;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/ScriptServlet.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/ScriptServlet.java
index e5938833..94f322a0 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/ScriptServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/ScriptServlet.java
@@ -1,16 +1,16 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.error;
-import static com.vml.es.aem.acm.core.util.ServletResult.ok;
-import static com.vml.es.aem.acm.core.util.ServletUtils.*;
+import static dev.vml.es.acm.core.util.ServletResult.error;
+import static dev.vml.es.acm.core.util.ServletResult.ok;
+import static dev.vml.es.acm.core.util.ServletUtils.*;
 
 import com.day.cq.replication.Replicator;
-import com.vml.es.aem.acm.core.gui.SpaSettings;
-import com.vml.es.aem.acm.core.replication.Activator;
-import com.vml.es.aem.acm.core.script.Script;
-import com.vml.es.aem.acm.core.script.ScriptRepository;
-import com.vml.es.aem.acm.core.script.ScriptStats;
-import com.vml.es.aem.acm.core.script.ScriptType;
+import dev.vml.es.acm.core.gui.SpaSettings;
+import dev.vml.es.acm.core.replication.Activator;
+import dev.vml.es.acm.core.script.Script;
+import dev.vml.es.acm.core.script.ScriptRepository;
+import dev.vml.es.acm.core.script.ScriptStats;
+import dev.vml.es.acm.core.script.ScriptType;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetOutput.java b/core/src/main/java/dev/vml/es/acm/core/servlet/SnippetOutput.java
similarity index 76%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetOutput.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/SnippetOutput.java
index a9d3cf87..bd74e322 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetOutput.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/SnippetOutput.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import com.vml.es.aem.acm.core.snippet.Snippet;
+import dev.vml.es.acm.core.snippet.Snippet;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/SnippetServlet.java
similarity index 84%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/SnippetServlet.java
index 54f1e363..7b6db1e5 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/SnippetServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/SnippetServlet.java
@@ -1,12 +1,12 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.error;
-import static com.vml.es.aem.acm.core.util.ServletResult.ok;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
-import static com.vml.es.aem.acm.core.util.ServletUtils.stringsParam;
+import static dev.vml.es.acm.core.util.ServletResult.error;
+import static dev.vml.es.acm.core.util.ServletResult.ok;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletUtils.stringsParam;
 
-import com.vml.es.aem.acm.core.snippet.Snippet;
-import com.vml.es.aem.acm.core.snippet.SnippetRepository;
+import dev.vml.es.acm.core.snippet.Snippet;
+import dev.vml.es.acm.core.snippet.SnippetRepository;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/servlet/StateServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/StateServlet.java
similarity index 76%
rename from core/src/main/java/com/vml/es/aem/acm/core/servlet/StateServlet.java
rename to core/src/main/java/dev/vml/es/acm/core/servlet/StateServlet.java
index 9d12a3ae..4e279599 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/servlet/StateServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/StateServlet.java
@@ -1,18 +1,18 @@
-package com.vml.es.aem.acm.core.servlet;
+package dev.vml.es.acm.core.servlet;
 
-import static com.vml.es.aem.acm.core.util.ServletResult.error;
-import static com.vml.es.aem.acm.core.util.ServletResult.ok;
-import static com.vml.es.aem.acm.core.util.ServletUtils.respondJson;
+import static dev.vml.es.acm.core.util.ServletResult.error;
+import static dev.vml.es.acm.core.util.ServletResult.ok;
+import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
 
-import com.vml.es.aem.acm.core.code.ExecutionQueue;
-import com.vml.es.aem.acm.core.code.ExecutionSummary;
-import com.vml.es.aem.acm.core.gui.SpaSettings;
-import com.vml.es.aem.acm.core.instance.HealthChecker;
-import com.vml.es.aem.acm.core.instance.HealthStatus;
-import com.vml.es.aem.acm.core.mock.MockHttpFilter;
-import com.vml.es.aem.acm.core.mock.MockStatus;
-import com.vml.es.aem.acm.core.osgi.InstanceInfo;
-import com.vml.es.aem.acm.core.state.State;
+import dev.vml.es.acm.core.code.ExecutionQueue;
+import dev.vml.es.acm.core.code.ExecutionSummary;
+import dev.vml.es.acm.core.gui.SpaSettings;
+import dev.vml.es.acm.core.instance.HealthChecker;
+import dev.vml.es.acm.core.instance.HealthStatus;
+import dev.vml.es.acm.core.mock.MockHttpFilter;
+import dev.vml.es.acm.core.mock.MockStatus;
+import dev.vml.es.acm.core.osgi.InstanceInfo;
+import dev.vml.es.acm.core.state.State;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/snippet/Snippet.java b/core/src/main/java/dev/vml/es/acm/core/snippet/Snippet.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/snippet/Snippet.java
rename to core/src/main/java/dev/vml/es/acm/core/snippet/Snippet.java
index 4d9896f5..c2e0c014 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/snippet/Snippet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/snippet/Snippet.java
@@ -1,7 +1,7 @@
-package com.vml.es.aem.acm.core.snippet;
+package dev.vml.es.acm.core.snippet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 import java.io.InputStream;
 import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetDefinition.java b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetDefinition.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetDefinition.java
rename to core/src/main/java/dev/vml/es/acm/core/snippet/SnippetDefinition.java
index 7e366953..0d3d524a 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetDefinition.java
+++ b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetDefinition.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.snippet;
+package dev.vml.es.acm.core.snippet;
 
-import com.vml.es.aem.acm.core.util.YamlUtils;
+import dev.vml.es.acm.core.util.YamlUtils;
 import java.io.InputStream;
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetRepository.java b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetRepository.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetRepository.java
rename to core/src/main/java/dev/vml/es/acm/core/snippet/SnippetRepository.java
index 63be6cf6..6ba762a1 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetRepository.java
+++ b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetRepository.java
@@ -1,8 +1,8 @@
-package com.vml.es.aem.acm.core.snippet;
+package dev.vml.es.acm.core.snippet;
 
-import com.vml.es.aem.acm.core.AcmException;
-import com.vml.es.aem.acm.core.repo.RepoResource;
-import com.vml.es.aem.acm.core.util.ResourceUtils;
+import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.repo.RepoResource;
+import dev.vml.es.acm.core.util.ResourceUtils;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetType.java b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetType.java
similarity index 85%
rename from core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetType.java
rename to core/src/main/java/dev/vml/es/acm/core/snippet/SnippetType.java
index 02426bfb..1c484941 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/snippet/SnippetType.java
+++ b/core/src/main/java/dev/vml/es/acm/core/snippet/SnippetType.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.snippet;
+package dev.vml.es.acm.core.snippet;
 
 public enum SnippetType {
     AVAILABLE(SnippetRepository.ROOT + "/available");
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/state/State.java b/core/src/main/java/dev/vml/es/acm/core/state/State.java
similarity index 80%
rename from core/src/main/java/com/vml/es/aem/acm/core/state/State.java
rename to core/src/main/java/dev/vml/es/acm/core/state/State.java
index 85043ba0..1e03101d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/state/State.java
+++ b/core/src/main/java/dev/vml/es/acm/core/state/State.java
@@ -1,10 +1,10 @@
-package com.vml.es.aem.acm.core.state;
+package dev.vml.es.acm.core.state;
 
-import com.vml.es.aem.acm.core.code.ExecutionSummary;
-import com.vml.es.aem.acm.core.gui.SpaSettings;
-import com.vml.es.aem.acm.core.instance.HealthStatus;
-import com.vml.es.aem.acm.core.instance.InstanceSettings;
-import com.vml.es.aem.acm.core.mock.MockStatus;
+import dev.vml.es.acm.core.code.ExecutionSummary;
+import dev.vml.es.acm.core.gui.SpaSettings;
+import dev.vml.es.acm.core.instance.HealthStatus;
+import dev.vml.es.acm.core.instance.InstanceSettings;
+import dev.vml.es.acm.core.mock.MockStatus;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/DateUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/DateUtils.java
similarity index 99%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/DateUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/DateUtils.java
index 2b700ef4..6e85c46d 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/DateUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/DateUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ExceptionUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/ExceptionUtils.java
similarity index 90%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ExceptionUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ExceptionUtils.java
index 687504f1..e6fff9f9 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ExceptionUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ExceptionUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Optional;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/GroovyUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/GroovyUtils.java
similarity index 89%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/GroovyUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/GroovyUtils.java
index df4f4516..d7d18c99 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/GroovyUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/GroovyUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import groovy.lang.Closure;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/JsonUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/JsonUtils.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/JsonUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/JsonUtils.java
index 0160f209..2c808638 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/JsonUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/JsonUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/NullOutputStream.java b/core/src/main/java/dev/vml/es/acm/core/util/NullOutputStream.java
similarity index 91%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/NullOutputStream.java
rename to core/src/main/java/dev/vml/es/acm/core/util/NullOutputStream.java
index 48fb9ed4..2859749e 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/NullOutputStream.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/NullOutputStream.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/NumberUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/NumberUtils.java
similarity index 90%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/NumberUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/NumberUtils.java
index 7a9ed884..bbcdf835 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/NumberUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/NumberUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Date;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ObjectUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/ObjectUtils.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ObjectUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ObjectUtils.java
index 8e58688e..859f7118 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ObjectUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ObjectUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Collection;
 
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/Range.java b/core/src/main/java/dev/vml/es/acm/core/util/Range.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/Range.java
rename to core/src/main/java/dev/vml/es/acm/core/util/Range.java
index 00ba7015..deb1139c 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/Range.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/Range.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.io.Serializable;
 import org.apache.commons.lang3.StringUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ResourceSpliterator.java b/core/src/main/java/dev/vml/es/acm/core/util/ResourceSpliterator.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ResourceSpliterator.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ResourceSpliterator.java
index e1c0cd82..7bc606cb 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ResourceSpliterator.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ResourceSpliterator.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Spliterator;
 import java.util.Stack;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ResourceUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/ResourceUtils.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ResourceUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ResourceUtils.java
index 6a2a26ff..3f4cdf02 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ResourceUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ResourceUtils.java
@@ -1,6 +1,6 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
-import com.vml.es.aem.acm.core.AcmException;
+import dev.vml.es.acm.core.AcmException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/SearchUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/SearchUtils.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/SearchUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/SearchUtils.java
index 39c4d9bc..96506753 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/SearchUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/SearchUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.List;
 import org.apache.commons.io.FilenameUtils;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ServletResult.java b/core/src/main/java/dev/vml/es/acm/core/util/ServletResult.java
similarity index 97%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ServletResult.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ServletResult.java
index adee1bab..c4bddaa2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ServletResult.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ServletResult.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.io.Serializable;
 import javax.servlet.http.HttpServletResponse;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/ServletUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/ServletUtils.java
similarity index 98%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/ServletUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/ServletUtils.java
index fb846907..eba57bf2 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/ServletUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/ServletUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/StreamUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/StreamUtils.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/StreamUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/StreamUtils.java
index 1288f09d..c316baab 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/StreamUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/StreamUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Enumeration;
 import java.util.Iterator;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/StringUtil.java b/core/src/main/java/dev/vml/es/acm/core/util/StringUtil.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/StringUtil.java
rename to core/src/main/java/dev/vml/es/acm/core/util/StringUtil.java
index 38a4beab..2ac53657 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/StringUtil.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/StringUtil.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/YamlUtils.java b/core/src/main/java/dev/vml/es/acm/core/util/YamlUtils.java
similarity index 96%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/YamlUtils.java
rename to core/src/main/java/dev/vml/es/acm/core/util/YamlUtils.java
index a81b6acc..eff446cd 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/YamlUtils.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/YamlUtils.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.util;
+package dev.vml.es.acm.core.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/quartz/CronExpression.java b/core/src/main/java/dev/vml/es/acm/core/util/quartz/CronExpression.java
similarity index 99%
rename from core/src/main/java/com/vml/es/aem/acm/core/util/quartz/CronExpression.java
rename to core/src/main/java/dev/vml/es/acm/core/util/quartz/CronExpression.java
index df4df6b7..1a7ba363 100644
--- a/core/src/main/java/com/vml/es/aem/acm/core/util/quartz/CronExpression.java
+++ b/core/src/main/java/dev/vml/es/acm/core/util/quartz/CronExpression.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.vml.es.aem.acm.core.util.quartz;
+package dev.vml.es.acm.core.util.quartz;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/core/src/test/java/com/vml/es/aem/acm/core/acl/GroovyClosureTest.java b/core/src/test/java/dev/vml/es/acm/core/acl/GroovyClosureTest.java
similarity index 97%
rename from core/src/test/java/com/vml/es/aem/acm/core/acl/GroovyClosureTest.java
rename to core/src/test/java/dev/vml/es/acm/core/acl/GroovyClosureTest.java
index e7bb3b94..453f8428 100644
--- a/core/src/test/java/com/vml/es/aem/acm/core/acl/GroovyClosureTest.java
+++ b/core/src/test/java/dev/vml/es/acm/core/acl/GroovyClosureTest.java
@@ -1,4 +1,4 @@
-package com.vml.es.aem.acm.core.acl;
+package dev.vml.es.acm.core.acl;
 
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaMethod;
@@ -19,7 +19,7 @@
  * For Java and Groovy interoperability, Groovy closures must be defined before other overloaded Java methods
  * in the class to ensure they are properly callable from Groovy scripts.
  */
-@AnalyzeClasses(packages = "com.vml.es.aem.acm.core")
+@AnalyzeClasses(packages = "dev.vml.es.acm.core")
 public class GroovyClosureTest {
 
     @ArchTest
diff --git a/min/pom.xml b/min/pom.xml
index e13d1c59..63828bb8 100644
--- a/min/pom.xml
+++ b/min/pom.xml
@@ -7,7 +7,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -37,25 +37,25 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <packageType>container</packageType>
                     <!-- skip sub package validation for now as some vendor packages like CIF apps will not pass -->
                     <skipSubPackageValidation>true</skipSubPackageValidation>
                     <embeddeds>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.apps</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.config</artifactId>
                             <type>zip</type>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
                         <embedded>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.core</artifactId>
                             <target>/apps/acm-packages/application/install</target>
                         </embedded>
@@ -149,19 +149,19 @@
     <!-- ====================================================================== -->
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.content</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.config</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
diff --git a/pom.xml b/pom.xml
index a8b67ae1..0fde3d29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.vml.es.aem</groupId>
+    <groupId>dev.vml.es</groupId>
     <artifactId>acm.root</artifactId>
     <packaging>pom</packaging>
     <version>${revision}</version>
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
index 58e7fa07..3c0c7f10 100644
--- a/ui.apps.structure/pom.xml
+++ b/ui.apps.structure/pom.xml
@@ -6,7 +6,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 26d35c4b..c43467e2 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -21,7 +21,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -53,12 +53,12 @@
                         <cloudManagerTarget>none</cloudManagerTarget>
                         <noIntermediateSaves>true</noIntermediateSaves>
                     </properties>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <name>acm.ui.apps</name>
                     <packageType>application</packageType>
                     <repositoryStructurePackages>
                         <repositoryStructurePackage>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.apps.structure</artifactId>
                         </repositoryStructurePackage>
                     </repositoryStructurePackages>
@@ -107,18 +107,18 @@
     <!-- ====================================================================== -->
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps.structure</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.frontend</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
diff --git a/ui.apps/src/main/content/jcr_root/apps/acm/gui/spa/spa.html b/ui.apps/src/main/content/jcr_root/apps/acm/gui/spa/spa.html
index 3e9b2222..0919869d 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acm/gui/spa/spa.html
+++ b/ui.apps/src/main/content/jcr_root/apps/acm/gui/spa/spa.html
@@ -1,4 +1,4 @@
-<sly data-sly-use.spa="com.vml.es.aem.acm.core.gui.Spa"/>
+<sly data-sly-use.spa="dev.vml.es.acm.core.gui.Spa"/>
 
 <div id="root" style="height: 100%"></div>
 <script type="module" crossorigin src="${spa.jsPath}"></script>
diff --git a/ui.config/pom.xml b/ui.config/pom.xml
index b1bee632..d10c002e 100644
--- a/ui.config/pom.xml
+++ b/ui.config/pom.xml
@@ -21,7 +21,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -49,7 +49,7 @@
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <name>acm.ui.config</name>
                     <packageType>container</packageType>
                     <showImportPackageReport>false</showImportPackageReport>
@@ -64,7 +64,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps.structure</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
diff --git a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.author/com.vml.es.aem.acm.core.osgi.InstanceManager.config b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.author/dev.vml.es.acm.core.osgi.InstanceManager.config
similarity index 100%
rename from ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.author/com.vml.es.aem.acm.core.osgi.InstanceManager.config
rename to ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.author/dev.vml.es.acm.core.osgi.InstanceManager.config
diff --git a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.publish/com.vml.es.aem.acm.core.osgi.InstanceManager.config b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.publish/dev.vml.es.acm.core.osgi.InstanceManager.config
similarity index 100%
rename from ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.publish/com.vml.es.aem.acm.core.osgi.InstanceManager.config
rename to ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config.publish/dev.vml.es.acm.core.osgi.InstanceManager.config
diff --git a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
index 3ebbcc96..0661f71a 100644
--- a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
+++ b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
@@ -1,5 +1,5 @@
 queue.name="AEM\ Content\ Manager\ Execution\ Queue"
-queue.topics=["com/vml/es/aem/acm/ExecutionQueue"]
+queue.topics=["com/vml/es/acm/ExecutionQueue"]
 queue.priority="NORM"
 queue.type="UNORDERED"
 queue.maxparallel="15.0"
diff --git a/ui.content.example/pom.xml b/ui.content.example/pom.xml
index b8a62a8c..2d85ab4e 100644
--- a/ui.content.example/pom.xml
+++ b/ui.content.example/pom.xml
@@ -21,7 +21,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -53,7 +53,7 @@
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <name>acm.ui.content.example</name>
                     <packageType>content</packageType>
                     <!--<accessControlHandling>merge</accessControlHandling>-->
@@ -66,7 +66,7 @@
                     </validatorsSettings>
                     <dependencies>
                         <dependency>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.apps</artifactId>
                             <version>${project.version}</version>
                         </dependency>
@@ -90,12 +90,12 @@
     <!-- ====================================================================== -->
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/extension/example/ACME-300_extension.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/extension/example/ACME-300_extension.groovy
index ee6f057e..268c61f6 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/extension/example/ACME-300_extension.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/extension/example/ACME-300_extension.groovy
@@ -1,5 +1,5 @@
-import com.vml.es.aem.acm.core.code.ExecutionContext
-import com.vml.es.aem.acm.core.code.Execution
+import dev.vml.es.acm.core.code.ExecutionContext
+import dev.vml.es.acm.core.code.Execution
 
 void prepareRun(ExecutionContext context) {
     context.variable("acme", new AcmeFacade())
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy
index b3705467..5957ce00 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy
@@ -8,7 +8,7 @@
  *
  * @author Krystian Panek <krystian.panek@vml.com>
  */
-import com.vml.es.aem.acm.core.assist.JavaClassDictionary
+import dev.vml.es.acm.core.assist.JavaClassDictionary
 
 import java.lang.module.ModuleFinder
 import java.lang.module.ModuleReference
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy
index 75b30d5b..44706c48 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy
@@ -8,7 +8,7 @@
  *
  * @author Krystian Panek <krystian.panek@vml.com>
  */
-import com.vml.es.aem.acm.core.assist.JavaClassDictionary
+import dev.vml.es.acm.core.assist.JavaClassDictionary
 import java.util.function.Consumer
 import java.util.jar.JarFile
 import java.io.File
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
index f75b7666..b51d13d3 100644
--- a/ui.content/pom.xml
+++ b/ui.content/pom.xml
@@ -21,7 +21,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -50,7 +50,7 @@
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
-                    <group>com.vml.es.aem.acm</group>
+                    <group>dev.vml.es.acm</group>
                     <name>acm.ui.content</name>
                     <packageType>content</packageType>
                     <!--<accessControlHandling>merge</accessControlHandling>-->
@@ -63,7 +63,7 @@
                     </validatorsSettings>
                     <dependencies>
                         <dependency>
-                            <groupId>com.vml.es.aem</groupId>
+                            <groupId>dev.vml.es</groupId>
                             <artifactId>acm.ui.apps</artifactId>
                             <version>${project.version}</version>
                         </dependency>
@@ -87,12 +87,12 @@
     <!-- ====================================================================== -->
     <dependencies>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.vml.es.aem</groupId>
+            <groupId>dev.vml.es</groupId>
             <artifactId>acm.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 2b28a8a1..ae3afc20 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -6,7 +6,7 @@
     <!-- P A R E N T  P R O J E C T  D E S C R I P T I O N                      -->
     <!-- ====================================================================== -->
     <parent>
-        <groupId>com.vml.es.aem</groupId>
+        <groupId>dev.vml.es</groupId>
         <artifactId>acm.root</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/ui.frontend/src/components/CodeExecuteButton.tsx b/ui.frontend/src/components/CodeExecuteButton.tsx
index 8921c036..78f3e223 100644
--- a/ui.frontend/src/components/CodeExecuteButton.tsx
+++ b/ui.frontend/src/components/CodeExecuteButton.tsx
@@ -1,6 +1,7 @@
-import { Button, ButtonGroup, Content, Dialog, DialogContainer, Divider, Form, Heading, Item, TabList, TabPanels, Tabs, Text, View } from '@adobe/react-spectrum';
+import { Button, ButtonGroup, Content, Dialog, DialogContainer, Divider, Footer, Form, Heading, Item, TabList, TabPanels, Tabs, Text, View } from '@adobe/react-spectrum';
 import Checkmark from '@spectrum-icons/workflow/Checkmark';
 import Close from '@spectrum-icons/workflow/Close';
+import Copy from '@spectrum-icons/workflow/Copy';
 import Gears from '@spectrum-icons/workflow/Gears';
 import React, { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
@@ -10,6 +11,7 @@ import { Objects } from '../utils/objects';
 import { ToastTimeoutLong } from '../utils/spectrum.ts';
 import { Strings } from '../utils/strings';
 import CodeArgumentInput from './CodeArgumentInput';
+import PathPicker from './PathPicker.tsx';
 
 interface CodeExecuteButtonProps {
   code: string;
@@ -23,7 +25,7 @@ const CodeExecuteButton: React.FC<CodeExecuteButtonProps> = ({ code, onDescribeF
   const [description, setDescription] = useState<Description | null>(null);
   const [dialogOpen, setDialogOpen] = useState(false);
   const [described, setDescribed] = useState(false);
-
+  const [pathPickerOpened, setPathPickerOpened] = useState(false);
   const methods = useForm<ArgumentValues>({
     mode: 'onChange',
     reValidateMode: 'onChange',
@@ -89,6 +91,11 @@ const CodeExecuteButton: React.FC<CodeExecuteButtonProps> = ({ code, onDescribeF
     onExecute(description!, data);
   };
 
+  const handlePathSelect = (path: string) => {
+    setPathPickerOpened(false);
+    navigator.clipboard.writeText(path);
+  };
+
   const descriptionArguments: Argument<ArgumentValue>[] = Object.values(description?.arguments || []);
   const groups = Array.from(new Set(descriptionArguments.map((arg) => arg.group)));
   const shouldRenderTabs = groups.length > 1 || (groups.length === 1 && groups[0] !== ArgumentGroupDefault);
@@ -96,6 +103,18 @@ const CodeExecuteButton: React.FC<CodeExecuteButtonProps> = ({ code, onDescribeF
 
   return (
     <>
+      <PathPicker
+        onSelect={handlePathSelect}
+        onCancel={() => setPathPickerOpened(false)}
+        basePath="/"
+        confirmButtonLabel={
+          <>
+            <Copy size="XS" marginEnd="size-100" />
+            Copy to clipboard
+          </>
+        }
+        open={pathPickerOpened}
+      />
       <Button aria-label="Execute" variant="accent" onPress={handleExecute} isPending={isPending || described} isDisabled={isDisabled}>
         <Gears />
         <Text>Execute</Text>
@@ -134,6 +153,12 @@ const CodeExecuteButton: React.FC<CodeExecuteButtonProps> = ({ code, onDescribeF
                   )}
                 </Form>
               </Content>
+              <Footer>
+                <Button aria-label="Pick Path" variant="secondary" onPress={() => setPathPickerOpened(true)}>
+                  <Gears size="XS" />
+                  <Text>Pick Path</Text>
+                </Button>
+              </Footer>
               <ButtonGroup>
                 <Button aria-label="Cancel" variant="secondary" onPress={handleCloseDialog}>
                   <Close size="XS" />
diff --git a/ui.frontend/src/components/HealthChecker.tsx b/ui.frontend/src/components/HealthChecker.tsx
index 92c12cd9..c3bd55b3 100644
--- a/ui.frontend/src/components/HealthChecker.tsx
+++ b/ui.frontend/src/components/HealthChecker.tsx
@@ -38,7 +38,7 @@ const HealthChecker = () => {
             <Button
               variant="negative"
               isDisabled={appState.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
-              onPress={() => window.open(`${instancePrefix}/system/console/configMgr/com.vml.es.aem.acm.core.instance.HealthChecker`, '_blank')}
+              onPress={() => window.open(`${instancePrefix}/system/console/configMgr/dev.vml.es.acm.core.instance.HealthChecker`, '_blank')}
             >
               <Settings />
               <Text>Configure</Text>
diff --git a/ui.frontend/src/components/PathPicker.tsx b/ui.frontend/src/components/PathPicker.tsx
new file mode 100644
index 00000000..fd88e3e2
--- /dev/null
+++ b/ui.frontend/src/components/PathPicker.tsx
@@ -0,0 +1,204 @@
+import { Breadcrumbs, Button, ButtonGroup, Content, Dialog, DialogContainer, Flex, Heading, Item, ListView, Selection, Text } from '@adobe/react-spectrum';
+import Document from '@spectrum-icons/workflow/Document';
+import FileCode from '@spectrum-icons/workflow/FileCode';
+import Folder from '@spectrum-icons/workflow/Folder';
+import Home from '@spectrum-icons/workflow/Home';
+import Project from '@spectrum-icons/workflow/Project';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
+import { apiRequest } from '../utils/api';
+import { AssistCodeOutput } from '../utils/api.types';
+
+enum NodeType {
+  FOLDER = 'nt:folder',
+  ORDERED_FOLDER = 'sling:OrderedFolder',
+  SLING_FOLDER = 'sling:Folder',
+  CQ_PROJECTS = 'cq/projects',
+  REDIRECT = 'sling:redirect',
+  ACL = 'rep:ACL',
+  PAGE = 'cq:Page',
+}
+
+const FOLDER_NODE_TYPES = [NodeType.FOLDER, NodeType.ORDERED_FOLDER, NodeType.SLING_FOLDER, NodeType.CQ_PROJECTS, NodeType.REDIRECT, NodeType.ACL] as const;
+
+interface PathItem {
+  id: string;
+  name: string;
+  path: string;
+  type: string;
+  hasChildren?: boolean;
+}
+
+interface PathPickerProps {
+  open?: boolean;
+  onSelect: (path: string) => void;
+  onCancel: () => void;
+  label?: ReactNode;
+  basePath?: string;
+  confirmButtonLabel?: ReactNode;
+}
+
+const getIconForType = (type: string) => {
+  switch (type) {
+    case 'sling:Folder':
+      return <Folder gridRow="1 / span 2" marginEnd="size-100" size="M" />;
+    case 'cq:Page':
+      return <FileCode gridRow="1 / span 2" marginEnd="size-100" size="M" />;
+    case 'nt:file':
+      return <Document gridRow="1 / span 2" marginEnd="size-100" size="M" />;
+    case 'sling:OrderedFolder':
+      return <Project gridRow="1 / span 2" marginEnd="size-100" size="M" />;
+    default:
+      return <Document gridRow="1 / span 2" marginEnd="size-100" size="M" />;
+  }
+};
+
+const PathPicker = ({ onSelect, onCancel, label = 'Select Path', basePath = '/', confirmButtonLabel = 'Confirm', open }: PathPickerProps) => {
+  const [selectedItemData, setSelectedItemData] = useState<PathItem | null>(null);
+  const [path, setPath] = useState<string>(basePath);
+  const [isLoading, setIsLoading] = useState(false);
+  const [loadedPaths, setLoadedPaths] = useState<Record<string, PathItem[]>>({});
+
+  useEffect(() => {
+    const fetchItems = async () => {
+      setSelectedItemData(null);
+      if (loadedPaths[path]) {
+        return;
+      }
+
+      setIsLoading(true);
+
+      try {
+        const response = await apiRequest<AssistCodeOutput>({
+          operation: 'Path search',
+          url: `/apps/acm/api/assist-code.json?type=resource&word=${encodeURIComponent(path)}/`,
+          method: 'get',
+        });
+
+        const responseData = response.data;
+        const responseItems = responseData?.data.suggestions;
+
+        if (responseItems && Array.isArray(responseItems)) {
+          const newItems = responseItems.map((item) => {
+            const resourceTypeMatch = item.i.match(/Resource Type: (.+)/);
+            const resourceType = resourceTypeMatch ? resourceTypeMatch[1] : 'unknown';
+            const isFolderLike = FOLDER_NODE_TYPES.some((t) => resourceType.includes(t));
+            const isPage = resourceType === NodeType.PAGE;
+            const name = item.it.split('/').pop() || item.it;
+
+            return {
+              id: item.it,
+              name: name,
+              path: item.it,
+              type: resourceType,
+              hasChildren: isFolderLike || isPage,
+            };
+          });
+
+          setLoadedPaths((prev) => ({ ...prev, [path]: newItems }));
+          setPath(path);
+        }
+      } catch (error) {
+        console.error('Error fetching paths:', error);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchItems();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [path]);
+
+  const handleItemClick = useCallback((item: PathItem) => {
+    if (item.hasChildren) {
+      setPath(item.path);
+    }
+  }, []);
+
+  const handleSelectionChange = (keys: Selection) => {
+    if (keys === 'all') {
+      return;
+    }
+
+    if (keys.size !== 1) {
+      return;
+    }
+
+    const selectedKeys = Array.from(keys);
+    const key = String(selectedKeys[0]);
+    const item = loadedPaths[path].find((item) => item.id === key);
+
+    if (item) {
+      setSelectedItemData(item);
+    }
+  };
+
+  const handleConfirm = useCallback(() => {
+    if (selectedItemData) {
+      onSelect(selectedItemData.path);
+    }
+  }, [selectedItemData, onSelect]);
+
+  const handleAction = (key: React.Key) => {
+    const item = loadedPaths[path].find((item) => item.id === key);
+
+    if (item?.hasChildren) {
+      handleItemClick(item);
+    }
+  };
+
+  return (
+    <DialogContainer onDismiss={onCancel}>
+      {open && (
+        <Dialog>
+          <Heading>
+            <Flex direction="column" gap="size-100">
+              <Text>{label}</Text>
+              <Breadcrumbs marginTop="size-100" showRoot size="M" isDisabled={isLoading} onAction={(p) => setPath(p.toString())}>
+                {path.split('/').map((p, index) => {
+                  const fullPath = path
+                    .split('/')
+                    .slice(0, index + 1)
+                    .join('/');
+                  const label = index === 0 ? <Home size="S" /> : p;
+
+                  return <Item key={fullPath}>{label}</Item>;
+                })}
+              </Breadcrumbs>
+            </Flex>
+          </Heading>
+          <Content>
+            <ListView
+              aria-label="Path items"
+              density="compact"
+              selectionMode="single"
+              selectionStyle="highlight"
+              selectedKeys={selectedItemData ? [selectedItemData.id] : undefined}
+              onSelectionChange={handleSelectionChange}
+              items={loadedPaths[path] ?? []}
+              onAction={handleAction}
+            >
+              {(item) => (
+                <Item key={item.id} textValue={item.name} hasChildItems={item.hasChildren}>
+                  <Text>{item.name}</Text>
+                  {getIconForType(item.type)}
+                  <Text slot="description">{item.type}</Text>
+                </Item>
+              )}
+            </ListView>
+          </Content>
+          <ButtonGroup>
+            <Button variant="secondary" onPress={onCancel} isDisabled={isLoading}>
+              Cancel
+            </Button>
+            <Button variant="accent" onPress={handleConfirm} isDisabled={!selectedItemData || isLoading}>
+              {confirmButtonLabel}
+            </Button>
+          </ButtonGroup>
+        </Dialog>
+      )}
+    </DialogContainer>
+  );
+};
+
+export default PathPicker;
diff --git a/ui.frontend/src/components/ScriptExecutor.tsx b/ui.frontend/src/components/ScriptExecutor.tsx
index c3e6a460..db4bf161 100644
--- a/ui.frontend/src/components/ScriptExecutor.tsx
+++ b/ui.frontend/src/components/ScriptExecutor.tsx
@@ -56,7 +56,7 @@ const ScriptExecutor = () => {
                   <Text>Configure</Text>
                 </Button>
                 <Menu onAction={(pid) => window.open(`${prefix}/system/console/configMgr/${pid}`, '_blank')}>
-                  <Item key="com.vml.es.aem.acm.core.script.ScriptScheduler">
+                  <Item key="dev.vml.es.acm.core.script.ScriptScheduler">
                     <ApplicationDelivery />
                     <Text>Script Scheduler</Text>
                   </Item>
@@ -64,7 +64,7 @@ const ScriptExecutor = () => {
                     <Clock />
                     <Text>Execution Queue</Text>
                   </Item>
-                  <Item key="com.vml.es.aem.acm.core.code.Executor">
+                  <Item key="dev.vml.es.acm.core.code.Executor">
                     <Code />
                     <Text>Code Executor</Text>
                   </Item>
diff --git a/ui.frontend/src/components/ScriptListSimple.tsx b/ui.frontend/src/components/ScriptListSimple.tsx
index 1358633d..0ef5bf1a 100644
--- a/ui.frontend/src/components/ScriptListSimple.tsx
+++ b/ui.frontend/src/components/ScriptListSimple.tsx
@@ -62,7 +62,7 @@ const ScriptListSimple: React.FC<ScriptListSimpleProps> = ({ type }) => {
                 <Button
                   variant="negative"
                   isDisabled={appState.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
-                  onPress={() => window.open(`${instancePrefix}/system/console/configMgr/com.vml.es.aem.acm.core.mock.MockHttpFilter`, '_blank')}
+                  onPress={() => window.open(`${instancePrefix}/system/console/configMgr/dev.vml.es.acm.core.mock.MockHttpFilter`, '_blank')}
                 >
                   <Settings />
                   <Text>Configure</Text>