diff --git a/ozone-distro-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/ozone-distro-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
index 5f2e1e0..6bde8d0 100644
--- a/ozone-distro-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
+++ b/ozone-distro-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -1,9 +1,10 @@
+import java.nio.file.Files
 import java.nio.file.Paths
 
-projectDirectory = Paths.get(request.outputDirectory, request.artifactId).toFile()
+projectDirectory = Paths.get(request.outputDirectory, request.artifactId);
 
 def run(String command) {
-    def process = command.execute(null, projectDirectory);
+    def process = command.execute(null, projectDirectory.toFile());
     process.consumeProcessOutput(System.out, System.err)
     process.waitFor()
     if (process.exitValue() != 0) {
@@ -12,3 +13,6 @@ def run(String command) {
 }
 
 run("mvn wrapper:wrapper")
+Files.move(projectDirectory.resolve(".mvn"), projectDirectory.resolve("scripts").resolve(".mvn"))
+Files.move(projectDirectory.resolve("mvnw"), projectDirectory.resolve("scripts").resolve("mvnw"))
+Files.move(projectDirectory.resolve("mvnw.cmd"), projectDirectory.resolve("scripts").resolve("mvnw.cmd"))
diff --git a/ozone-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/ozone-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index be26a75..d5c6852 100644
--- a/ozone-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/ozone-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -25,6 +25,11 @@ under the License.
 
   <requiredProperties>
     <requiredProperty key="distributionName" />
+    <requiredProperty key="version">
+      <!-- Work-around for https://issues.apache.org/jira/browse/ARCHETYPE-308
+           By using an expression, we should prompt for the value, with a default of 1.0.0-SNAPSHOT -->
+      <defaultValue>${package.getClass().forName("java.lang.String").getConstructor($package.getClass().forName("java.lang.String")).newInstance("1.0.0-SNAPSHOT")}</defaultValue>
+    </requiredProperty>
   </requiredProperties>
 
   <fileSets>
diff --git a/ozone-distro-archetype/src/main/resources/archetype-resources/config/frontend_config/.gitkeep b/ozone-distro-archetype/src/main/resources/archetype-resources/config/openmrs/frontend_config/.gitkeep
similarity index 100%
rename from ozone-distro-archetype/src/main/resources/archetype-resources/config/frontend_config/.gitkeep
rename to ozone-distro-archetype/src/main/resources/archetype-resources/config/openmrs/frontend_config/.gitkeep
diff --git a/ozone-distro-archetype/src/main/resources/archetype-resources/config/initializer_config/.gitkeep b/ozone-distro-archetype/src/main/resources/archetype-resources/config/openmrs/initializer_config/.gitkeep
similarity index 100%
rename from ozone-distro-archetype/src/main/resources/archetype-resources/config/initializer_config/.gitkeep
rename to ozone-distro-archetype/src/main/resources/archetype-resources/config/openmrs/initializer_config/.gitkeep
diff --git a/ozone-distro-archetype/src/main/resources/archetype-resources/readme/impl-guide.md b/ozone-distro-archetype/src/main/resources/archetype-resources/readme/impl-guide.md
index 89e7086..8dcc787 100644
--- a/ozone-distro-archetype/src/main/resources/archetype-resources/readme/impl-guide.md
+++ b/ozone-distro-archetype/src/main/resources/archetype-resources/readme/impl-guide.md
@@ -29,7 +29,7 @@ source target/go-to-scripts-dir.sh
 
 Re-build:
 ```bash
-./mvnw clean package
+./scripts/mvnw clean package
 ```
 
 Then start afresh: