diff --git a/Dockerfile b/Dockerfile
index d013207..95e0b76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,16 +13,16 @@ ENV GN_DIR /opt/geonetwork
 #
 
 # Override log4j as we need to add our log appear, by default ROOT level is off which is very strange design
-COPY ./geonetwork/target/classes/log4j-imos.xml ${GN_DIR}/WEB-INF/classes/log4j2.xml
-COPY ./geonetwork/target/classes/log4j-imos-index.xml ${GN_DIR}/WEB-INF/classes/log4j2-index.xml
+COPY ./geonetwork-core/target/classes/log4j-imos.xml ${GN_DIR}/WEB-INF/classes/log4j2.xml
+COPY ./geonetwork-core/target/classes/log4j-imos-index.xml ${GN_DIR}/WEB-INF/classes/log4j2-index.xml
 
 # Copy our jar to the lib folder so that scan can happens
-COPY ./geonetwork/target/geonetwork-*.jar ${GN_DIR}/WEB-INF/lib/
+COPY ./geonetwork-core/target/geonetwork4-*.jar ${GN_DIR}/WEB-INF/lib/
 COPY ./geonetwork-api/target/geonetwork-api-*.jar ${GN_DIR}/WEB-INF/lib/
 
-COPY ./geonetwork/target/dependency/* ${GN_DIR}/WEB-INF/lib/
-COPY ./geonetwork/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19139/process/
-COPY ./geonetwork/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19115-3.2018/process/
+COPY ./geonetwork-core/target/dependency/* ${GN_DIR}/WEB-INF/lib/
+COPY ./geonetwork-core/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19139/process/
+COPY ./geonetwork-core/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19115-3.2018/process/
 
 # Config override
-COPY ./geonetwork/target/classes/gnconfig/config-overrides.xml ${GN_DIR}/WEB-INF/
+COPY ./geonetwork-core/target/classes/gnconfig/config-overrides.xml ${GN_DIR}/WEB-INF/
diff --git a/geonetwork/pom.xml b/geonetwork-core/pom.xml
similarity index 99%
rename from geonetwork/pom.xml
rename to geonetwork-core/pom.xml
index 0967e1b..4de9120 100644
--- a/geonetwork/pom.xml
+++ b/geonetwork-core/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>geonetwork4</artifactId>
+    <artifactId>geonetwork4-core</artifactId>
     <packaging>jar</packaging>
 
     <description>AODN customized Geonetwork Instance</description>
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/ActuatorConfig.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/ActuatorConfig.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/ActuatorConfig.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/ActuatorConfig.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/Config.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/Config.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/Config.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/Config.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/S3Config.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/S3Config.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/S3Config.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/S3Config.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/Setup.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/Setup.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/Setup.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/Setup.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/controller/Api.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/controller/Api.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/controller/Api.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/controller/Api.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/enumeration/Environment.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/enumeration/Environment.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/enumeration/Environment.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/enumeration/Environment.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/handler/GenericEntityListener.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/handler/GenericEntityListener.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/handler/GenericEntityListener.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/handler/GenericEntityListener.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/model/ConfigTypes.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/ConfigTypes.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/model/ConfigTypes.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/ConfigTypes.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/model/GitRemoteConfig.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/GitRemoteConfig.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/model/GitRemoteConfig.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/GitRemoteConfig.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfig.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfig.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfig.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfig.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfigValue.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfigValue.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfigValue.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/model/RemoteConfigValue.java
diff --git a/geonetwork/src/main/java/au/org/aodn/geonetwork4/ssl/HttpsTrustManager.java b/geonetwork-core/src/main/java/au/org/aodn/geonetwork4/ssl/HttpsTrustManager.java
similarity index 100%
rename from geonetwork/src/main/java/au/org/aodn/geonetwork4/ssl/HttpsTrustManager.java
rename to geonetwork-core/src/main/java/au/org/aodn/geonetwork4/ssl/HttpsTrustManager.java
diff --git a/geonetwork/src/main/java/org/fao/geonet/AODNCustomBootStrap.java b/geonetwork-core/src/main/java/org/fao/geonet/AODNCustomBootStrap.java
similarity index 100%
rename from geonetwork/src/main/java/org/fao/geonet/AODNCustomBootStrap.java
rename to geonetwork-core/src/main/java/org/fao/geonet/AODNCustomBootStrap.java
diff --git a/geonetwork/src/main/resources/application-edge.properties b/geonetwork-core/src/main/resources/application-edge.properties
similarity index 100%
rename from geonetwork/src/main/resources/application-edge.properties
rename to geonetwork-core/src/main/resources/application-edge.properties
diff --git a/geonetwork/src/main/resources/application-staging.properties b/geonetwork-core/src/main/resources/application-staging.properties
similarity index 100%
rename from geonetwork/src/main/resources/application-staging.properties
rename to geonetwork-core/src/main/resources/application-staging.properties
diff --git a/geonetwork/src/main/resources/application.properties b/geonetwork-core/src/main/resources/application.properties
similarity index 100%
rename from geonetwork/src/main/resources/application.properties
rename to geonetwork-core/src/main/resources/application.properties
diff --git a/geonetwork/src/main/resources/gnconfig/config-overrides.xml b/geonetwork-core/src/main/resources/gnconfig/config-overrides.xml
similarity index 100%
rename from geonetwork/src/main/resources/gnconfig/config-overrides.xml
rename to geonetwork-core/src/main/resources/gnconfig/config-overrides.xml
diff --git a/geonetwork/src/main/resources/log4j-imos-index.xml b/geonetwork-core/src/main/resources/log4j-imos-index.xml
similarity index 100%
rename from geonetwork/src/main/resources/log4j-imos-index.xml
rename to geonetwork-core/src/main/resources/log4j-imos-index.xml
diff --git a/geonetwork/src/main/resources/log4j-imos.xml b/geonetwork-core/src/main/resources/log4j-imos.xml
similarity index 100%
rename from geonetwork/src/main/resources/log4j-imos.xml
rename to geonetwork-core/src/main/resources/log4j-imos.xml
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/README.md b/geonetwork-core/src/main/resources/schema_plugins/converter/README.md
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/README.md
rename to geonetwork-core/src/main/resources/schema_plugins/converter/README.md
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/add-collection-config.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/add-collection-config.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/add-collection-config.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/add-collection-config.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/ebstack-linkage-updater.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/ebstack-linkage-updater.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/ebstack-linkage-updater.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/ebstack-linkage-updater.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/ga.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/ga.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/ga.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/ga.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/linkage-updater.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/linkage-updater.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/linkage-updater.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/linkage-updater.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/replace.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/replace.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/replace.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/replace.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/template.png b/geonetwork-core/src/main/resources/schema_plugins/converter/template.png
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/template.png
rename to geonetwork-core/src/main/resources/schema_plugins/converter/template.png
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/transform_19115_3_testing_urls.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/transform_19115_3_testing_urls.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/transform_19115_3_testing_urls.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/transform_19115_3_testing_urls.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/transform_sandbox_urls.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/transform_sandbox_urls.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/transform_sandbox_urls.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/transform_sandbox_urls.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/transform_testing_urls.xsl b/geonetwork-core/src/main/resources/schema_plugins/converter/transform_testing_urls.xsl
similarity index 100%
rename from geonetwork/src/main/resources/schema_plugins/converter/transform_testing_urls.xsl
rename to geonetwork-core/src/main/resources/schema_plugins/converter/transform_testing_urls.xsl
diff --git a/geonetwork/src/test/java/au/org/aodn/geonetwork4/controller/ApiTest.java b/geonetwork-core/src/test/java/au/org/aodn/geonetwork4/controller/ApiTest.java
similarity index 100%
rename from geonetwork/src/test/java/au/org/aodn/geonetwork4/controller/ApiTest.java
rename to geonetwork-core/src/test/java/au/org/aodn/geonetwork4/controller/ApiTest.java
diff --git a/geonetwork/src/test/java/au/org/aodn/geonetwork4/handler/GenericEntityListenerTest.java b/geonetwork-core/src/test/java/au/org/aodn/geonetwork4/handler/GenericEntityListenerTest.java
similarity index 100%
rename from geonetwork/src/test/java/au/org/aodn/geonetwork4/handler/GenericEntityListenerTest.java
rename to geonetwork-core/src/test/java/au/org/aodn/geonetwork4/handler/GenericEntityListenerTest.java
diff --git a/geonetwork/src/test/java/au/org/aodn/geonetwork4/handler/SetupTest.java b/geonetwork-core/src/test/java/au/org/aodn/geonetwork4/handler/SetupTest.java
similarity index 100%
rename from geonetwork/src/test/java/au/org/aodn/geonetwork4/handler/SetupTest.java
rename to geonetwork-core/src/test/java/au/org/aodn/geonetwork4/handler/SetupTest.java
diff --git a/geonetwork/src/test/java/au/org/aodn/geonetwork4/model/GitRemoteConfigTest.java b/geonetwork-core/src/test/java/au/org/aodn/geonetwork4/model/GitRemoteConfigTest.java
similarity index 100%
rename from geonetwork/src/test/java/au/org/aodn/geonetwork4/model/GitRemoteConfigTest.java
rename to geonetwork-core/src/test/java/au/org/aodn/geonetwork4/model/GitRemoteConfigTest.java
diff --git a/geonetwork/src/test/resources/groups.json b/geonetwork-core/src/test/resources/groups.json
similarity index 100%
rename from geonetwork/src/test/resources/groups.json
rename to geonetwork-core/src/test/resources/groups.json
diff --git a/geonetwork/src/test/resources/harvesterlist.json b/geonetwork-core/src/test/resources/harvesterlist.json
similarity index 100%
rename from geonetwork/src/test/resources/harvesterlist.json
rename to geonetwork-core/src/test/resources/harvesterlist.json
diff --git a/geonetwork/src/test/resources/harvesterlist.xml b/geonetwork-core/src/test/resources/harvesterlist.xml
similarity index 100%
rename from geonetwork/src/test/resources/harvesterlist.xml
rename to geonetwork-core/src/test/resources/harvesterlist.xml
diff --git a/pom.xml b/pom.xml
index bc90d8d..715a388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
     <modules>
         <module>geonetwork-api</module>
-        <module>geonetwork</module>
+        <module>geonetwork-core</module>
     </modules>
 
     <properties>