diff --git a/.github/workflows/build-and-test-2.13.yml b/.github/workflows/build-and-test-2.13.yml
index 20a4d5ff4a51..92aa2f3fa671 100644
--- a/.github/workflows/build-and-test-2.13.yml
+++ b/.github/workflows/build-and-test-2.13.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '11'
           cache: 'maven'
       - name: Set Scala version
-        run: ./build/change-scala-version.sh 2.13
+        run: ./build/scripts/change-scala-version.sh 2.13
       - name: Build with Maven
         run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
       - name: Unit tests
diff --git a/.github/workflows/integration-tests-2.13.yml b/.github/workflows/integration-tests-2.13.yml
index 7ba1454be812..bb34bbbd8216 100644
--- a/.github/workflows/integration-tests-2.13.yml
+++ b/.github/workflows/integration-tests-2.13.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '11'
           cache: 'maven'
       - name: Set Scala version
-        run: ./build/change-scala-version.sh 2.13
+        run: ./build/scripts/change-scala-version.sh 2.13
       - name: Build with Maven
         run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
       - name: Integration Tests
diff --git a/README.md b/README.md
index d619db5807eb..c91cce439c94 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ To run unit tests, omit the `-DskipTests` (note: requires `docker` to be availab
 GeoMesa also provides experimental support for the [Bloop](https://scalacenter.github.io/bloop/) compile server,
 which provides fast incremental compilation. To export the GeoMesa build to Bloop, run:
 
-    ./build/bloop-export.sh
+    ./build/scripts/bloop-export.sh
 
 For more information on using Bloop, refer to the
 [Bloop documentation](https://scalacenter.github.io/bloop/docs/build-tools/maven).
@@ -221,7 +221,7 @@ environment variable to point to the root of your JDK. Example from a Mac:
 
 To build for a different Scala version (e.g. 2.13), run the following script, then build as normal:
 
-    ./build/change-scala-version.sh 2.13
+    ./build/scripts/change-scala-version.sh 2.13
 
 ### Building on OS X
 
diff --git a/build/cyclonedx-settings.xml b/build/cyclonedx-settings.xml
deleted file mode 100644
index a8a9afe475d4..000000000000
--- a/build/cyclonedx-settings.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <!--
-        cyclonedx does not pick up the repos defined in our pom, so we have to redefine them in the settings.xml.
-        This file can be used directly with `mvn -s build/cyclonedx-settings.xml`, or the contents can be merged
-        with a user's `~/.m2/settings.xml`.
-      -->
-      <id>cyclonedx</id>
-      <repositories>
-        <!-- include central so that it is searched before our alternate repos -->
-        <repository>
-          <id>central</id>
-          <name>Maven Repository Switchboard</name>
-          <layout>default</layout>
-          <url>https://repo1.maven.org/maven2</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- geotools -->
-        <repository>
-          <id>osgeo</id>
-          <url>https://repo.osgeo.org/repository/release</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- confluent -->
-        <repository>
-          <id>confluent</id>
-          <url>https://packages.confluent.io/maven/</url>
-        </repository>
-        <!-- nightly geomesa snapshots -->
-        <repository>
-          <id>locationtech-snapshots</id>
-          <url>https://repo.eclipse.org/content/groups/snapshots</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-        <!-- nightly geotools snapshots -->
-        <repository>
-          <id>osgeo-snapshots</id>
-          <url>https://repo.osgeo.org/repository/snapshot</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</settings>
-
diff --git a/build/gt-30-api-changes.sed b/build/gt-30-api-changes.sed
deleted file mode 100644
index 4e85071402b2..000000000000
--- a/build/gt-30-api-changes.sed
+++ /dev/null
@@ -1,188 +0,0 @@
-# run with: find . -name "*.scala" -not -exec grep -q "import org.geotools.api.data._" {} \; -exec sed -E -i -f gt-30-api-changes.sed {} \;
-
-s/org\.geotools\.data\.DataStore/org.geotools.api.data.DataStore/g
-s/(import org\.geotools\.data\.)\{DataStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStore\}/import org.geotools.api.data.DataStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStore\n\1{\2, \3}/
-
-s/org\.geotools\.data\.Parameter/org.geotools.api.data.Parameter/g
-s/(import org\.geotools\.data\.)\{Parameter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Parameter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Parameter\}/import org.geotools.api.data.Parameter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Parameter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Parameter\n\1{\2, \3}/
-
-s/org.geotools.data.DataStoreFactorySpi/org.geotools.api.data.DataStoreFactorySpi/g
-s/(import org\.geotools\.data\.)\{DataStoreFactorySpi, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStoreFactorySpi\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStoreFactorySpi\}/import org.geotools.api.data.DataStoreFactorySpi\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStoreFactorySpi, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStoreFactorySpi\n\1{\2, \3}/
-
-s/org.geotools.data.DataStoreFinder/org.geotools.api.data.DataStoreFinder/g
-s/(import org\.geotools\.data\.)\{DataStoreFinder, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStoreFinder\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStoreFinder\}/import org.geotools.api.data.DataStoreFinder\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DataStoreFinder, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DataStoreFinder\n\1{\2, \3}/
-
-s/org.geotools.data.DelegatingFeatureReader/org.geotools.api.data.DelegatingFeatureReader/g
-s/(import org\.geotools\.data\.)\{DelegatingFeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DelegatingFeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DelegatingFeatureReader\}/import org.geotools.api.data.DelegatingFeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), DelegatingFeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.DelegatingFeatureReader\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureEvent/org.geotools.api.data.FeatureEvent/g
-s/(import org\.geotools\.data\.)\{FeatureEvent, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureEvent\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureEvent\}/import org.geotools.api.data.FeatureEvent\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureEvent, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureEvent\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureListener/org.geotools.api.data.FeatureListener/g
-s/(import org\.geotools\.data\.)\{FeatureListener, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureListener\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureListener\}/import org.geotools.api.data.FeatureListener\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureListener, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureListener\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureLock/org.geotools.api.data.FeatureLock/g
-s/(import org\.geotools\.data\.)\{FeatureLock, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureLock\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureLock\}/import org.geotools.api.data.FeatureLock\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureLock, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureLock\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureLocking/org.geotools.api.data.FeatureLocking/g
-s/(import org\.geotools\.data\.)\{FeatureLocking, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureLocking\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureLocking\}/import org.geotools.api.data.FeatureLocking\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureLocking, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureLocking\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureReader/org.geotools.api.data.FeatureReader/g
-s/(import org\.geotools\.data\.)\{FeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureReader\}/import org.geotools.api.data.FeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureReader\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureSource/org.geotools.api.data.FeatureSource/g
-s/(import org\.geotools\.data\.)\{FeatureSource, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureSource\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureSource\}/import org.geotools.api.data.FeatureSource\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureSource, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureSource\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureStore/org.geotools.api.data.FeatureStore/g
-s/(import org\.geotools\.data\.)\{FeatureStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureStore\}/import org.geotools.api.data.FeatureStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureStore\n\1{\2, \3}/
-
-s/org.geotools.data.FeatureWriter/org.geotools.api.data.FeatureWriter/g
-s/(import org\.geotools\.data\.)\{FeatureWriter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureWriter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureWriter\}/import org.geotools.api.data.FeatureWriter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FeatureWriter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FeatureWriter\n\1{\2, \3}/
-
-s/org.geotools.data.FileDataStore/org.geotools.api.data.FileDataStore/g
-s/(import org\.geotools\.data\.)\{FileDataStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileDataStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileDataStore\}/import org.geotools.api.data.FileDataStore\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileDataStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileDataStore\n\1{\2, \3}/
-
-s/org.geotools.data.FileDataStoreFactorySpi/org.geotools.api.data.FileDataStoreFactorySpi/g
-s/(import org\.geotools\.data\.)\{FileDataStoreFactorySpi, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileDataStoreFactorySpi\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileDataStoreFactorySpi\}/import org.geotools.api.data.FileDataStoreFactorySpi\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileDataStoreFactorySpi, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileDataStoreFactorySpi\n\1{\2, \3}/
-
-s/org.geotools.data.FileStoreFactory/org.geotools.api.data.FileStoreFactory/g
-s/(import org\.geotools\.data\.)\{FileStoreFactory, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileStoreFactory\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileStoreFactory\}/import org.geotools.api.data.FileStoreFactory\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), FileStoreFactory, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.FileStoreFactory\n\1{\2, \3}/
-
-s/org.geotools.data.Join/org.geotools.api.data.Join/g
-s/(import org\.geotools\.data\.)\{Join, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Join\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Join\}/import org.geotools.api.data.Join\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Join, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Join\n\1{\2, \3}/
-
-s/org.geotools.data.LockingManager/org.geotools.api.data.LockingManager/g
-s/(import org\.geotools\.data\.)\{LockingManager, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.LockingManager\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), LockingManager\}/import org.geotools.api.data.LockingManager\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), LockingManager, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.LockingManager\n\1{\2, \3}/
-
-s/org.geotools.data.Parameter/org.geotools.api.data.Parameter/g
-s/(import org\.geotools\.data\.)\{Parameter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Parameter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Parameter\}/import org.geotools.api.data.Parameter\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Parameter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Parameter\n\1{\2, \3}/
-
-s/org.geotools.data.Query/org.geotools.api.data.Query/g
-s/(import org\.geotools\.data\.)\{Query, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Query\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Query\}/import org.geotools.api.data.Query\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Query, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Query\n\1{\2, \3}/
-
-s/org.geotools.data.QueryCapabilities/org.geotools.api.data.QueryCapabilities/g
-s/(import org\.geotools\.data\.)\{QueryCapabilities, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.QueryCapabilities\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), QueryCapabilities\}/import org.geotools.api.data.QueryCapabilities\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), QueryCapabilities, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.QueryCapabilities\n\1{\2, \3}/
-
-s/org.geotools.data.Repository/org.geotools.api.data.Repository/g
-s/(import org\.geotools\.data\.)\{Repository, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Repository\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Repository\}/import org.geotools.api.data.Repository\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Repository, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Repository\n\1{\2, \3}/
-
-s/org.geotools.data.ResourceInfo/org.geotools.api.data.ResourceInfo/g
-s/(import org\.geotools\.data\.)\{ResourceInfo, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.ResourceInfo\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), ResourceInfo\}/import org.geotools.api.data.ResourceInfo\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), ResourceInfo, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.ResourceInfo\n\1{\2, \3}/
-
-s/org.geotools.data.ServiceInfo/org.geotools.api.data.ServiceInfo/g
-s/(import org\.geotools\.data\.)\{ServiceInfo, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.ServiceInfo\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), ServiceInfo\}/import org.geotools.api.data.ServiceInfo\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), ServiceInfo, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.ServiceInfo\n\1{\2, \3}/
-
-s/org.geotools.data.Transaction/org.geotools.api.data.Transaction/g
-s/(import org\.geotools\.data\.)\{Transaction, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Transaction\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Transaction\}/import org.geotools.api.data.Transaction\n\1{\2}/
-s/(import org\.geotools\.data\.)\{([a-zA-Z0-9, _]*), Transaction, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.Transaction\n\1{\2, \3}/
-
-s/org.geotools.data.simple.SimpleFeatureReader/org.geotools.api.data.SimpleFeatureReader/g
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureReader\}/import org.geotools.api.data.SimpleFeatureReader\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureReader, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureReader\n\1{\2, \3}/
-
-s/org.geotools.data.simple.SimpleFeatureSource/org.geotools.api.data.SimpleFeatureSource/g
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureSource, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureSource\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureSource\}/import org.geotools.api.data.SimpleFeatureSource\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureSource, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureSource\n\1{\2, \3}/
-
-s/org.geotools.data.simple.SimpleFeatureStore/org.geotools.api.data.SimpleFeatureStore/g
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureStore\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureStore\}/import org.geotools.api.data.SimpleFeatureStore\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureStore, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureStore\n\1{\2, \3}/
-
-s/org.geotools.data.simple.SimpleFeatureWriter/org.geotools.api.data.SimpleFeatureWriter/g
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureWriter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureWriter\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureWriter\}/import org.geotools.api.data.SimpleFeatureWriter\n\1{\2}/
-s/(import org\.geotools\.data\.simple\.)\{([a-zA-Z0-9, _]*), SimpleFeatureWriter, ([a-zA-Z0-9, _]*)\}/import org.geotools.api.data.SimpleFeatureWriter\n\1{\2, \3}/
-
-s/(import org\.geotools\.data\.)\{DataStore\}/import org.geotools.api.data.DataStore/
-s/(import org\.geotools\.data\.)\{FeatureLock\}/import org.geotools.api.data.FeatureLock/
-s/(import org\.geotools\.data\.)\{FeatureLocking\}/import org.geotools.api.data.FeatureLocking/
-s/(import org\.geotools\.data\.)\{FeatureReader\}/import org.geotools.api.data.FeatureReader/
-s/(import org\.geotools\.data\.)\{FeatureSource\}/import org.geotools.api.data.FeatureSource/
-s/(import org\.geotools\.data\.)\{FeatureStore\}/import org.geotools.api.data.FeatureStore/
-s/(import org\.geotools\.data\.)\{FeatureWriter\}/import org.geotools.api.data.FeatureWriter/
-s/(import org\.geotools\.data\.)\{FileDataStore\}/import org.geotools.api.data.FileDataStore/
-s/(import org\.geotools\.data\.)\{FileDataStoreFactorySpi\}/import org.geotools.api.data.FileDataStoreFactorySpi/
-s/(import org\.geotools\.data\.)\{FileStoreFactory\}/import org.geotools.api.data.FileStoreFactory/
-s/(import org\.geotools\.data\.)\{Parameter\}/import org.geotools.api.data.Parameter/
-s/(import org\.geotools\.data\.)\{DataStoreFactorySpi\}/import org.geotools.api.data.DataStoreFactorySpi/
-s/(import org\.geotools\.data\.)\{DataStoreFinder\}/import org.geotools.api.data.DataStoreFinder/
-s/(import org\.geotools\.data\.)\{DelegatingFeatureReader\}/import org.geotools.api.data.DelegatingFeatureReader/
-s/(import org\.geotools\.data\.)\{FeatureEvent\}/import org.geotools.api.data.FeatureEvent/
-s/(import org\.geotools\.data\.)\{FeatureListener\}/import org.geotools.api.data.FeatureListener/
-s/(import org\.geotools\.data\.)\{Join\}/import org.geotools.api.data.Join/
-s/(import org\.geotools\.data\.)\{LockingManager\}/import org.geotools.api.data.LockingManager/
-s/(import org\.geotools\.data\.)\{Parameter\}/import org.geotools.api.data.Parameter/
-s/(import org\.geotools\.data\.)\{Query\}/import org.geotools.api.data.Query/
-s/(import org\.geotools\.data\.)\{QueryCapabilities\}/import org.geotools.api.data.QueryCapabilities/
-s/(import org\.geotools\.data\.)\{Repository\}/import org.geotools.api.data.Repository/
-s/(import org\.geotools\.data\.)\{ResourceInfo\}/import org.geotools.api.data.ResourceInfo/
-s/(import org\.geotools\.data\.)\{ServiceInfo\}/import org.geotools.api.data.ServiceInfo/
-s/(import org\.geotools\.data\.)\{Transaction\}/import org.geotools.api.data.Transaction/
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureReader\}/import org.geotools.api.data.SimpleFeatureReader/
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureSource\}/import org.geotools.api.data.SimpleFeatureSource/
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureStore\}/import org.geotools.api.data.SimpleFeatureStore/
-s/(import org\.geotools\.data\.simple\.)\{SimpleFeatureWriter\}/import org.geotools.api.data.SimpleFeatureWriter/
-
-s/import org\.geotools\.data\.\{_\}/import org.geotools.data._/
-s/import org\.geotools\.data\._/\0\nimport org.geotools.api.data._/
-
-s/org\.opengis\.geometry\.BoundingBox/org.geotools.api.geometry.BoundingBox/g
-s/org\.opengis\.geometry\.Geometry/org.locationtech.jts.geom.Geometry/g
-s/FilterFactory2/FilterFactory/g
-s/ReferencedEnvelope\.create/ReferencedEnvelope.envelope/g
-s/org\.geotools\.data\.DataAccessFactory\.Param/org.geotools.api.data.DataAccessFactory.Param/g
-s/DirectPosition/Position/g
-
-s/org.opengis/org.geotools.api/g
diff --git a/build/remove-opengis.xml b/build/remove-opengis.xml
deleted file mode 100644
index fa91472d0f09..000000000000
--- a/build/remove-opengis.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="remove-opengis" default="update">
-  <!-- Use this property to run script on your project location -->
-  <property name="project.dir" location="."/>
-  
-  <!--                                                                                  -->
-  <!-- Macros                                                                           -->
-  <!--                                                                                  -->
-  <!-- Refactorings are captured as macros so we can improve the steps based on feedback -->
-  <macrodef name="refactor">
-    <attribute name="srcPackage"/>
-    <attribute name="srcClass"/>
-    <attribute name="dstPackage"/>
-    <attribute name="dstClass"/>
-    <sequential>
-      <echo level="info" message="Refactor: @{srcPackage}.@{srcClass} -&gt; @{dstPackage}.@{dstClass}"/>
-      <replaceregexp byline="true" flags="g">
-        <fileset dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-          <contains text="@{srcPackage}.@{srcClass}" casesensitive="yes"/>
-        </fileset>
-        <regexp pattern="(\W)@{srcPackage}\.@{srcClass}(\W)"/>
-        <substitution expression="\1@{dstPackage}.@{dstClass}\2"/>
-      </replaceregexp>
-      <echo level="info" message="          @{srcClass} -&gt; @{dstClass}"/>
-      <fileset id="@{dstPackage}.@{dstClass}.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="@{dstPackage}.@{dstClass}" casesensitive="yes"/>
-      </fileset>
-      <replaceregexp byline="true" flags="g">
-        <fileset refid="@{dstPackage}.@{dstClass}.files"/>
-        <regexp pattern="(\W)@{srcClass}(\W)"/>
-        <substitution expression="\1@{dstClass}\2"/>
-      </replaceregexp>
-    </sequential>
-  </macrodef>
-  
-  <macrodef name="remove">
-    <attribute name="package"/>
-    <attribute name="class"/>
-    <attribute name="removed" default="// removed"/>
-    <sequential>
-      <echo level="info" message="Removed:  @{package}.@{class} -&gt;"/>
-      <echo level="verbose">... ${toString:@{package}.@{class}.remove}</echo>
-      <replaceregexp byline="true">
-        <fileset dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-          <contains text="import @{package}.@{class};" casesensitive="yes"/>
-        </fileset>
-        <regexp pattern="^import @{class}\.@{class};$"/>
-        <substitution expression="// import @{class}.@{class};@{removed}"/>
-      </replaceregexp>
-    </sequential>
-  </macrodef>
-  
-  <macrodef name="moveClass">
-    <attribute name="srcPackage"/>
-    <attribute name="dstPackage"/>
-    <attribute name="class"/>
-    <sequential>
-      <echo level="info" message="Moved:    '@{srcPackage}.@{class}' -&gt; '@{dstPackage}.@{class}'"/>
-      <fileset id="@{srcPackage}.@{class}.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="@{srcPackage}." casesensitive="yes"/>
-      </fileset>
-      <echo level="verbose">... ${toString:@{srcPackage}.@{class}.files}</echo>
-      <replaceregexp byline="true">
-        <fileset refid="@{srcPackage}.@{class}.files"/>
-        <regexp pattern="^import @{srcPackage}\.@{class};$"/>
-        <substitution expression="import @{dstPackage}\.@{class};"/>
-      </replaceregexp>
-      <replaceregexp byline="true">
-        <fileset refid="@{srcPackage}.@{class}.files"/>
-        <regexp pattern="@{srcPackage}\.@{class}(\W)"/>
-        <substitution expression="@{dstPackage}\.@{class}\1"/>
-      </replaceregexp>
-    </sequential>
-  </macrodef>
-  
-  <!-- Optimization: moveFrom and moveTo share a common fileset -->
-  <macrodef name="moveFrom">
-    <attribute name="srcPackage"/>
-    <sequential>
-      <echo level="info" message="Move From: '@{srcPackage}':"/>
-      <fileset id="@{srcPackage}.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="@{srcPackage}." casesensitive="yes"/>
-      </fileset>
-      <echo level="verbose">... ${toString:@{srcPackage}.files}</echo>
-    </sequential>
-  </macrodef>
-  
-  <macrodef name="moveTo">
-    <attribute name="srcPackage"/>
-    <attribute name="dstPackage"/>
-    <attribute name="class"/>
-    <sequential>
-      <echo level="info" message="       To: '@{srcPackage}.@{class}' -&gt; '@{dstPackage}.@{class}'"/>
-      <replaceregexp byline="true">
-        <fileset refid="@{srcPackage}.files"/>
-        <regexp pattern="^import @{srcPackage}\.@{class};$"/>
-        <substitution expression="import @{dstPackage}\.@{class};"/>
-      </replaceregexp>
-      <replaceregexp byline="true">
-        <fileset refid="@{srcPackage}.files"/>
-        <regexp pattern="@{srcPackage}\.@{class}(\W)"/>
-        <substitution expression="@{dstPackage}\.@{class}\1"/>
-      </replaceregexp>
-    </sequential>
-  </macrodef>
-  
-  <!--                                                                  -->
-  <!-- Tasks                                                            -->
-  <!--                                                                  -->
-  <!-- Tasks are listed in order of execution to aid in troubleshooting -->
-  <target name="starting-up" description="Update project in current directory to remove org.opengis package use">
-    <echo level="warning">Update to GeoTools 30.x series</echo>
-    <echo level="info"/>
-    <echo level="info">UPDATE STARTING: ${project.dir}</echo>
-  </target>
-  
-  <target name="_filterFactory" description="FilterFactory2 and FilterFactory merge">
-    <echo level="info"/>
-    <echo level="info" message="Files containing org.opengis.filter.FilterFactory2:"/>
-    <fileset id="FilterFactory2.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="org.opengis.filter.FilterFactory2" casesensitive="yes"/>
-    </fileset>
-    <echo level="info" message="       Refactor FilterFactory2 --&gt; FilerFactory"/>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="(\W)FilterFactory2(\W)"/>
-      <substitution expression="\1FilterFactory\2"/>
-      <fileset refid="FilterFactory2.files"/>
-    </replaceregexp>
-    <echo level="info" message="       CommonFactoryFinder.getFilterFactory()"/>
-    <replace dir="${project.dir}" includes="**/*.java" summary="yes">
-      <replacefilter>
-        <replacetoken>.getFilterFactory2(</replacetoken>
-        <replacevalue>.getFilterFactory(</replacevalue>
-      </replacefilter>
-    </replace>
-    <echo level="info" message="Files containing org.opengis.filter.FilterFactory:"/>
-    <fileset id="filterFactory.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="import org.opengis.filter.FilterFactory;" casesensitive="yes"/>
-    </fileset>
-    <echo level="info">       FilterFactory.property(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.property\(null\)"/>
-      <substitution expression=".property((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.beyond(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.beyond\(null\)"/>
-      <substitution expression=".beyond((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.contains(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.contains\(null\)"/>
-      <substitution expression=".contains((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="warning">       Collecions.contains((String) possible conflicts</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.crosses\(null\)"/>
-      <substitution expression=".crosses((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.disjoint(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.disjoint\(null\)"/>
-      <substitution expression=".disjoint((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.intersects(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.intersects\(null\)"/>
-      <substitution expression=".intersects((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.overlaps(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.overlaps\(null\)"/>
-      <substitution expression=".overlaps((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.equals(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.equals\(null\)"/>
-      <substitution expression=".equals((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="warning">       Object.equals((String) null) possible conflict</echo>
-    <echo level="info">       FilterFactory.dwithin(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.dwithin\(null\)"/>
-      <substitution expression=".dwithin((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.touches(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.touches\(null\)"/>
-      <substitution expression=".touches((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.overlaps(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.overlaps\(null\)"/>
-      <substitution expression=".overlaps((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.touches(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.touches\(null\)"/>
-      <substitution expression=".touches((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-    <echo level="info">       FilterFactory.within(null)</echo>
-    <replaceregexp byline="true" flags="g">
-      <regexp pattern="\.within\(null\)"/>
-      <substitution expression=".within((String) null)"/>
-      <fileset refid="filterFactory.files"/>
-    </replaceregexp>
-  </target>
-  
-  <target name="_styling" description="GeoTools styling interfaces merge">
-    <echo level="info"/>
-    <echo level="info" message="org.geotools.styling interfaces are now merged into org.geotools.api.style"/>
-    <local name="sp"/>
-    <local name="dp"/>
-    <property name="sp">org.geotools.styling</property>
-    <property name="dp">org.geotools.api.style</property>
-    <refactor srcPackage="${sp}" dstPackage="${dp}" srcClass="StyleFactory2" dstClass="StyleFactory"/>
-    <refactor srcPackage="${sp}" dstPackage="${dp}" srcClass="TextSymbolizer2" dstClass="TextSymbolizer"/>
-    <moveFrom srcPackage="${sp}"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="AnchorPoint"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ChannelSelection"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ColorMap"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ColorMapEntry"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ColorReplacement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ContrastEnhancement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ContrastMethod"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ContrastMethodStrategy"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Description"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Displacement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ExtensionSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Extent"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ExternalGraphic"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ExternalMark"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="FeatureTypeConstraint"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="FeatureTypeStyle"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Fill"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Font"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Graphic"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="GraphicFill"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="GraphicLegend"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="GraphicStroke"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="GraphicalSymbol"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Halo"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ImageOutline"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="LabelPlacement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="LayerFeatureConstraints"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="LinePlacement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="LineSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Mark"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="NamedLayer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="NamedStyle"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="OtherText"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="OverlapBehavior"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="OverlapBehaviorEnum"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="PointPlacement"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="PointSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="PolygonSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="RasterSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="RemoteOWS"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ResourceLocator"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Rule"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="SelectedChannelType"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="SemanticType"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="ShadedRelief"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Stroke"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Style"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="StyleFactory"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="StyleVisitor"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="StyledLayer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="StyledLayerDescriptor"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Symbol"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="Symbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="TextSymbolizer"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="TraversingStyleVisitor"/>
-    <moveTo srcPackage="${sp}" dstPackage="${dp}" class="UserLayer"/>
-
-   <!-- A cast is required as DataStore API is defined in gt-main -->
-    <replaceregexp flags="g">
-      <regexp pattern="(\w+)\.getInlineFeatureDatastore\(\)"/>
-      <substitution expression="(DataStore) \1.getInlineFeatureDatastore()"/>
-      <fileset dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="getInlineFeatureDatastore" casesensitive="yes"/>
-      </fileset>
-    </replaceregexp>
-  </target>
-  
-  <target name="_position" description="Position API cleanup">
-    <echo level="info"/>
-    <echo level="info" message="Position and DirectPosition cleanup ..."/>
-    <refactor srcPackage="org.opengis.geometry" srcClass="DirectPosition" dstPackage="org.opengis.geometry" dstClass="Position"/>
-    <moveFrom srcPackage="org.opengis.geometry.coordinate"/>
-    <moveTo srcPackage="org.opengis.geometry.coordinate" dstPackage="org.opengis.geometry" class="Position"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="AbstractDirectPosition" dstPackage="org.geotools.geometry" dstClass="AbstractPosition"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="GeneralDirectPosition" dstPackage="org.geotools.geometry" dstClass="GeneralPosition"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="DirectPosition1D" dstPackage="org.geotools.geometry" dstClass="Position1D"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="DirectPosition2D" dstPackage="org.geotools.geometry" dstClass="Position2D"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="DirectPosition3D" dstPackage="org.geotools.geometry" dstClass="Position3D"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="TransformedDirectPosition" dstPackage="org.geotools.geometry" dstClass="TransformedPosition"/>
-    <remove package="org.opengis.geometry.coordinate" class="PointArray" removed="// removed - use List&lt;DirectPosition&gt;"/>
-  </target>
-  
-  <target name="_bounds" description="Bounds API cleanup">
-    <echo level="info"/>
-    <echo level="info" message="Bounds and Envelope cleanup ..."/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="AbstractEnvelope" dstPackage="org.geotools.geometry" dstClass="AbstractBounds"/>
-    <refactor srcPackage="org.geotools.geometry" srcClass="GeneralEnvelope" dstPackage="org.geotools.geometry" dstClass="GeneralBounds"/>
-    
-    <!-- step by step refactor of Envelope to avoid conflicts with jts Envelope -->
-    <!--
-    <refactor srcPackage="org.opengis.geometry" srcClass="Envelope" dstPackage="org.opengis.geometry" dstClass="Bounds"/>
-    -->
-    <echo level="info" message="Refactor: Envelope -&gt; Bounds"/>
-    <echo level="info" message="          (skipping files that import org.locationtech.jts.geom.Envelope)"/>
-    <fileset id="org.opengis.geometry.Envelope.safeFiles" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="org.opengis.geometry.Envelope" casesensitive="yes"/>
-      <not>
-        <contains text="import org.locationtech.jts.geom.Envelope;" casesensitive="yes"/>
-      </not>
-    </fileset>
-    <echo level="verbose">... ${toString:org.opengis.geometry.Envelope.safeFiles}</echo>
-    <!-- 
-    GOOD: Envelope
-          (Envelope)
-          <Envelope>
-          org.opengis.geometry.Envelope
-    BAD: "Envelope"                         (preserve text parameters)
-         CustomEnvelopeBounds               (preserve as part of class names)
-         sourceEnvelope                     (preserve as part of varaible names)
-         org.locationtech.jts.geom.Envelope (post-process to fix)
-    LITERAL: (cannot figure out how to avoid string literals, pre/post process)
-         "coverageA and coverageB should share the same Envelope or something";
-    -->
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="org.opengis.geometry.Envelope.safeFiles"/>
-      <regexp pattern="&quot;(.*?)Envelope(.*?)&quot;"/>
-      <substitution expression="&quot;\1_LITERAL_ENVELOPE_\2&quot;"/>
-    </replaceregexp>
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="org.opengis.geometry.Envelope.safeFiles"/>
-      <regexp pattern="(\s|\(|\&lt;|org\.opengis\.geometry\.)Envelope(;|&gt;|\)|\s)"/>
-      <substitution expression="\1Bounds\2"/>
-    </replaceregexp>
-    <echo level="info" message="          org.opengis.geometry.Envelope -&gt; org.opengis.geometry.Bounds"/>
-    <fileset id="org.opengis.geometry.Envelope.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="org.opengis.geometry.Envelope" casesensitive="yes"/>
-    </fileset>
-    <echo level="verbose">... ${toString:org.opengis.geometry.Envelope.files}</echo>
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="org.opengis.geometry.Envelope.files"/>
-      <regexp pattern="(\W)org.opengis.geometry.Envelope(\W)"/>
-      <substitution expression="\1org.opengis.geometry.Bounds\2"/>
-    </replaceregexp>
-    <!--
-    POSTPROCESS:
-        org.locationtech.jts.geom.Bounds (post-process to fix)>
-    -->
-    <replaceregexp byline="true" flags="g">
-      <fileset dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="org.locationtech.jts.geom.Bounds" casesensitive="yes"/>
-      </fileset>
-      <regexp pattern="(\W)org.locationtech.jts.geom.Bounds(\W)"/>
-      <substitution expression="\1org.locationtech.jts.geom.Envelope\2"/>
-    </replaceregexp>
-    <replaceregexp byline="true" flags="g">
-      <fileset dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-        <contains text="_LITERAL_ENVELOPE_" casesensitive="yes"/>
-      </fileset>
-      <regexp pattern="_LITERAL_ENVELOPE_"/>
-      <substitution expression="Envelope"/>
-    </replaceregexp>
-  </target>
-  
-  <target name="_envelope2d" description="Envelope2D removal">
-    <echo level="info"/>
-    <echo level="info" message="Remove Envelope2D, refactor code to use to ReferencedEnvelope"/>
-    <!-- pre: Envelope2D method cleanup -->
-    <fileset id="envelope2D.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="import org.geotools.geometry.Envelope2D;" casesensitive="yes"/>
-    </fileset>
-    <echo message="  new Envelope2D(crs,x,y,w,h): Use ReferencedEnvelope.rect(x,y,w,h,crs)"/>
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="envelope2D.files"/>
-      <regexp pattern="new Envelope2D\(\s*(.*?),\s*(.*?),\s*(.*?),\s*(.+?),\s*(.+?)\)"/>
-      <substitution expression="ReferencedEnvelope.rect(\2, \3\, \4, \5, \1)"/>
-    </replaceregexp>
-    <!-- refactor: Envelope2D to ReferencedEnvelope -->
-    <refactor srcPackage="org.geotools.geometry" srcClass="Envelope2D" dstPackage="org.geotools.geometry.jts" dstClass="ReferencedEnvelope"/>
-    
-    <!-- post: Envelope2D method cleanup -->
-    <fileset id="referencedEnvelope.files" dir="${project.dir}" includes="**/*.java" excludes="**/target/*">
-      <contains text="import org.geotools.geometry.jts.ReferencedEnvelope;" casesensitive="yes"/>
-    </fileset>
-    <echo message="       ReferencedEnvelope.create(envelope,crs): Use ReferencedEnvelope.envelope(envelope,crs)"/>
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="ReferencedEnvelope\.create\(\(Envelope\)\s*"/>
-      <substitution expression="ReferencedEnvelope.envelope("/>
-    </replaceregexp>
-    <replaceregexp byline="true" flags="g">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="ReferencedEnvelope\.create\((\w+nvelope),"/>
-      <substitution expression="ReferencedEnvelope.envelope(\1,"/>
-    </replaceregexp>
-    
-    <!-- match against variable names like sourceEnvelope.x -->
-    <echo message="       ReferencedEnvelope.getMinX()"/>
-    <replaceregexp flags="gs">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="(\w)nvelope\.x(\W)"/>
-      <substitution expression="\1nvelope.getMinX()\2"/>
-    </replaceregexp>
-    <echo message="       ReferencedEnvelope.getMinY()"/>
-    <replaceregexp flags="gs">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="(\w)nvelope\.y(\W)"/>
-      <substitution expression="\1nvelope.getMinY()\2"/>
-    </replaceregexp>
-    <echo message="       ReferencedEnvelope.getWidth()"/>
-    <replaceregexp flags="gs">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="(\w)nvelope\.width(\W)"/>
-      <substitution expression="\1nvelope.getWidth()\2"/>
-    </replaceregexp>
-    <echo message="       ReferencedEnvelope.getHeight()"/>
-    <replaceregexp flags="gs">
-      <fileset refid="referencedEnvelope.files"/>
-      <regexp pattern="(\w)nvelope\.height(\W)"/>
-      <substitution expression="\1nvelope.getHeight()\2"/>
-    </replaceregexp>
-  </target>
-
-  <target name="_geometry" description="Geometry API cleanup">
-    <echo level="info"/>
-    <echo level="info" message="Removing org.opengis.geometry.Geometry"/>
-    <!-- you cann use refid="Position.files" fileset after refactor -->
-    <refactor srcPackage="org.opengis.geometry.coordinate" srcClass="Polygon" dstPackage="org.locationtech.jts.geom" dstClass="Polygon"/>
-    <refactor srcPackage="org.opengis.geometry.coordinate" srcClass="Point" dstPackage="org.locationtech.jts.geom" dstClass="Point"/>
-    <refactor srcPackage="org.opengis.geometry.coordinate" srcClass="LineString" dstPackage="org.locationtech.jts.geom" dstClass="LineString"/>
-    <refactor srcPackage="org.opengis.geometry" srcClass="Geometry" dstPackage="org.locationtech.jts.geom" dstClass="Geometry"/>
-  </target>
-
-  <target name="_errors" description="change from org.geotools.metadata.i18n.Errors to MessageFormat">
-    <echo level="info" message="Error clean up"/>
-    <refactor srcPackage="org.geotools.metadata.i18n" srcClass="Errors" dstPackage="java.text" dstClass="MessageFormat"/>
-    <refactor srcPackage="org.geotools.renderer.i18n" srcClass="Errors" dstPackage="java.text" dstClass="MessageFormat"/>
-  </target>
-  
-  <target name="_dataStore" description="DataStore API cleanup">
-    <echo level="info"/>
-    <echo level="info" message="Moving org.geotools.data interfaces to org.geotools.api.data"/>
-    <!-- if star import was used for data, it will be required for api.data -->
-    <local name="data"/>
-    <local name="api.data"/>
-    <property name="data">org.geotools.data</property>
-    <property name="simple">org.geotools.data.simple</property>
-    <property name="api.data">org.geotools.api.data</property>
-    <moveFrom srcPackage="${data}"/>
-    <replaceregexp flags="g">
-      <fileset refid="org.geotools.data.files"/>
-      <regexp pattern="import org.geotools.data.\*;"/>
-      <substitution expression="import org.geotools.data.*;${line.separator}import org.geotools.api.data.*;"/>
-    </replaceregexp>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="AllQuery"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="AttributeReader"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="AttributeWriter"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="AutoCommitTransaction"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="BatchFeatureEvent"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="CloseableIterator"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="CurrentTransactionLock"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataAccess"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataAccessFactory"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataAccessFinder"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataSourceException"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataStore"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataStoreFactorySpi"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DataStoreFinder"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DelegatingFeatureReader"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="DelegatingFeatureWriter"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureEvent"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureListener"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureLock"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureLockException"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureLocking"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureReader"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureSource"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureStore"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FeatureWriter"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FIDReader"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FIDSQuery"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileDataStore"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileDataStoreFactorySpi"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileDataStoreFinder"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileGroupProvider"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileResourceInfo"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileServiceInfo"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FileStoreFactory"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="FilteringFileStoreFactory"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="Join"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="LockingManager"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="Parameter"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="Query"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="QueryCapabilities"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="Repository"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="ResourceInfo"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="ServiceInfo"/>
-    <moveTo srcPackage="${data}" dstPackage="${api.data}" class="Transaction"/>
-    
-    <moveFrom srcPackage="${simple}"/>
-    <moveTo srcPackage="${simple}" dstPackage="${api.data}" class="SimpleFeatureLocking"/>
-    <moveTo srcPackage="${simple}" dstPackage="${api.data}" class="SimpleFeatureReader"/>
-    <moveTo srcPackage="${simple}" dstPackage="${api.data}" class="SimpleFeatureSource"/>
-    <moveTo srcPackage="${simple}" dstPackage="${api.data}" class="SimpleFeatureStore"/>
-    <moveTo srcPackage="${simple}" dstPackage="${api.data}" class="SimpleFeatureWriter"/>
-
-    <echo level="info" message="data   META-INF/services"/>
-    <!-- Service INF -->
-    <fileset id="services.files" dir="${project.dir}">
-        <include name="**/META-INF/services/org.geotools.data.DataAccessFactory"/>
-        <include name="**/META-INF/services/org.geotools.data.DataStoreFactorySpi"/>
-        <include name="**/META-INF/services/org.geotools.data.FileDataStoreFactorySpi"/>
-        <exclude name="**/target/*"/>
-    </fileset>
-    <echo level="verbose">    ... ${toString:services.files}</echo>
-    <move todir="${project.dir}" verbose="true">
-      <fileset refid="services.files"/>
-      <regexpmapper from="(.*)/org\.geotools\.data\.(.*)" to="\1/org.geotools.api.data.\2"/>
-    </move>
-
-  </target>
-  
-  <target name="_opengis" description="Package change from org.opengis classes to org.geotools.api">
-    <echo level="info"/>
-    <echo level="info" message="Refactor org.opengis to org.geotools.api"/>
-    <!-- bulk replace * imports, may require more than one * import -->
-    <replace dir="${project.dir}" includes="**/*.java" summary="yes">
-      <replacefilter>
-        <replacetoken>org.opengis.</replacetoken>
-        <replacevalue>org.geotools.api.</replacevalue>
-      </replacefilter>
-    </replace>
-    <echo level="info" message="    META-INF/services"/>
-    <!-- Service INF -->
-    <fileset id="services.files" dir="${project.dir}">
-        <include name="**/META-INF/services/org.opengis.*"/>
-        <exclude name="**/target/*"/>
-    </fileset>
-    <echo level="verbose">    ... ${toString:services.files}</echo>
-    <move todir="${project.dir}" verbose="true">
-      <fileset refid="services.files"/>
-      <regexpmapper from="(.*)/org\.opengis\.(.*)" to="\1/org.geotools.api.\2"/>
-    </move>
-  </target>
-  
-  <target name="update" depends="starting-up,_filterFactory,_styling,_position,_bounds,_envelope2d,_geometry,_errors,_dataStore,_opengis" description="Update project in current directory to remove org.opengis package use">
-    <echo level="warning">UPDATE COMPLETED: ${project.dir}</echo>
-    <echo level="info"/>
-    <echo level="info">At the request of OGC https://www.ogc.org/standard/geoapi/ standard</echo>
-    <echo level="info">Your project has been refactored to change org.opengis to org.geotools.api</echo>
-    <echo level="info"/>
-    <echo level="info"> You may have unsued imports to clean up, but we believe your project will compile!</echo>
-  </target>
-</project>
diff --git a/build/bloop-export.sh b/build/scripts/bloop-export.sh
similarity index 73%
rename from build/bloop-export.sh
rename to build/scripts/bloop-export.sh
index 9c2de0532694..c1bdd87ba08b 100755
--- a/build/bloop-export.sh
+++ b/build/scripts/bloop-export.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-cd "$(dirname "$0")/.." || exit
+cd "$(dirname "$0")/../.." || exit
 
 mvn -Pbloop initialize ch.epfl.scala:bloop-maven-plugin:2.0.0:bloopInstall
diff --git a/build/calculate-cqs.sh b/build/scripts/calculate-cqs.sh
similarity index 97%
rename from build/calculate-cqs.sh
rename to build/scripts/calculate-cqs.sh
index 7c712d05fab4..51ddb949863d 100755
--- a/build/calculate-cqs.sh
+++ b/build/scripts/calculate-cqs.sh
@@ -8,6 +8,8 @@
 
 export LC_ALL=C # ensure stable sort order across different locales
 
+cd "$(dirname "$0")/../.." || exit
+
 rm build/cqs.tsv 2>/dev/null
 mvn dependency:tree -Dstyle.color=never > build/deps-raw
 grep ':compile' build/deps-raw | grep -v 'omitted' | grep -v 'org.locationtech.geomesa' | sed -e 's/\[INFO\] //' -e 's/[\| +-]*//' -e 's/(.*)//' -e 's/ //g' -e 's/\(.*\):\(.*\):jar:\(.*\):\(\w*\)/\1:\2\t\3\t\4/' | sort | uniq > build/cqs.tsv
diff --git a/build/change-scala-version.sh b/build/scripts/change-scala-version.sh
similarity index 98%
rename from build/change-scala-version.sh
rename to build/scripts/change-scala-version.sh
index 721d87167c06..ffa86f07cc00 100755
--- a/build/change-scala-version.sh
+++ b/build/scripts/change-scala-version.sh
@@ -35,7 +35,7 @@ if [[ ($# -ne 1) || ( $1 == "--help") ||  $1 == "-h" ]]; then
   usage
 fi
 
-BASEDIR=$(dirname "$0")/..
+BASEDIR="$(dirname "$0")/../.."
 TO_VERSION=$1
 FULL_VERSION=""
 
diff --git a/build/scripts/do-release.sh b/build/scripts/do-release.sh
new file mode 100755
index 000000000000..d43897808de3
--- /dev/null
+++ b/build/scripts/do-release.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/../.." || exit
+
+usage() {
+  echo "Usage: $(basename "$0") [-h|--help]
+where :
+  -h| --help Display this help text
+" 1>&2
+  exit 1
+}
+
+if [[ ($# -ne 0) || ( $1 == "--help") ||  $1 == "-h" ]]; then
+  usage
+fi
+
+readReleaseProp() {
+  grep "^$1=" release.properties | head -n1 | sed "s/$1=//"
+}
+
+readPomVersion() {
+  grep '^    <version>' "$1" | head -n1 | sed -E 's|.*<version>(.*)</version>.*|\1|'
+}
+
+copyReleaseArtifacts() {
+  while IFS= read -r -d '' file; do
+    pushd "$(dirname "$file")" >/dev/null
+    gpg --armor --detach-sign "$(basename "$file")"
+    sha256sum "$(basename "$file")" > "$(basename "$file").sha256"
+    popd >/dev/null
+    mv "$file"{,.sha256,.asc} "$RELEASE"
+  done < <(find geomesa-* -name '*-bin.tar.gz' -print0)
+}
+
+JAVA_VERSION="$(mvn help:evaluate -Dexpression=jdk.version -q -DforceStdout)"
+if ! [[ $(java -version 2>&1 | head -n 1 | cut -d'"' -f2) =~ ^$JAVA_VERSION.* ]]; then
+  echo "Error: invalid Java version - Java $JAVA_VERSION required"
+  exit 1
+fi
+
+if ! [[ $(which gpg) ]]; then
+  echo "Error: gpg executable not found"
+  exit 1
+fi
+
+# get current branch we're releasing off
+BRANCH="$(git branch --show-current)"
+
+# use the maven release plugin to prep the pom changes but use dryRun to skip commit and tag
+mvn release:prepare \
+  -DdryRun=true \
+  -DautoVersionSubmodules=true \
+  -Darguments="-DskipTests -Dmaven.javadoc.skip=true -Ppython" \
+  -Ppython
+
+RELEASE="$(readPomVersion pom.xml.tag)"
+TAG="$(readReleaseProp scm.tag)"
+NEXT="$(readPomVersion pom.xml.next)"
+
+# update README versions and commit
+for pom in pom.xml pom.xml.tag pom.xml.next; do
+  sed -i "s|<geomesa\.release\.version>.*|<geomesa.release.version>$RELEASE</geomesa.release.version>|" "$pom"
+  sed -i "s|<geomesa\.devel\.version>.*|<geomesa.devel.version>$NEXT</geomesa.devel.version>|" "$pom"
+done
+mvn clean install -pl .
+git commit -am "Set version for release $RELEASE"
+
+# commit release tag
+find . -name pom.xml -exec mv {}.tag {} \;
+git commit -am "[maven-release-plugin] prepare release $TAG"
+git tag "$TAG"
+
+# commit next dev version
+find . -name pom.xml -exec mv {}.next {} \;
+git commit -am "[maven-release-plugin] prepare for next development iteration"
+
+# clean up leftover release artifacts
+mvn release:clean
+
+# deploy to maven central
+git checkout "$TAG"
+mkdir -p "$RELEASE"
+
+mvn clean deploy -Pcentral,python -DskipTests | tee build_2.12.log
+copyReleaseArtifacts
+
+./build/scripts/change-scala-version.sh 2.13
+mvn clean deploy -Pcentral,python -DskipTests | tee build_2.13.log
+copyReleaseArtifacts
+
+# reset pom changes
+./build/scripts/change-scala-version.sh 2.12
+
+# push commits and tags
+git checkout "$BRANCH"
+git push lt "$BRANCH"
+git push lt "$TAG"
diff --git a/build/update-copyright-year.sh b/build/scripts/update-copyright-year.sh
similarity index 93%
rename from build/update-copyright-year.sh
rename to build/scripts/update-copyright-year.sh
index 92644f6a5197..63034a81df15 100755
--- a/build/update-copyright-year.sh
+++ b/build/scripts/update-copyright-year.sh
@@ -2,7 +2,7 @@
 
 to="$(date +%Y)"
 from="$((to - 1))"
-dir="$(cd "$(dirname "$0")/.." || exit; pwd)"
+dir="$(dirname "$0")/../.."
 
 sed -i "s|<copyright.year>$from</copyright.year>|<copyright.year>$to</copyright.year>|" "$dir/pom.xml"
 
diff --git a/build/README.md b/build/templates/README.md
similarity index 99%
rename from build/README.md
rename to build/templates/README.md
index 5981bc288b15..530c6171b2c3 100644
--- a/build/README.md
+++ b/build/templates/README.md
@@ -198,7 +198,7 @@ To run unit tests, omit the `-DskipTests` (note: requires `docker` to be availab
 GeoMesa also provides experimental support for the [Bloop](https://scalacenter.github.io/bloop/) compile server,
 which provides fast incremental compilation. To export the GeoMesa build to Bloop, run:
 
-    ./build/bloop-export.sh
+    ./build/scripts/bloop-export.sh
 
 For more information on using Bloop, refer to the
 [Bloop documentation](https://scalacenter.github.io/bloop/docs/build-tools/maven).
@@ -221,7 +221,7 @@ environment variable to point to the root of your JDK. Example from a Mac:
 
 To build for a different Scala version (e.g. 2.13), run the following script, then build as normal:
 
-    ./build/change-scala-version.sh 2.13
+    ./build/scripts/change-scala-version.sh 2.13
 
 ### Building on OS X
 
diff --git a/build/maven-badge.svg b/build/templates/maven-badge.svg
similarity index 100%
rename from build/maven-badge.svg
rename to build/templates/maven-badge.svg
diff --git a/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml b/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml
index 37ec282e8a82..9882f364bcc1 100644
--- a/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml
+++ b/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>geomesa-spark_2.12</artifactId>
         <groupId>org.locationtech.geomesa</groupId>
-        <version>5.0.0-SNAPSHOT</version>
+        <version>5.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index b9878bdbd8e2..340a9e5bf22d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
         <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
         <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
         <maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
-        <maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
+        <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
         <maven.shade.plugin.version>3.5.1</maven.shade.plugin.version>
         <!-- note: we use an older version that still supports using zinc compile server -->
         <scala.maven.plugin.version>3.4.4</scala.maven.plugin.version>
@@ -300,61 +300,6 @@
                             <deployAtEnd>false</deployAtEnd>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
-            <distributionManagement>
-                <repository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-            </distributionManagement>
-        </profile>
-
-        <profile>
-            <id>locationtech</id>
-            <distributionManagement>
-                <repository>
-                    <id>repo.eclipse.org</id>
-                    <name>GeoMesa Repository - Releases</name>
-                    <url>https://repo.eclipse.org/content/repositories/geomesa-releases/</url>
-                </repository>
-                <snapshotRepository>
-                    <id>repo.eclipse.org</id>
-                    <name>GeoMesa Repository - Snapshots</name>
-                    <url>https://repo.eclipse.org/content/repositories/geomesa-snapshots/</url>
-                </snapshotRepository>
-            </distributionManagement>
-        </profile>
-
-        <profile>
-            <id>dash</id>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>dash-licenses-releases</id>
-                    <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-
-        <profile>
-            <id>scoverage</id>
-            <properties>
-                <!-- disable surefire and failsafe tests to avoid duplicate testing by scoverage -->
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>cyclonedx</id>
-            <build>
-                <plugins>
                     <plugin>
                         <groupId>org.cyclonedx</groupId>
                         <artifactId>cyclonedx-maven-plugin</artifactId>
@@ -375,6 +320,24 @@
                     </plugin>
                 </plugins>
             </build>
+            <distributionManagement>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+            </distributionManagement>
+        </profile>
+
+        <profile>
+            <id>scoverage</id>
+            <properties>
+                <!-- disable surefire and failsafe tests to avoid duplicate testing by scoverage -->
+                <skipTests>true</skipTests>
+            </properties>
         </profile>
 
         <profile>
@@ -392,7 +355,7 @@
                 </dependency>
             </dependencies>
             <repositories>
-                <!-- secondary repo used by confluent -->
+                <!-- secondary repo used by confluent, required explicitly for some reason -->
                 <repository>
                     <id>jitpack.io</id>
                     <url>https://jitpack.io</url>
@@ -3405,7 +3368,7 @@
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
-                                    <directory>build</directory>
+                                    <directory>build/templates</directory>
                                     <includes>
                                         <include>README.md</include>
                                     </includes>
@@ -3426,9 +3389,9 @@
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
-                                    <directory>build</directory>
+                                    <directory>build/templates</directory>
                                     <includes>
-                                        <include>*.svg</include>
+                                        <include>maven-badge.svg</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
@@ -3608,7 +3571,7 @@
         <connection>scm:git:git@github.com:locationtech/geomesa.git</connection>
         <developerConnection>scm:git:git@github.com:locationtech/geomesa.git</developerConnection>
         <url>https://github.com/locationtech/geomesa</url>
-        <tag>geomesa-5.0.0-m.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
@@ -3622,6 +3585,11 @@
             <name>geomesa.org</name>
             <url>https://www.geomesa.org/</url>
         </site>
+        <snapshotRepository>
+            <id>repo.eclipse.org</id>
+            <name>GeoMesa Repository - Snapshots</name>
+            <url>https://repo.eclipse.org/content/repositories/geomesa-snapshots/</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <developers>
@@ -3705,4 +3673,26 @@
         </repository>
     </repositories>
 
+    <pluginRepositories>
+        <!-- include central so that it is searched before our alternate repos -->
+        <pluginRepository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>dash-licenses-releases</id>
+            <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>