diff --git a/.gitattributes b/.gitattributes
index bdb0cabc..f8bb7565 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,3 +15,12 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary
\ No newline at end of file
diff --git a/.github/gradle/publish-mendix-gradle-plugin.gradle b/.github/gradle/publish-mendix-gradle-plugin.gradle
new file mode 100644
index 00000000..fcc33b4e
--- /dev/null
+++ b/.github/gradle/publish-mendix-gradle-plugin.gradle
@@ -0,0 +1,16 @@
+allprojects {
+    pluginManager.withPlugin( 'maven-publish' ) {
+        publishing {
+            repositories {
+                maven {
+                    name = "GitHubPackages"
+                    url = "https://maven.pkg.github.com/mendix/MxPushNotifications"
+                    credentials {
+                        username = System.getenv("GITHUB_ACTOR")
+                        password = System.getenv("GITHUB_TOKEN")
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml
new file mode 100644
index 00000000..3bfffb79
--- /dev/null
+++ b/.github/workflows/build-module.yml
@@ -0,0 +1,50 @@
+name: Build module
+on:
+  workflow_call:
+    outputs:
+      package-json-version:
+        value: ${{ jobs.build-widget.outputs.package-json-version }}
+      package-xml-version:
+        value: ${{ jobs.build-widget.outputs.package-xml-version }}
+      build-gradle-version:
+        value: ${{ jobs.build-module.outputs.build-gradle-version }}
+jobs:
+  build-widget:
+    uses: ./.github/workflows/build-widget.yml
+    secrets: inherit
+  build-module:
+    runs-on: windows-latest
+    needs: build-widget
+    outputs:
+      build-gradle-version: ${{ steps.build-gradle-version.outputs.build-gradle-version }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # 4.7.1
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # 4.3.1
+      - name: Get version from build.gradle
+        id: build-gradle-version
+        run: |
+          echo "build-gradle-version=$(./gradlew -q printModuleVersion)" >> $env:GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Show versions
+        run: |
+          echo "Version in build.gradle: ${{ steps.build-gradle-version.outputs.build-gradle-version }}"
+      - name: "Detected module version"
+        run: echo $env:MODULE_VERSION
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # 4.2.1
+        with:
+          name: widget
+          path: module/widgets/
+      - name: Build module
+        run: ./gradlew buildModule
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
+        with:
+          name: module
+          path: module/dist/PushNotifications-${{ steps.build-gradle-version.outputs.build-gradle-version }}.mpk
+          compression-level: 0
\ No newline at end of file
diff --git a/.github/workflows/build-widget.yml b/.github/workflows/build-widget.yml
new file mode 100644
index 00000000..5426112d
--- /dev/null
+++ b/.github/workflows/build-widget.yml
@@ -0,0 +1,50 @@
+name: Build widget
+on:
+  workflow_call:
+    outputs:
+      package-json-version:
+        value: ${{ jobs.build.outputs.package-json-version }}
+      package-xml-version:
+        value: ${{ jobs.build.outputs.package-xml-version }}
+defaults:
+  run:
+    working-directory: ./widget
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      package-json-version: ${{ steps.package-json-version.outputs.package-json-version }}
+      package-xml-version: ${{ steps.package-xml-version.outputs.info }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        with:
+          sparse-checkout: widget
+      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # 4.3.0
+        with:
+          node-version: 6
+          cache: "npm"
+          cache-dependency-path: widget/package-lock.json
+      - name: Get version from package.json
+        id: package-json-version
+        working-directory: widget
+        run: |
+          echo "package-json-version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+      - name: Get version from package.xml
+        id: package-xml-version
+        uses: mavrosxristoforos/get-xml-info@afaa5058ead44cfaff92c6a861b46dd7a8929f60 # 2.0.0
+        with:
+          xml-file: "widget/src/package.xml"
+          xpath: "//*[local-name()='clientModule']/@version"
+      - name: Show versions
+        run: |
+          echo "Version in package.json: ${{ steps.package-json-version.outputs.package-json-version }}"
+          echo "Version in package.xml: ${{ steps.package-xml-version.outputs.info }}"
+      - name: "Install dependencies"
+        run: npm install
+      - name: "Build widget"
+        run: npm run build
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
+        with:
+          name: widget
+          path: widget/dist/MxPushNotifications.mpk
+          compression-level: 0
diff --git a/.github/workflows/export-mpk.yml b/.github/workflows/export-mpk.yml
deleted file mode 100644
index ee696a68..00000000
--- a/.github/workflows/export-mpk.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-name: Export module package
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
-        with:
-          path: app
-          
-      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
-        with:
-          repository: 'mendixlabs/mx-docker-tools'
-          path: 'mx-tools'
-          
-      - name: Define MX_VERSION
-        run: |
-          cd $GITHUB_WORKSPACE/app/test
-          VERSION=$(sqlite3 PushNotfications.mpr 'SELECT _ProductVersion FROM _MetaData LIMIT 1')
-          echo "Detected Mendix version: $VERSION"
-          echo "MX_VERSION=$VERSION" >> $GITHUB_ENV
-          
-      - name: Read package.json
-        id: set_module_version
-        run: |
-          content=`cat $GITHUB_WORKSPACE/app/package.json`
-          # the following lines are only required for multi line json
-          content="${content//'%'/'%25'}"
-          content="${content//$'\n'/'%0A'}"
-          content="${content//$'\r'/'%0D'}"
-          # end of optional handling for multi line json
-          echo "::set-output name=packageJson::$content"
-
-      - name: Define MODULE_VERSION
-        run: |
-          MODULE_VERSION=${{fromJson(steps.set_module_version.outputs.packageJson).version}}
-          echo "Detected module version: $MODULE_VERSION"
-          echo "MODULE_VERSION=$MODULE_VERSION" >> $GITHUB_ENV
-      
-      - name: Create output directory
-        run: mkdir $GITHUB_WORKSPACE/out
-            
-      - name: Build MX Util
-        run: |
-          cd $GITHUB_WORKSPACE/mx-tools
-          make version=${{env.MX_VERSION}} build
-          
-      - name: Run MX Util
-        run: |
-          MX_TOOLS_IMAGE="mendixlabs/mx-docker-tools:"${{env.MX_VERSION}}
-          mkdir { $GITHUB_WORKSPACE/app/tmp, $GITHUB_WORKSPACE/app/dist }
-          docker run -v $GITHUB_WORKSPACE/app:/opt/app -i $MX_TOOLS_IMAGE mxutil.exe create-module-package --package-dir /opt/app/tmp /opt/app/test/PushNotfications.mpr "PushNotifications" --filter-required-libs --exclude-files="resources" | tee $GITHUB_WORKSPACE/out/mxutil.log
-          cp -f $GITHUB_WORKSPACE/app/tmp/PushNotifications.mpk $GITHUB_WORKSPACE/app/dist/PushNotifications-${{env.MODULE_VERSION}}.mpk
-
-      - name: Remove non-whitelisted widgets
-        run: |
-          TEMP_UNZIP_FOLDER="$GITHUB_WORKSPACE/temp"
-          TARGET_MPK="$GITHUB_WORKSPACE/app/dist/PushNotifications-${{env.MODULE_VERSION}}.mpk"
-          ALLOWED_LIST="$GITHUB_WORKSPACE/app/widgets-whitelist.txt"
-          if [ ! -f "$ALLOWED_LIST" ]; then 
-            echo “Unable to find file widgets-whitelist.txt”
-            exit 1; 
-          fi
-          if [ -d "$TEMP_UNZIP_FOLDER" ]; then rm -Rf $TEMP_UNZIP_FOLDER; fi
-          mkdir $TEMP_UNZIP_FOLDER
-          unzip -x $TARGET_MPK -d $TEMP_UNZIP_FOLDER
-          cd "$TEMP_UNZIP_FOLDER/widgets"
-          for i in *; do
-            if ! grep -q "$i" $ALLOWED_LIST; then
-              echo "Removing widget: $i" | tee -a $GITHUB_WORKSPACE/out/removed-widgets.log
-              rm "$i"
-              sed -i "/$i/d" $TEMP_UNZIP_FOLDER/package.xml
-            fi
-          done
-          
-          cd $TEMP_UNZIP_FOLDER
-          zip -r PushNotifications-${{env.MODULE_VERSION}}.mpk *
-          mv -f PushNotifications-${{env.MODULE_VERSION}}.mpk $GITHUB_WORKSPACE/app/dist/
-          if [ -d "$TEMP_UNZIP_FOLDER" ]; then rm -Rf $TEMP_UNZIP_FOLDER; fi
-      
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: v${{env.MODULE_VERSION}}
-          release_name: Marketplace release v${{env.MODULE_VERSION}}
-          body: |
-            (insert release notes)
-          commitish: master
-          draft: true
-          prerelease: false
-
-      - name: Upload release asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
-          asset_path: ${{ github.workspace }}/app/dist/PushNotifications-${{env.MODULE_VERSION}}.mpk
-          asset_name: PushNotifications-${{env.MODULE_VERSION}}.mpk
-          asset_content_type: application/zip
-      
-      - name: Archive results
-        if: ${{ always() }}
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2
-        with:
-          name: Results
-          path: ${{ github.workspace }}/out/*
diff --git a/.github/workflows/publish-mendix-gradle-plugin.yml b/.github/workflows/publish-mendix-gradle-plugin.yml
new file mode 100644
index 00000000..b7a01249
--- /dev/null
+++ b/.github/workflows/publish-mendix-gradle-plugin.yml
@@ -0,0 +1,29 @@
+name: Publish Mendix Gradle plugin
+on:
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        with:
+          repository: 'mendixlabs/mendix-gradle-plugin'
+          ref: '114bde309b52b037583d95a9beffee18eb71b65f'
+          ssh-key: ${{ secrets.MENDIX_GRADLE_PLUGIN_SSH }}
+          ssh-strict: false
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        with:
+          path: repo
+          sparse-checkout: .github/gradle
+      - run: cp repo/.github/gradle/publish-mendix-gradle-plugin.gradle ./
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # 4.7.1
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # 4.3.1
+      - name: Build mendix-gradle-plugin
+        run: |
+          echo "kotlin.jvm.target.validation.mode = IGNORE" >> gradle.properties
+          ./gradlew -I publish-mendix-gradle-plugin.gradle build publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 00000000..d07f5003
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,10 @@
+name: Pull request
+on:
+  pull_request:
+jobs:
+  build-module:
+    uses: ./.github/workflows/build-module.yml
+    secrets: inherit
+  snyk:
+    uses: ./.github/workflows/snyk.yml
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/push-stable.yml b/.github/workflows/push-stable.yml
new file mode 100644
index 00000000..19e06cfd
--- /dev/null
+++ b/.github/workflows/push-stable.yml
@@ -0,0 +1,13 @@
+name: Push to stable branch
+on:
+  push:
+    branches:
+      - "master"
+      - "mx8"
+jobs:
+  snyk:
+    uses: ./.github/workflows/snyk.yml
+    with:
+      command: "monitor"
+      suffix: -${{ github.ref_name }}
+    secrets: inherit
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
new file mode 100644
index 00000000..4cd8b1d4
--- /dev/null
+++ b/.github/workflows/release-draft.yml
@@ -0,0 +1,58 @@
+name: Create release draft
+on:
+  push:
+    branches:
+      - master
+      - mx8
+    tags:
+      - v*.*.*
+jobs:
+  build-module:
+    uses: ./.github/workflows/build-module.yml
+    secrets: inherit
+  check-version:
+    runs-on: ubuntu-latest
+    needs:
+      - build-module
+    steps:
+      - run: |
+          if [[ ${{ needs.build-module.outputs.package-json-version }} != ${{ needs.build-module.outputs.package-xml-version }} || ${{ needs.build-module.outputs.package-json-version }} != ${{ needs.build-module.outputs.build-gradle-version }} ]]; then
+            echo "Versions do not match"
+            echo "package.json version: ${{ needs.build-module.outputs.package-json-version }}"
+            echo "package.xml version: ${{ needs.build-module.outputs.package-xml-version }}"
+            echo "build.gradle version: ${{ needs.build-module.outputs.build-gradle-version }}"
+            exit 1
+          fi
+  documentation:
+    runs-on: ubuntu-latest
+    environment: docs
+    steps:
+      - run: echo "Documentation is ready"
+  create-draft-release:
+    needs:
+      - check-version
+      - documentation
+      - build-module
+    runs-on: ubuntu-latest
+    #if: github.ref_type == 'tag'
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        with:
+          sparse-checkout: .
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # 4.2.1
+        with:
+          name: module
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # 4.2.1
+        with:
+          name: widget
+      - uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # 2.2.1
+        with:
+          name: "Marketplace release v${{ needs.build-module.outputs.build-gradle-version }}"
+          body_path: CHANGELOG.md
+          draft: true
+          files: |
+            *.mpk
+            LICENSE
+          fail_on_unmatched_files: true
+          generate_release_notes: false
+          make_latest: ${{ github.ref_name == 'master' }}
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
index f8588b84..13d211a6 100644
--- a/.github/workflows/snyk.yml
+++ b/.github/workflows/snyk.yml
@@ -1,19 +1,39 @@
-name: Run Snyk scan
-
+name: Run Snyk scans
 on:
-  push:
-    branches: [ "master" ]
+  workflow_call:
+    inputs:
+      command:
+        type: string
+        required: false
+        default: 'test'
+      suffix:
+        type: string
+        required: false
   workflow_dispatch:
-  
 jobs:
-  snyk-test:
+  gradle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
-      - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/gradle@7fc2a503b9b624bc777982df99412478ca61f05a # master
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+      - name: Run Snyk (Gradle)
+        uses: snyk/actions/gradle@b98d498629f1c368650224d6d212bf7dfa89e4bf # 0.4.0
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_gprusername: ${{ env.GITHUB_ACTOR }}
+          ORG_GRADLE_PROJECT_gprpassword: ${{ secrets.GITHUB_TOKEN }}
         with:
-          command: monitor
-          args: --project-name="MxPushNotifications" --file=build.gradle
+          command: ${{ inputs.command }}
+          args: --project-name="gradle${{ inputs.suffix }}" --file=module/build.gradle
+  node:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+      - name: Run Snyk (Node)
+        uses: snyk/actions/node@b98d498629f1c368650224d6d212bf7dfa89e4bf # 0.4.0
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          command: ${{ inputs.command }}
+          args: --project-name="node${{ inputs.suffix }}" --file=widget/package.json
diff --git a/.gitignore b/.gitignore
index 84a13ecb..5755a7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
-test/javasource/administration/proxies/
-test/javasource/communitycommons/proxies/
-test/javasource/pushnotifications/proxies/
-test/javasource/system/proxies/
-test/javasource/myfirstmodule/proxies/
-test/javasource/encryption/proxies/
-test/deployment/
-test/.classpath
-test/.mendix-cache/
-test/.project
-test/.svn/
-test/resources/Firestore/
+module/javasource/administration/proxies/
+module/javasource/communitycommons/proxies/
+module/javasource/pushnotifications/proxies/
+module/javasource/system/proxies/
+module/javasource/myfirstmodule/proxies/
+module/javasource/encryption/proxies/
+module/deployment/
+module/theme-cache/
+module/.classpath
+module/.mendix-cache/
+module/.project
+module/.svn/
+module/resources/Firestore/
 
 *.launch
 *.tmp
@@ -20,8 +21,12 @@ build/
 
 dist/
 
-node_modules/
+widget/node_modules/
 .editorconfig
 *DS_Store*
 .vscode/
 *.bak
+
+module/userlib/*.jar
+module/userlib/*.RequiredLib
+module/widgets/MxPushNotifications.mpk
diff --git a/test/userlib/animal-sniffer-annotations-1.17.jar.CommunityCommons.RequiredLib b/CHANGELOG.md
similarity index 100%
rename from test/userlib/animal-sniffer-annotations-1.17.jar.CommunityCommons.RequiredLib
rename to CHANGELOG.md
diff --git a/README.md b/README.md
index 1166bc23..bf5d3ce1 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,73 @@
+## Module usage
+
 Please see [Push Notifications Connector](https://docs.mendix.com/appstore/modules/push-notifications) in the Mendix documentation for details.
+
+## Development
+
+### Widget
+
+#### Requirements
+
+- Node.js (v6+)
+- nvm (optional)
+
+#### Setup
+
+```bash
+cd widget
+npm i
+```
+
+#### Build
+
+```bash
+npm run build
+```
+
+### Module
+
+#### Requirements
+
+- JDK
+
+#### Setup
+
+```bash
+./gradlew.bat updateUserLibs
+```
+
+#### Build
+
+```bash
+# Do not update Java dependencies
+./gradlew.bat exportModule
+```
+
+or
+
+```bash
+# Update Java dependencies before export
+./gradlew.bat buildModule
+```
+
+The resulting module package is placed in `module/dist/PushNotifications-<version>.mpk`.
+
+## Release process
+
+- Create (and switch to) a new branch
+- Bump the version number in `module/gradle.build`
+- Bump the version number in `widget/package.json`
+- Bump the version number inside the module
+- Push the branch and create an MR
+- Merge the MR
+- Tag the resulting commit on `master`/`mx8` with `v*.*.*`
+- Push the tag
+- Follow the steps in the resulting pipeline
+
+## Notes
+
+The userlibs for the PushNotifications module are not part of the repo.
+To fetch them, run the `updateUserLibs` task after checking out the repo (and after switching branches).
+
+Changes to the `userlib` folder are ignored by git.
+If you make any changes to the libraries required by other modules, you must commit these explicitly, using e.g. `git add -f <path>`.
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 813c80fd..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,142 +0,0 @@
-apply plugin: 'java'
-
-sourceCompatibility = '1.8'
-[compileJava]*.options*.encoding = 'UTF-8'
-
-import org.gradle.api.internal.file.copy.CopySpecInternal
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
-    }
-    dependencies {
-        classpath 'org.owasp:dependency-check-gradle:6.0.2'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.26.0'
-    }
-}
-
-apply plugin: 'org.owasp.dependencycheck'
-apply plugin: 'com.github.ben-manes.versions'
-
-project.ext {
-    PNC_VERSION = '7.4.2'
-    MXBUILD_VERSION = '9.24.0.2965'
-    MODULE_NAME = 'PushNotifications'
-}
-
-def runtimeLibs = "$buildDir/runtime/bundles"
-def monoPath = '/Library/Frameworks/Mono.framework/Versions/Current/Commands'
-
-def userLibDir = "$projectDir/userlib-generated"
-def testProject = "$projectDir/PushNotfications.mpr"
-
-configurations {
-    tar
-}
-
-repositories {
-    mavenCentral()
-    ivy {
-        url 'https://cdn.mendix.com/'
-        patternLayout {
-            artifact '/[organisation]/[module]-[revision].[ext]'
-        }
-        metadataSources {
-            artifact()
-        }
-    }
-}
-
-dependencies {
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
-    implementation group: 'commons-codec', name: 'commons-codec', version: '1.15'
-
-    implementation('com.google.auth:google-auth-library-oauth2-http:1.7.0') {
-        exclude group: 'com.google.code.gson', module: 'gson'
-        exclude group: 'com.google.guava', module: 'guava'
-    }
-
-    implementation('com.google.guava:guava') {
-        version {
-            strictly '32.0.1-android'
-        }
-    }
-    
-    implementation('com.turo:pushy:0.13.10') {
-        exclude group: 'io.netty', module: 'netty-codec-http2'
-        exclude group: 'io.netty', module: 'netty-handler-proxy'
-        exclude group: 'io.netty', module: 'netty-resolver-dns'
-        exclude group: 'com.google.code.gson', module: 'gson'
-    }
-    
-    implementation('io.netty:netty-codec-http2') {
-        version {
-            strictly '4.2.0.Final'
-        }
-    }
-
-    implementation('io.netty:netty-handler-proxy') {
-        version {
-            strictly '4.2.0.Final'
-        }
-    }
-
-    implementation('io.netty:netty-resolver-dns') {
-        version {
-            strictly '4.2.0.Final'
-        }
-    }
-
-    implementation('com.google.code.gson:gson') {
-        version {
-            strictly '2.9.0'
-        }
-    }
-
-    tar "runtime:mxbuild:${project.MXBUILD_VERSION}@tar.gz"
-}
-
-task extractModule( type: Exec ) {
-    if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-        executable "$buildDir/modeler/mxutil.exe"
-        args 'create-module-package', '--filter-required-libs', '--exclude-files=resources/.*', "--package-dir=${projectDir}/dist/${project.PNC_VERSION}/module", testProject, project.MODULE_NAME
-    } else {
-        executable "$monoPath/mono"
-        args "$buildDir/modeler/mxutil.exe", 'create-module-package', '--filter-required-libs', '--exclude-files=resources/.*', "--package-dir=${projectDir}/dist/${project.PNC_VERSION}/module", testProject, project.MODULE_NAME
-    }
-}
-
-extractModule.doFirst {
-    mkdir "${projectDir}/dist/${project.PNC_VERSION}/module"
-}
-
-task copyToUserlib( type: Copy ) {
-    into userLibDir
-    from configurations.runtimeClasspath
-    eachFile { fileCopyDetails ->
-        def requiredLibFlag = new File(destinationDir, "${fileCopyDetails.name}.${project.MODULE_NAME}.RequiredLib")
-        requiredLibFlag.write ''
-    }
-}
-
-task untarMxbuild( type: Copy ) {
-    configurations.tar.findAll{it.name.endsWith('tar.gz')}.each {
-        from tarTree(resources.gzip(it))
-        into buildDir
-        include('**/modeler/**')
-        includeEmptyDirs = false
-    }
-}
-
-task prepareDeps {
-    dependsOn 'clean', 'copyToUserlib', 'untarMxbuild'
-}
-
-clean {
-    delete "$userLibDir"
-}
-
-tasks.untarMxbuild.shouldRunAfter tasks.copyToUserlib
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..a4b76b95
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..37f853b1
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..f5feea6d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..9d21a218
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/test/LICENSE b/module/LICENSE
similarity index 100%
rename from test/LICENSE
rename to module/LICENSE
diff --git a/test/PushNotfications.mpr b/module/PushNotifications.mpr
old mode 100755
new mode 100644
similarity index 99%
rename from test/PushNotfications.mpr
rename to module/PushNotifications.mpr
index a36d08cd..bb9ec3e3
Binary files a/test/PushNotfications.mpr and b/module/PushNotifications.mpr differ
diff --git a/module/build.gradle b/module/build.gradle
new file mode 100644
index 00000000..50768b0d
--- /dev/null
+++ b/module/build.gradle
@@ -0,0 +1,122 @@
+plugins {
+    id "application"
+    id "com.mendixlabs.mendix-gradle-plugin" version "0.0.5"
+}
+
+repositories {
+    mavenCentral()
+}
+
+mendix {
+    mendixVersion = "9.24.0.2965"
+    mprFileName = "module/PushNotifications.mpr"
+}
+
+project.ext {
+    PNC_VERSION = '7.4.2'
+    MODULE_NAME = 'PushNotifications'
+}
+
+def userLibDir = "$projectDir/userlib"
+
+dependencies {
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.15'
+
+    implementation('com.google.auth:google-auth-library-oauth2-http:1.7.0') {
+        exclude group: 'com.google.code.gson', module: 'gson'
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+
+    implementation('com.google.guava:guava') {
+        version {
+            strictly '32.0.1-android'
+        }
+    }
+
+    implementation('com.turo:pushy:0.13.10') {
+        exclude group: 'io.netty', module: 'netty-codec-http2'
+        exclude group: 'io.netty', module: 'netty-handler-proxy'
+        exclude group: 'io.netty', module: 'netty-resolver-dns'
+        exclude group: 'com.google.code.gson', module: 'gson'
+    }
+
+    implementation('io.netty:netty-codec-http2') {
+        version {
+            strictly '4.2.0.Final'
+        }
+    }
+
+    implementation('io.netty:netty-handler-proxy') {
+        version {
+            strictly '4.2.0.Final'
+        }
+    }
+
+    implementation('io.netty:netty-resolver-dns') {
+        version {
+            strictly '4.2.0.Final'
+        }
+    }
+
+    implementation('com.google.code.gson:gson') {
+        version {
+            strictly '2.9.0'
+        }
+    }
+}
+
+tasks.register('printModuleVersion') {
+    println project.PNC_VERSION
+}
+
+tasks.register('updateUserLibs', Copy) {
+    dependsOn 'cleanUserLibs'
+    into userLibDir
+    from configurations.runtimeClasspath
+    eachFile { fileCopyDetails ->
+        def requiredLibFlag = new File(destinationDir, "${fileCopyDetails.name}.${project.MODULE_NAME}.RequiredLib")
+        requiredLibFlag.write ''
+    }
+}
+
+tasks.register('cleanUserLibs', Delete) {
+    fileTree(userLibDir).each {userlib ->
+        def matcher = userlib.name =~ /^(.*\.jar)\.$project.MODULE_NAME\.RequiredLib$/
+        if (matcher.matches()) {
+            def jarPath = "$userLibDir/${matcher.group(1)}"
+            def requiredLibPath = userlib
+            delete files(jarPath, requiredLibPath)
+        }
+    }
+}
+
+tasks.register('buildModule') {
+    dependsOn tasks.updateUserLibs, tasks.exportModule
+}
+
+tasks.register('exportModule') {
+    dependsOn tasks.mxutil {
+        args = ["create-module-package", "--filter-required-libs", "--package-dir=dist", "--exclude-files=resources", "PushNotifications.mpr", project.MODULE_NAME]
+    }
+
+    finalizedBy tasks.fixWidgets, tasks.cleanModule
+}
+
+tasks.register('fixWidgets', Zip) {
+    archiveFileName = "PushNotifications-${project.PNC_VERSION}.mpk"
+    destinationDirectory = layout.projectDirectory.dir('dist')
+    from zipTree('dist/PushNotifications.mpk').matching {
+        exclude 'widgets/**'
+    }
+    into("widgets") {
+        from file("widgets/MxPushNotifications.mpk")
+    }
+}
+
+tasks.register('cleanModule', Delete) {
+    delete 'dist/PushNotifications.mpk'
+}
+
+tasks.exportModule.mustRunAfter tasks.updateUserLibs
+tasks.cleanModule.mustRunAfter tasks.fixWidgets
diff --git a/test/javascriptsource/datawidgets/actions/Export_To_Excel.js b/module/javascriptsource/datawidgets/actions/Export_To_Excel.js
similarity index 100%
rename from test/javascriptsource/datawidgets/actions/Export_To_Excel.js
rename to module/javascriptsource/datawidgets/actions/Export_To_Excel.js
diff --git a/test/javascriptsource/datawidgets/actions/Reset_All_Filters.js b/module/javascriptsource/datawidgets/actions/Reset_All_Filters.js
similarity index 100%
rename from test/javascriptsource/datawidgets/actions/Reset_All_Filters.js
rename to module/javascriptsource/datawidgets/actions/Reset_All_Filters.js
diff --git a/test/javascriptsource/datawidgets/actions/Reset_Filter.js b/module/javascriptsource/datawidgets/actions/Reset_Filter.js
similarity index 100%
rename from test/javascriptsource/datawidgets/actions/Reset_Filter.js
rename to module/javascriptsource/datawidgets/actions/Reset_Filter.js
diff --git a/test/javascriptsource/datawidgets/actions/xlsx-export-tools.js b/module/javascriptsource/datawidgets/actions/xlsx-export-tools.js
similarity index 100%
rename from test/javascriptsource/datawidgets/actions/xlsx-export-tools.js
rename to module/javascriptsource/datawidgets/actions/xlsx-export-tools.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Base64Decode.js b/module/javascriptsource/nanoflowcommons/actions/Base64Decode.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Base64Decode.js
rename to module/javascriptsource/nanoflowcommons/actions/Base64Decode.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Base64DecodeToImage.js b/module/javascriptsource/nanoflowcommons/actions/Base64DecodeToImage.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Base64DecodeToImage.js
rename to module/javascriptsource/nanoflowcommons/actions/Base64DecodeToImage.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Base64Encode.js b/module/javascriptsource/nanoflowcommons/actions/Base64Encode.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Base64Encode.js
rename to module/javascriptsource/nanoflowcommons/actions/Base64Encode.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/CallPhoneNumber.js b/module/javascriptsource/nanoflowcommons/actions/CallPhoneNumber.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/CallPhoneNumber.js
rename to module/javascriptsource/nanoflowcommons/actions/CallPhoneNumber.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ClearCachedSessionData.js b/module/javascriptsource/nanoflowcommons/actions/ClearCachedSessionData.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ClearCachedSessionData.js
rename to module/javascriptsource/nanoflowcommons/actions/ClearCachedSessionData.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ClearLocalStorage.js b/module/javascriptsource/nanoflowcommons/actions/ClearLocalStorage.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ClearLocalStorage.js
rename to module/javascriptsource/nanoflowcommons/actions/ClearLocalStorage.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/DraftEmail.js b/module/javascriptsource/nanoflowcommons/actions/DraftEmail.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/DraftEmail.js
rename to module/javascriptsource/nanoflowcommons/actions/DraftEmail.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/FindObjectWithGUID.js b/module/javascriptsource/nanoflowcommons/actions/FindObjectWithGUID.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/FindObjectWithGUID.js
rename to module/javascriptsource/nanoflowcommons/actions/FindObjectWithGUID.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.js b/module/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.js
rename to module/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.json b/module/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.json
rename to module/javascriptsource/nanoflowcommons/actions/GenerateUniqueID.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/Geocode.js b/module/javascriptsource/nanoflowcommons/actions/Geocode.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Geocode.js
rename to module/javascriptsource/nanoflowcommons/actions/Geocode.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Geocode.json b/module/javascriptsource/nanoflowcommons/actions/Geocode.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Geocode.json
rename to module/javascriptsource/nanoflowcommons/actions/Geocode.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.js b/module/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.js
rename to module/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.json b/module/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.json
rename to module/javascriptsource/nanoflowcommons/actions/GetCurrentLocation.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.js b/module/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.js
rename to module/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.json b/module/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.json
rename to module/javascriptsource/nanoflowcommons/actions/GetCurrentLocationMinimumAccuracy.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetGuid.js b/module/javascriptsource/nanoflowcommons/actions/GetGuid.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetGuid.js
rename to module/javascriptsource/nanoflowcommons/actions/GetGuid.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetObjectByGuid.js b/module/javascriptsource/nanoflowcommons/actions/GetObjectByGuid.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetObjectByGuid.js
rename to module/javascriptsource/nanoflowcommons/actions/GetObjectByGuid.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetPlatform.js b/module/javascriptsource/nanoflowcommons/actions/GetPlatform.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetPlatform.js
rename to module/javascriptsource/nanoflowcommons/actions/GetPlatform.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetRemoteUrl.js b/module/javascriptsource/nanoflowcommons/actions/GetRemoteUrl.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetRemoteUrl.js
rename to module/javascriptsource/nanoflowcommons/actions/GetRemoteUrl.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.js b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.js
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.json b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.json
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemObject.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.js b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.js
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.json b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.json
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemObjectList.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemString.js b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemString.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemString.js
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemString.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStorageItemString.json b/module/javascriptsource/nanoflowcommons/actions/GetStorageItemString.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStorageItemString.json
rename to module/javascriptsource/nanoflowcommons/actions/GetStorageItemString.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/GetStraightLineDistance.js b/module/javascriptsource/nanoflowcommons/actions/GetStraightLineDistance.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/GetStraightLineDistance.js
rename to module/javascriptsource/nanoflowcommons/actions/GetStraightLineDistance.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/HideProgress.js b/module/javascriptsource/nanoflowcommons/actions/HideProgress.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/HideProgress.js
rename to module/javascriptsource/nanoflowcommons/actions/HideProgress.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/IsConnectedToServer.js b/module/javascriptsource/nanoflowcommons/actions/IsConnectedToServer.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/IsConnectedToServer.js
rename to module/javascriptsource/nanoflowcommons/actions/IsConnectedToServer.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/LICENSE b/module/javascriptsource/nanoflowcommons/actions/LICENSE
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/LICENSE
rename to module/javascriptsource/nanoflowcommons/actions/LICENSE
diff --git a/test/javascriptsource/nanoflowcommons/actions/NavigateTo.js b/module/javascriptsource/nanoflowcommons/actions/NavigateTo.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/NavigateTo.js
rename to module/javascriptsource/nanoflowcommons/actions/NavigateTo.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/OpenMap.js b/module/javascriptsource/nanoflowcommons/actions/OpenMap.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/OpenMap.js
rename to module/javascriptsource/nanoflowcommons/actions/OpenMap.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/OpenURL.js b/module/javascriptsource/nanoflowcommons/actions/OpenURL.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/OpenURL.js
rename to module/javascriptsource/nanoflowcommons/actions/OpenURL.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/RefreshEntity.js b/module/javascriptsource/nanoflowcommons/actions/RefreshEntity.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RefreshEntity.js
rename to module/javascriptsource/nanoflowcommons/actions/RefreshEntity.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/RefreshObject.js b/module/javascriptsource/nanoflowcommons/actions/RefreshObject.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RefreshObject.js
rename to module/javascriptsource/nanoflowcommons/actions/RefreshObject.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Reload.js b/module/javascriptsource/nanoflowcommons/actions/Reload.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Reload.js
rename to module/javascriptsource/nanoflowcommons/actions/Reload.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.js b/module/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.js
rename to module/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.json b/module/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.json
rename to module/javascriptsource/nanoflowcommons/actions/RemoveStorageItem.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.js b/module/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.js
rename to module/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.json b/module/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.json
rename to module/javascriptsource/nanoflowcommons/actions/RequestLocationPermission.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/ReverseGeocode.js b/module/javascriptsource/nanoflowcommons/actions/ReverseGeocode.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ReverseGeocode.js
rename to module/javascriptsource/nanoflowcommons/actions/ReverseGeocode.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ReverseGeocode.json b/module/javascriptsource/nanoflowcommons/actions/ReverseGeocode.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ReverseGeocode.json
rename to module/javascriptsource/nanoflowcommons/actions/ReverseGeocode.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/SendTextMessage.js b/module/javascriptsource/nanoflowcommons/actions/SendTextMessage.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SendTextMessage.js
rename to module/javascriptsource/nanoflowcommons/actions/SendTextMessage.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.js b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.js
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.json b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.json
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemObject.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.js b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.js
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.json b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.json
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemObjectList.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemString.js b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemString.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemString.js
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemString.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SetStorageItemString.json b/module/javascriptsource/nanoflowcommons/actions/SetStorageItemString.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SetStorageItemString.json
rename to module/javascriptsource/nanoflowcommons/actions/SetStorageItemString.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/Share.js b/module/javascriptsource/nanoflowcommons/actions/Share.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Share.js
rename to module/javascriptsource/nanoflowcommons/actions/Share.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ShowConfirmation.js b/module/javascriptsource/nanoflowcommons/actions/ShowConfirmation.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ShowConfirmation.js
rename to module/javascriptsource/nanoflowcommons/actions/ShowConfirmation.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ShowProgress.js b/module/javascriptsource/nanoflowcommons/actions/ShowProgress.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ShowProgress.js
rename to module/javascriptsource/nanoflowcommons/actions/ShowProgress.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SignIn.js b/module/javascriptsource/nanoflowcommons/actions/SignIn.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SignIn.js
rename to module/javascriptsource/nanoflowcommons/actions/SignIn.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/SignOut.js b/module/javascriptsource/nanoflowcommons/actions/SignOut.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/SignOut.js
rename to module/javascriptsource/nanoflowcommons/actions/SignOut.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/StorageItemExists.js b/module/javascriptsource/nanoflowcommons/actions/StorageItemExists.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/StorageItemExists.js
rename to module/javascriptsource/nanoflowcommons/actions/StorageItemExists.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/StorageItemExists.json b/module/javascriptsource/nanoflowcommons/actions/StorageItemExists.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/StorageItemExists.json
rename to module/javascriptsource/nanoflowcommons/actions/StorageItemExists.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/TimeBetween.js b/module/javascriptsource/nanoflowcommons/actions/TimeBetween.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/TimeBetween.js
rename to module/javascriptsource/nanoflowcommons/actions/TimeBetween.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/ToggleSidebar.js b/module/javascriptsource/nanoflowcommons/actions/ToggleSidebar.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/ToggleSidebar.js
rename to module/javascriptsource/nanoflowcommons/actions/ToggleSidebar.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/Wait.js b/module/javascriptsource/nanoflowcommons/actions/Wait.js
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/Wait.js
rename to module/javascriptsource/nanoflowcommons/actions/Wait.js
diff --git a/test/javascriptsource/nanoflowcommons/actions/dependencies.json b/module/javascriptsource/nanoflowcommons/actions/dependencies.json
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/dependencies.json
rename to module/javascriptsource/nanoflowcommons/actions/dependencies.json
diff --git a/test/javascriptsource/nanoflowcommons/actions/dependencies.txt b/module/javascriptsource/nanoflowcommons/actions/dependencies.txt
similarity index 100%
rename from test/javascriptsource/nanoflowcommons/actions/dependencies.txt
rename to module/javascriptsource/nanoflowcommons/actions/dependencies.txt
diff --git a/test/javascriptsource/nativemobileresources/actions/BiometricAuthentication.js b/module/javascriptsource/nativemobileresources/actions/BiometricAuthentication.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/BiometricAuthentication.js
rename to module/javascriptsource/nativemobileresources/actions/BiometricAuthentication.js
diff --git a/test/javascriptsource/nativemobileresources/actions/BiometricAuthentication.json b/module/javascriptsource/nativemobileresources/actions/BiometricAuthentication.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/BiometricAuthentication.json
rename to module/javascriptsource/nativemobileresources/actions/BiometricAuthentication.json
diff --git a/test/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.js b/module/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.js
rename to module/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.js
diff --git a/test/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.json b/module/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.json
rename to module/javascriptsource/nativemobileresources/actions/CancelAllScheduledNotifications.json
diff --git a/test/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.js b/module/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.js
rename to module/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.js
diff --git a/test/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.json b/module/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.json
rename to module/javascriptsource/nativemobileresources/actions/CancelScheduledNotification.json
diff --git a/test/javascriptsource/nativemobileresources/actions/ChangeStatusBar.js b/module/javascriptsource/nativemobileresources/actions/ChangeStatusBar.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ChangeStatusBar.js
rename to module/javascriptsource/nativemobileresources/actions/ChangeStatusBar.js
diff --git a/test/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.js b/module/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.js
rename to module/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.js
diff --git a/test/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.json b/module/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.json
rename to module/javascriptsource/nativemobileresources/actions/ClearAllDeliveredNotifications.json
diff --git a/test/javascriptsource/nativemobileresources/actions/DisplayNotification.js b/module/javascriptsource/nativemobileresources/actions/DisplayNotification.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/DisplayNotification.js
rename to module/javascriptsource/nativemobileresources/actions/DisplayNotification.js
diff --git a/test/javascriptsource/nativemobileresources/actions/DisplayNotification.json b/module/javascriptsource/nativemobileresources/actions/DisplayNotification.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/DisplayNotification.json
rename to module/javascriptsource/nativemobileresources/actions/DisplayNotification.json
diff --git a/test/javascriptsource/nativemobileresources/actions/DownloadFile.js b/module/javascriptsource/nativemobileresources/actions/DownloadFile.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/DownloadFile.js
rename to module/javascriptsource/nativemobileresources/actions/DownloadFile.js
diff --git a/test/javascriptsource/nativemobileresources/actions/DownloadFile.json b/module/javascriptsource/nativemobileresources/actions/DownloadFile.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/DownloadFile.json
rename to module/javascriptsource/nativemobileresources/actions/DownloadFile.json
diff --git a/test/javascriptsource/nativemobileresources/actions/GetClipboardContent.js b/module/javascriptsource/nativemobileresources/actions/GetClipboardContent.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/GetClipboardContent.js
rename to module/javascriptsource/nativemobileresources/actions/GetClipboardContent.js
diff --git a/test/javascriptsource/nativemobileresources/actions/GetDeviceInfo.js b/module/javascriptsource/nativemobileresources/actions/GetDeviceInfo.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/GetDeviceInfo.js
rename to module/javascriptsource/nativemobileresources/actions/GetDeviceInfo.js
diff --git a/test/javascriptsource/nativemobileresources/actions/GetDeviceInfo.json b/module/javascriptsource/nativemobileresources/actions/GetDeviceInfo.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/GetDeviceInfo.json
rename to module/javascriptsource/nativemobileresources/actions/GetDeviceInfo.json
diff --git a/test/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.js b/module/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.js
rename to module/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.js
diff --git a/test/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.json b/module/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.json
rename to module/javascriptsource/nativemobileresources/actions/GetPushNotificationToken.json
diff --git a/test/javascriptsource/nativemobileresources/actions/HasNotificationPermission.js b/module/javascriptsource/nativemobileresources/actions/HasNotificationPermission.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/HasNotificationPermission.js
rename to module/javascriptsource/nativemobileresources/actions/HasNotificationPermission.js
diff --git a/test/javascriptsource/nativemobileresources/actions/HideKeyboard.js b/module/javascriptsource/nativemobileresources/actions/HideKeyboard.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/HideKeyboard.js
rename to module/javascriptsource/nativemobileresources/actions/HideKeyboard.js
diff --git a/test/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.js b/module/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.js
rename to module/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.js
diff --git a/test/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.json b/module/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.json
rename to module/javascriptsource/nativemobileresources/actions/IsBiometricAuthenticationSupported.json
diff --git a/test/javascriptsource/nativemobileresources/actions/IsCellularConnection.js b/module/javascriptsource/nativemobileresources/actions/IsCellularConnection.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsCellularConnection.js
rename to module/javascriptsource/nativemobileresources/actions/IsCellularConnection.js
diff --git a/test/javascriptsource/nativemobileresources/actions/IsCellularConnection.json b/module/javascriptsource/nativemobileresources/actions/IsCellularConnection.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsCellularConnection.json
rename to module/javascriptsource/nativemobileresources/actions/IsCellularConnection.json
diff --git a/test/javascriptsource/nativemobileresources/actions/IsConnected.js b/module/javascriptsource/nativemobileresources/actions/IsConnected.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsConnected.js
rename to module/javascriptsource/nativemobileresources/actions/IsConnected.js
diff --git a/test/javascriptsource/nativemobileresources/actions/IsConnected.json b/module/javascriptsource/nativemobileresources/actions/IsConnected.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsConnected.json
rename to module/javascriptsource/nativemobileresources/actions/IsConnected.json
diff --git a/test/javascriptsource/nativemobileresources/actions/IsWifiConnection.js b/module/javascriptsource/nativemobileresources/actions/IsWifiConnection.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsWifiConnection.js
rename to module/javascriptsource/nativemobileresources/actions/IsWifiConnection.js
diff --git a/test/javascriptsource/nativemobileresources/actions/IsWifiConnection.json b/module/javascriptsource/nativemobileresources/actions/IsWifiConnection.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/IsWifiConnection.json
rename to module/javascriptsource/nativemobileresources/actions/IsWifiConnection.json
diff --git a/test/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.js b/module/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.js
rename to module/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.js
diff --git a/test/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.json b/module/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.json
rename to module/javascriptsource/nativemobileresources/actions/OpenInAppBrowser.json
diff --git a/test/javascriptsource/nativemobileresources/actions/ParseUrlToObject.js b/module/javascriptsource/nativemobileresources/actions/ParseUrlToObject.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ParseUrlToObject.js
rename to module/javascriptsource/nativemobileresources/actions/ParseUrlToObject.js
diff --git a/test/javascriptsource/nativemobileresources/actions/PlaySound.js b/module/javascriptsource/nativemobileresources/actions/PlaySound.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/PlaySound.js
rename to module/javascriptsource/nativemobileresources/actions/PlaySound.js
diff --git a/test/javascriptsource/nativemobileresources/actions/PlaySound.json b/module/javascriptsource/nativemobileresources/actions/PlaySound.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/PlaySound.json
rename to module/javascriptsource/nativemobileresources/actions/PlaySound.json
diff --git a/test/javascriptsource/nativemobileresources/actions/RegisterDeepLink.js b/module/javascriptsource/nativemobileresources/actions/RegisterDeepLink.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/RegisterDeepLink.js
rename to module/javascriptsource/nativemobileresources/actions/RegisterDeepLink.js
diff --git a/test/javascriptsource/nativemobileresources/actions/RequestGenericPermission.js b/module/javascriptsource/nativemobileresources/actions/RequestGenericPermission.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/RequestGenericPermission.js
rename to module/javascriptsource/nativemobileresources/actions/RequestGenericPermission.js
diff --git a/test/javascriptsource/nativemobileresources/actions/RequestGenericPermission.json b/module/javascriptsource/nativemobileresources/actions/RequestGenericPermission.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/RequestGenericPermission.json
rename to module/javascriptsource/nativemobileresources/actions/RequestGenericPermission.json
diff --git a/test/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.js b/module/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.js
rename to module/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.js
diff --git a/test/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.json b/module/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.json
rename to module/javascriptsource/nativemobileresources/actions/RequestNotificationPermission.json
diff --git a/test/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.js b/module/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.js
rename to module/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.js
diff --git a/test/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.json b/module/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.json
rename to module/javascriptsource/nativemobileresources/actions/SaveToPictureLibrary.json
diff --git a/test/javascriptsource/nativemobileresources/actions/ScheduleNotification.js b/module/javascriptsource/nativemobileresources/actions/ScheduleNotification.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ScheduleNotification.js
rename to module/javascriptsource/nativemobileresources/actions/ScheduleNotification.js
diff --git a/test/javascriptsource/nativemobileresources/actions/ScheduleNotification.json b/module/javascriptsource/nativemobileresources/actions/ScheduleNotification.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/ScheduleNotification.json
rename to module/javascriptsource/nativemobileresources/actions/ScheduleNotification.json
diff --git a/test/javascriptsource/nativemobileresources/actions/SetBadgeNumber.js b/module/javascriptsource/nativemobileresources/actions/SetBadgeNumber.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/SetBadgeNumber.js
rename to module/javascriptsource/nativemobileresources/actions/SetBadgeNumber.js
diff --git a/test/javascriptsource/nativemobileresources/actions/SetBadgeNumber.json b/module/javascriptsource/nativemobileresources/actions/SetBadgeNumber.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/SetBadgeNumber.json
rename to module/javascriptsource/nativemobileresources/actions/SetBadgeNumber.json
diff --git a/test/javascriptsource/nativemobileresources/actions/SetClipboardContent.js b/module/javascriptsource/nativemobileresources/actions/SetClipboardContent.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/SetClipboardContent.js
rename to module/javascriptsource/nativemobileresources/actions/SetClipboardContent.js
diff --git a/test/javascriptsource/nativemobileresources/actions/TakePicture.js b/module/javascriptsource/nativemobileresources/actions/TakePicture.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/TakePicture.js
rename to module/javascriptsource/nativemobileresources/actions/TakePicture.js
diff --git a/test/javascriptsource/nativemobileresources/actions/TakePicture.json b/module/javascriptsource/nativemobileresources/actions/TakePicture.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/TakePicture.json
rename to module/javascriptsource/nativemobileresources/actions/TakePicture.json
diff --git a/test/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.js b/module/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.js
rename to module/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.js
diff --git a/test/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.json b/module/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.json
rename to module/javascriptsource/nativemobileresources/actions/TakePictureAdvanced.json
diff --git a/test/javascriptsource/nativemobileresources/actions/Vibrate.js b/module/javascriptsource/nativemobileresources/actions/Vibrate.js
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/Vibrate.js
rename to module/javascriptsource/nativemobileresources/actions/Vibrate.js
diff --git a/test/javascriptsource/nativemobileresources/actions/dependencies.json b/module/javascriptsource/nativemobileresources/actions/dependencies.json
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/dependencies.json
rename to module/javascriptsource/nativemobileresources/actions/dependencies.json
diff --git a/test/javascriptsource/nativemobileresources/actions/dependencies.txt b/module/javascriptsource/nativemobileresources/actions/dependencies.txt
similarity index 100%
rename from test/javascriptsource/nativemobileresources/actions/dependencies.txt
rename to module/javascriptsource/nativemobileresources/actions/dependencies.txt
diff --git a/test/javascriptsource/pushnotifications/actions/RegisterForPushNotificationsWeb.js b/module/javascriptsource/pushnotifications/actions/RegisterForPushNotificationsWeb.js
similarity index 100%
rename from test/javascriptsource/pushnotifications/actions/RegisterForPushNotificationsWeb.js
rename to module/javascriptsource/pushnotifications/actions/RegisterForPushNotificationsWeb.js
diff --git a/test/javasource/communitycommons/DateTime.java b/module/javasource/communitycommons/DateTime.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/DateTime.java
rename to module/javasource/communitycommons/DateTime.java
diff --git a/test/javasource/communitycommons/ImmutablePair.java b/module/javasource/communitycommons/ImmutablePair.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/ImmutablePair.java
rename to module/javasource/communitycommons/ImmutablePair.java
diff --git a/test/javasource/communitycommons/Logging.java b/module/javasource/communitycommons/Logging.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/Logging.java
rename to module/javasource/communitycommons/Logging.java
diff --git a/test/javasource/communitycommons/Misc.java b/module/javasource/communitycommons/Misc.java
old mode 100755
new mode 100644
similarity index 98%
rename from test/javasource/communitycommons/Misc.java
rename to module/javasource/communitycommons/Misc.java
index fffc18dd..8adb165d
--- a/test/javasource/communitycommons/Misc.java
+++ b/module/javasource/communitycommons/Misc.java
@@ -63,11 +63,11 @@ public abstract static class IterateCallback<T1, T2> {
 
 		public abstract void hit(T1 key, T2 value) throws Exception;
 
-		public void exit() {
+		synchronized public void exit() {
 			stop = true;
 		}
 
-		public void remove() {
+		synchronized public void remove() {
 			mapIter.remove();
 		}
 
@@ -674,18 +674,19 @@ public static boolean overlayPdf(IContext context, IMendixObject generatedDocume
 			Logging.trace(LOGNODE, "Overlay PDF start, retrieve overlay PDF");
 
 			Logging.trace(LOGNODE, "Perform overlay");
-			Overlay overlay = new Overlay();
-			overlay.setInputPDF(inputDoc);
-			overlay.setDefaultOverlayPDF(overlayDoc);
-			if (onTopOfContent == true) {
-				overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
-			} else {
-				overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
-			}
+			try (Overlay overlay = new Overlay()) {
+				overlay.setInputPDF(inputDoc);
+				overlay.setDefaultOverlayPDF(overlayDoc);
+				if (onTopOfContent) {
+					overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
+				} else {
+					overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
+				}
 
-			Logging.trace(LOGNODE, "Save result in output stream");
+				Logging.trace(LOGNODE, "Save result in output stream");
 
-			overlay.overlay(new HashMap<>()).save(baos);
+				overlay.overlay(new HashMap<>()).save(baos);
+			}
 
 			Logging.trace(LOGNODE, "Duplicate result in input stream");
 			try (InputStream overlayedContent = new ByteArrayInputStream(baos.toByteArray())) {
diff --git a/test/javasource/communitycommons/ORM.java b/module/javasource/communitycommons/ORM.java
old mode 100755
new mode 100644
similarity index 97%
rename from test/javasource/communitycommons/ORM.java
rename to module/javasource/communitycommons/ORM.java
index f666e32e..5ad0af95
--- a/test/javasource/communitycommons/ORM.java
+++ b/module/javasource/communitycommons/ORM.java
@@ -265,6 +265,11 @@ private static boolean isFileDocument(IMendixObject object) {
 
 	public static Boolean cloneObject(IContext c, IMendixObject source,
 		IMendixObject target, Boolean withAssociations) {
+		return cloneObject(c, source, target, withAssociations, false);
+	}
+
+	public static Boolean cloneObject(IContext c, IMendixObject source,
+		IMendixObject target, Boolean withAssociations, Boolean skipIsBoth) {
 		Map<String, ? extends IMendixObjectMember<?>> members = source.getMembers(c);
 
 		for (var entry : members.entrySet()) {
@@ -279,6 +284,10 @@ public static Boolean cloneObject(IContext c, IMendixObject source,
 				continue;
             }
 			if (withAssociations || ((!(m instanceof MendixObjectReference) && !(m instanceof MendixObjectReferenceSet) && !(m instanceof MendixAutoNumber)))) {
+				if (skipIsBoth && (
+					(m instanceof MendixObjectReference && ((MendixObjectReference) m).isBoth()) ||
+					(m instanceof MendixObjectReferenceSet && ((MendixObjectReferenceSet) m).isBoth())))
+					continue;
 				target.setValue(c, entry.getKey(), m.getValue(c));
 			}
 		}
diff --git a/test/javasource/communitycommons/StringUtils.java b/module/javasource/communitycommons/StringUtils.java
old mode 100755
new mode 100644
similarity index 87%
rename from test/javasource/communitycommons/StringUtils.java
rename to module/javasource/communitycommons/StringUtils.java
index 8caf6711..624d054f
--- a/test/javasource/communitycommons/StringUtils.java
+++ b/module/javasource/communitycommons/StringUtils.java
@@ -36,6 +36,7 @@
 import javax.swing.text.html.parser.ParserDelegator;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.BOMInputStream;
 import org.apache.commons.text.StringEscapeUtils;
 import org.owasp.html.PolicyFactory;
 import org.owasp.html.Sanitizers;
@@ -48,7 +49,8 @@ public class StringUtils {
 	private static final String UPPERCASE_ALPHA = stringRange('A', 'Z');
 	private static final String LOWERCASE_ALPHA = stringRange('a', 'z');
 	private static final String DIGITS = stringRange('0', '9');
-	private static final String SPECIAL = stringRange('!', '/');
+	// Used in tests as well
+	static final String SPECIAL = stringRange('!', '/');
 	private static final String ALPHANUMERIC = UPPERCASE_ALPHA + LOWERCASE_ALPHA + DIGITS;
 
 	static final Map<String, PolicyFactory> SANITIZER_POLICIES =
@@ -63,6 +65,12 @@ public class StringUtils {
 
 	public static final String HASH_ALGORITHM = "SHA-256";
 
+	public static String hash(String value) throws NoSuchAlgorithmException, DigestException {
+		int LENGTH = 32;
+		return hash(value, LENGTH);
+	}
+
+	@Deprecated
 	public static String hash(String value, int length) throws NoSuchAlgorithmException, DigestException {
 		byte[] inBytes = value.getBytes(StandardCharsets.UTF_8);
 		byte[] outBytes = new byte[length];
@@ -215,10 +223,14 @@ public static String stringFromFile(IContext context, FileDocument source, Chars
 			return null;
 		}
 		try (InputStream f = Core.getFileDocumentContent(context, source.getMendixObject())) {
-			return IOUtils.toString(f, charset);
+			return stringFromInputStream(f, charset);
 		}
 	}
 
+	public static String stringFromInputStream(InputStream inputStream, Charset charset) throws IOException {
+		return IOUtils.toString(BOMInputStream.builder().setInputStream(inputStream).get(), charset);
+	}
+
 	public static void stringToFile(IContext context, String value, FileDocument destination) throws IOException {
 		stringToFile(context, value, destination, StandardCharsets.UTF_8);
 	}
@@ -279,16 +291,17 @@ public void handleEndTag(HTML.Tag tag, int pos) {
 	}
 
 	/**
-	 * Returns a random strong password containing a specified minimum number of digits, uppercase
-	 * and special characters.
+	 * Returns a random strong password containing a specified minimum number of uppercase, digits
+	 * and the exact number of special characters.
 	 *
 	 * @param minLen        Minimum length
 	 * @param maxLen        Maximum length
-	 * @param noOfCAPSAlpha Number of capitals
-	 * @param noOfDigits    Number of digits
-	 * @param noOfSplChars  Number of special characters
-	 * @return
+	 * @param noOfCAPSAlpha Minimum number of capitals
+	 * @param noOfDigits    Minimum number of digits
+	 * @param noOfSplChars  Exact number of special characters
+	 * @deprecated          Use the overload randomStrongPassword instead
 	 */
+	@Deprecated
 	public static String randomStrongPassword(int minLen, int maxLen, int noOfCAPSAlpha, int noOfDigits, int noOfSplChars) {
 		if (minLen > maxLen) {
 			throw new IllegalArgumentException("Min. Length > Max. Length!");
@@ -296,22 +309,45 @@ public static String randomStrongPassword(int minLen, int maxLen, int noOfCAPSAl
 		if ((noOfCAPSAlpha + noOfDigits + noOfSplChars) > minLen) {
 			throw new IllegalArgumentException("Min. Length should be atleast sum of (CAPS, DIGITS, SPL CHARS) Length!");
 		}
-		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, noOfDigits, noOfSplChars);
+		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, 0, noOfDigits, noOfSplChars);
+	}
+
+	/**
+	 * Returns a random strong password containing a specified minimum number of uppercase, lowercase, digits
+	 * and the exact number of special characters.
+	 *
+	 * @param minLen             Minimum length
+	 * @param maxLen             Maximum length
+	 * @param noOfCAPSAlpha      Minimum number of capitals
+	 * @param noOfLowercaseAlpha Minimum number of lowercase letters
+	 * @param noOfDigits         Minimum number of digits
+	 * @param noOfSplChars       Exact number of special characters
+	 */
+	public static String randomStrongPassword(int minLen, int maxLen, int noOfCAPSAlpha, int noOfLowercaseAlpha, int noOfDigits, int noOfSplChars) {
+		if (minLen > maxLen) {
+			throw new IllegalArgumentException("Min. Length > Max. Length!");
+		}
+		if ((noOfCAPSAlpha + noOfLowercaseAlpha + noOfDigits + noOfSplChars) > minLen) {
+			throw new IllegalArgumentException("Min. Length should be atleast sum of (CAPS, LOWER, DIGITS, SPL CHARS) Length!");
+		}
+		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, noOfLowercaseAlpha, noOfDigits, noOfSplChars);
 	}
 
 	// See https://www.baeldung.com/java-generate-secure-password
 	// Implementation inspired by https://github.com/eugenp/tutorials/tree/master/core-java-modules/core-java-string-apis (under MIT license)
-	private static String generateCommonLangPassword(int minLen, int maxLen, int noOfCapsAlpha, int noOfDigits, int noOfSplChars) {
+	private static String generateCommonLangPassword(int minLen, int maxLen, int noOfCapsAlpha, int noOfLowercaseAlpha, int noOfDigits, int noOfSplChars) {
 		String upperCaseLetters = randomStringFromCharArray(noOfCapsAlpha, UPPERCASE_ALPHA.toCharArray());
+		String lowerCaseLetters = randomStringFromCharArray(noOfLowercaseAlpha, LOWERCASE_ALPHA.toCharArray());
 		String numbers = randomStringFromCharArray(noOfDigits, DIGITS.toCharArray());
 		String specialChar = randomStringFromCharArray(noOfSplChars, SPECIAL.toCharArray());
 
-		final int fixedNumber = noOfCapsAlpha + noOfDigits + noOfSplChars;
+		final int fixedNumber = noOfCapsAlpha + noOfLowercaseAlpha + noOfDigits + noOfSplChars;
 		final int lowerBound = minLen - fixedNumber;
 		final int upperBound = maxLen - fixedNumber;
 		String totalChars = randomStringFromCharArray(lowerBound, upperBound, ALPHANUMERIC.toCharArray());
 
 		String combinedChars = upperCaseLetters
+			.concat(lowerCaseLetters)
 			.concat(numbers)
 			.concat(specialChar)
 			.concat(totalChars);
@@ -462,7 +498,12 @@ public static String sanitizeHTML(String html, List<SanitizerPolicy> policyParam
 		PolicyFactory policyFactory = null;
 
 		for (SanitizerPolicy param : policyParams) {
-			policyFactory = (policyFactory == null) ? SANITIZER_POLICIES.get(param.name()) : policyFactory.and(SANITIZER_POLICIES.get(param.name()));
+			PolicyFactory policyFactoryForParam = SANITIZER_POLICIES.get(param.name());
+			policyFactory = (policyFactory == null) ? policyFactoryForParam : policyFactory.and(policyFactoryForParam);
+		}
+
+		if (policyFactory == null) {
+			throw new IllegalArgumentException("Sanitizer policy not found.");
 		}
 
 		return sanitizeHTML(html, policyFactory);
diff --git a/test/javasource/communitycommons/UserThrownException.java b/module/javasource/communitycommons/UserThrownException.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/UserThrownException.java
rename to module/javasource/communitycommons/UserThrownException.java
diff --git a/test/javasource/communitycommons/XPath.java b/module/javasource/communitycommons/XPath.java
old mode 100755
new mode 100644
similarity index 99%
rename from test/javasource/communitycommons/XPath.java
rename to module/javasource/communitycommons/XPath.java
index 5fa0fe1f..e6f41eeb
--- a/test/javasource/communitycommons/XPath.java
+++ b/module/javasource/communitycommons/XPath.java
@@ -528,7 +528,7 @@ public T firstOrWait(long timeoutMSecs) throws CoreException, InterruptedExcepti
 				break;
 
 			if (loopcount % 5 == 0)
-				sleepamount *= 1.5;
+				sleepamount = (int)(sleepamount * 1.5);
 
 			// not expired, wait a bit
 			if (result == null)
diff --git a/test/javasource/communitycommons/actions/Base64Decode.java b/module/javasource/communitycommons/actions/Base64Decode.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/Base64Decode.java
rename to module/javasource/communitycommons/actions/Base64Decode.java
diff --git a/test/javasource/communitycommons/actions/Base64DecodeToFile.java b/module/javasource/communitycommons/actions/Base64DecodeToFile.java
old mode 100755
new mode 100644
similarity index 95%
rename from test/javasource/communitycommons/actions/Base64DecodeToFile.java
rename to module/javasource/communitycommons/actions/Base64DecodeToFile.java
index de771b8c..83ddef4e
--- a/test/javasource/communitycommons/actions/Base64DecodeToFile.java
+++ b/module/javasource/communitycommons/actions/Base64DecodeToFile.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Stores an base 64 encoded string plain in the provided target file document
- * 
- * Note that targetFile will be committed.
- */
-public class Base64DecodeToFile extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String encoded;
-	private IMendixObject __targetFile;
-	private system.proxies.FileDocument targetFile;
-
-	public Base64DecodeToFile(IContext context, java.lang.String encoded, IMendixObject targetFile)
-	{
-		super(context);
-		this.encoded = encoded;
-		this.__targetFile = targetFile;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		this.targetFile = this.__targetFile == null ? null : system.proxies.FileDocument.initialize(getContext(), __targetFile);
-
-		// BEGIN USER CODE
-		StringUtils.base64DecodeToFile(getContext(), encoded, targetFile);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "Base64DecodeToFile";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Stores an base 64 encoded string plain in the provided target file document

+ * 

+ * Note that targetFile will be committed.
+ */
+public class Base64DecodeToFile extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String encoded;
+	private IMendixObject __targetFile;
+	private system.proxies.FileDocument targetFile;
+
+	public Base64DecodeToFile(IContext context, java.lang.String encoded, IMendixObject targetFile)
+	{
+		super(context);
+		this.encoded = encoded;
+		this.__targetFile = targetFile;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		this.targetFile = this.__targetFile == null ? null : system.proxies.FileDocument.initialize(getContext(), __targetFile);
+
+		// BEGIN USER CODE
+		StringUtils.base64DecodeToFile(getContext(), encoded, targetFile);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "Base64DecodeToFile";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/Base64Encode.java b/module/javasource/communitycommons/actions/Base64Encode.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/Base64Encode.java
rename to module/javasource/communitycommons/actions/Base64Encode.java
diff --git a/test/javasource/communitycommons/actions/Base64EncodeFile.java b/module/javasource/communitycommons/actions/Base64EncodeFile.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/Base64EncodeFile.java
rename to module/javasource/communitycommons/actions/Base64EncodeFile.java
diff --git a/test/javasource/communitycommons/actions/Clone.java b/module/javasource/communitycommons/actions/Clone.java
old mode 100755
new mode 100644
similarity index 88%
rename from test/javasource/communitycommons/actions/Clone.java
rename to module/javasource/communitycommons/actions/Clone.java
index a069edc5..4931dd6b
--- a/test/javasource/communitycommons/actions/Clone.java
+++ b/module/javasource/communitycommons/actions/Clone.java
@@ -1,60 +1,60 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Clones objects
- * 
- * - Source: the original object to copy
- * - Target: the object to copy it into (should be of the same type, or a specialization)
- * - includeAssociations: whether to clone associations. 
- * 
- * If associated objects need to be cloned as well, use deepClone, this function only copies the references, not the reffered objects. Target is not committed automatically.
- */
-public class Clone extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject source;
-	private IMendixObject target;
-	private java.lang.Boolean withAssociations;
-
-	public Clone(IContext context, IMendixObject source, IMendixObject target, java.lang.Boolean withAssociations)
-	{
-		super(context);
-		this.source = source;
-		this.target = target;
-		this.withAssociations = withAssociations;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.cloneObject(this.getContext(), source, target, withAssociations);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "Clone";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Clones objects

+ * 

+ * - Source: the original object to copy

+ * - Target: the object to copy it into (should be of the same type, or a specialization)

+ * - includeAssociations: whether to clone associations. 

+ * 

+ * If associated objects need to be cloned as well, use deepClone, this function only copies the references, not the reffered objects. Target is not committed automatically.
+ */
+public class Clone extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject source;
+	private IMendixObject target;
+	private java.lang.Boolean withAssociations;
+
+	public Clone(IContext context, IMendixObject source, IMendixObject target, java.lang.Boolean withAssociations)
+	{
+		super(context);
+		this.source = source;
+		this.target = target;
+		this.withAssociations = withAssociations;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.cloneObject(this.getContext(), source, target, withAssociations);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "Clone";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/CreateLogNode.java b/module/javasource/communitycommons/actions/CreateLogNode.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/CreateLogNode.java
rename to module/javasource/communitycommons/actions/CreateLogNode.java
diff --git a/test/javasource/communitycommons/actions/DateTimeToLong.java b/module/javasource/communitycommons/actions/DateTimeToLong.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/DateTimeToLong.java
rename to module/javasource/communitycommons/actions/DateTimeToLong.java
diff --git a/test/javasource/communitycommons/actions/DeepClone.java b/module/javasource/communitycommons/actions/DeepClone.java
old mode 100755
new mode 100644
similarity index 89%
rename from test/javasource/communitycommons/actions/DeepClone.java
rename to module/javasource/communitycommons/actions/DeepClone.java
index 2a78848c..ab07c679
--- a/test/javasource/communitycommons/actions/DeepClone.java
+++ b/module/javasource/communitycommons/actions/DeepClone.java
@@ -1,87 +1,87 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Clones objects, their associations and even referred objects. 
- * 
- * - Source: the original object to copy
- * - Target: the object to copy it into (should be of the same type, or a specialization)
- * - MembersToSkip: members which should not  be set at all
- * - MembersToKeep: references which should be set, but not cloned. (so source and target will refer to exactly the same object). If an association is not part of this property, it will be cloned.
- * - ReverseAssociations: 1 - 0 assications which refer to target, which will be cloned as well. Only the reference name itself needs to be mentioned.
- * - excludeEntities: entities that will not be cloned. references to these entities will refer to the same object as the source did.
- * - excludeModules: modules that will have none of their enities cloned. Behaves similar to excludeEntities.
- * 
- * members format: <membername> or <module.association> or <module.objecttype/membername>, where objecttype is the concrete type of the object being cloned. 
- * 
- * reverseAssociation: 
- * <module.relation>
- * 
- * membersToSkip by automatically contains createdDate and changedDate. 
- * membersToKeep by automatically contains System.owner and System.changedBy
- * 
- * Note that DeepClone does commit all objects, where Clone does not.
- */
-public class DeepClone extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject source;
-	private IMendixObject target;
-	private java.lang.String membersToSkip;
-	private java.lang.String membersToKeep;
-	private java.lang.String reverseAssociations;
-	private java.lang.String excludeEntities;
-	private java.lang.String excludeModules;
-
-	public DeepClone(IContext context, IMendixObject source, IMendixObject target, java.lang.String membersToSkip, java.lang.String membersToKeep, java.lang.String reverseAssociations, java.lang.String excludeEntities, java.lang.String excludeModules)
-	{
-		super(context);
-		this.source = source;
-		this.target = target;
-		this.membersToSkip = membersToSkip;
-		this.membersToKeep = membersToKeep;
-		this.reverseAssociations = reverseAssociations;
-		this.excludeEntities = excludeEntities;
-		this.excludeModules = excludeModules;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		java.lang.String membersToSkip       = this.membersToSkip == null       ? "" : this.membersToSkip;
-		java.lang.String membersToKeep       = this.membersToKeep == null       ? "" : this.membersToKeep;
-		java.lang.String reverseAssociations = this.reverseAssociations == null ? "" : this.reverseAssociations;
-		java.lang.String excludeEntities     = this.excludeEntities == null     ? "" : this.excludeEntities;
-		java.lang.String excludeModules      = this.excludeModules == null      ? "" : this.excludeModules;
-
-		ORM.deepClone(getContext(), source, target, membersToSkip, membersToKeep, reverseAssociations, excludeEntities, excludeModules);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "DeepClone";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Clones objects, their associations and even referred objects. 

+ * 

+ * - Source: the original object to copy

+ * - Target: the object to copy it into (should be of the same type, or a specialization)

+ * - MembersToSkip: members which should not  be set at all

+ * - MembersToKeep: references which should be set, but not cloned. (so source and target will refer to exactly the same object). If an association is not part of this property, it will be cloned.

+ * - ReverseAssociations: 1 - 0 assications which refer to target, which will be cloned as well. Only the reference name itself needs to be mentioned.

+ * - excludeEntities: entities that will not be cloned. references to these entities will refer to the same object as the source did.

+ * - excludeModules: modules that will have none of their enities cloned. Behaves similar to excludeEntities.

+ * 

+ * members format: <membername> or <module.association> or <module.objecttype/membername>, where objecttype is the concrete type of the object being cloned. 

+ * 

+ * reverseAssociation: 

+ * <module.relation>

+ * 

+ * membersToSkip by automatically contains createdDate and changedDate. 

+ * membersToKeep by automatically contains System.owner and System.changedBy

+ * 

+ * Note that DeepClone does commit all objects, where Clone does not.
+ */
+public class DeepClone extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject source;
+	private IMendixObject target;
+	private java.lang.String membersToSkip;
+	private java.lang.String membersToKeep;
+	private java.lang.String reverseAssociations;
+	private java.lang.String excludeEntities;
+	private java.lang.String excludeModules;
+
+	public DeepClone(IContext context, IMendixObject source, IMendixObject target, java.lang.String membersToSkip, java.lang.String membersToKeep, java.lang.String reverseAssociations, java.lang.String excludeEntities, java.lang.String excludeModules)
+	{
+		super(context);
+		this.source = source;
+		this.target = target;
+		this.membersToSkip = membersToSkip;
+		this.membersToKeep = membersToKeep;
+		this.reverseAssociations = reverseAssociations;
+		this.excludeEntities = excludeEntities;
+		this.excludeModules = excludeModules;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		java.lang.String membersToSkip       = this.membersToSkip == null       ? "" : this.membersToSkip;
+		java.lang.String membersToKeep       = this.membersToKeep == null       ? "" : this.membersToKeep;
+		java.lang.String reverseAssociations = this.reverseAssociations == null ? "" : this.reverseAssociations;
+		java.lang.String excludeEntities     = this.excludeEntities == null     ? "" : this.excludeEntities;
+		java.lang.String excludeModules      = this.excludeModules == null      ? "" : this.excludeModules;
+
+		ORM.deepClone(getContext(), source, target, membersToSkip, membersToKeep, reverseAssociations, excludeEntities, excludeModules);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "DeepClone";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/Delay.java b/module/javasource/communitycommons/actions/Delay.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/Delay.java
rename to module/javasource/communitycommons/actions/Delay.java
index d5e4f840..c10341d3
--- a/test/javasource/communitycommons/actions/Delay.java
+++ b/module/javasource/communitycommons/actions/Delay.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Causes this request to sleep for a while. Useful to prevent brute force attacks or to simulate latency delays. 
- *  
- * Delaytime : time in ms
- */
-public class Delay extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.Long delaytime;
-
-	public Delay(IContext context, java.lang.Long delaytime)
-	{
-		super(context);
-		this.delaytime = delaytime;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Misc.delay(delaytime);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "Delay";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Causes this request to sleep for a while. Useful to prevent brute force attacks or to simulate latency delays. 

+ *  

+ * Delaytime : time in ms
+ */
+public class Delay extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.Long delaytime;
+
+	public Delay(IContext context, java.lang.Long delaytime)
+	{
+		super(context);
+		this.delaytime = delaytime;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Misc.delay(delaytime);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "Delay";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/DuplicateFileDocument.java b/module/javasource/communitycommons/actions/DuplicateFileDocument.java
old mode 100755
new mode 100644
similarity index 90%
rename from test/javasource/communitycommons/actions/DuplicateFileDocument.java
rename to module/javasource/communitycommons/actions/DuplicateFileDocument.java
index 1b5f5a06..50740ce5
--- a/test/javasource/communitycommons/actions/DuplicateFileDocument.java
+++ b/module/javasource/communitycommons/actions/DuplicateFileDocument.java
@@ -1,63 +1,63 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Clones the contents of one file document into another. 
- * - fileToClone : the source file
- * - cloneTarget : an initialized file document, in which the file will be stored.
- * 
- * Returns true if copied, returns file if the source had no contents, throws exception in any other case.
- * Pre condition: HasContents of the 'fileToClone' need to be set to true, otherwise the action will not copy anything.
- */
-public class DuplicateFileDocument extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject __fileToClone;
-	private system.proxies.FileDocument fileToClone;
-	private IMendixObject __cloneTarget;
-	private system.proxies.FileDocument cloneTarget;
-
-	public DuplicateFileDocument(IContext context, IMendixObject fileToClone, IMendixObject cloneTarget)
-	{
-		super(context);
-		this.__fileToClone = fileToClone;
-		this.__cloneTarget = cloneTarget;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		this.fileToClone = this.__fileToClone == null ? null : system.proxies.FileDocument.initialize(getContext(), __fileToClone);
-
-		this.cloneTarget = this.__cloneTarget == null ? null : system.proxies.FileDocument.initialize(getContext(), __cloneTarget);
-
-		// BEGIN USER CODE
-		return Misc.duplicateFileDocument(this.getContext(), fileToClone.getMendixObject(), cloneTarget.getMendixObject());
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "DuplicateFileDocument";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Clones the contents of one file document into another. 

+ * - fileToClone : the source file

+ * - cloneTarget : an initialized file document, in which the file will be stored.

+ * 

+ * Returns true if copied, returns file if the source had no contents, throws exception in any other case.

+ * Pre condition: HasContents of the 'fileToClone' need to be set to true, otherwise the action will not copy anything.
+ */
+public class DuplicateFileDocument extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject __fileToClone;
+	private system.proxies.FileDocument fileToClone;
+	private IMendixObject __cloneTarget;
+	private system.proxies.FileDocument cloneTarget;
+
+	public DuplicateFileDocument(IContext context, IMendixObject fileToClone, IMendixObject cloneTarget)
+	{
+		super(context);
+		this.__fileToClone = fileToClone;
+		this.__cloneTarget = cloneTarget;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		this.fileToClone = this.__fileToClone == null ? null : system.proxies.FileDocument.initialize(getContext(), __fileToClone);
+
+		this.cloneTarget = this.__cloneTarget == null ? null : system.proxies.FileDocument.initialize(getContext(), __cloneTarget);
+
+		// BEGIN USER CODE
+		return Misc.duplicateFileDocument(this.getContext(), fileToClone.getMendixObject(), cloneTarget.getMendixObject());
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "DuplicateFileDocument";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/DuplicateImageDocument.java b/module/javasource/communitycommons/actions/DuplicateImageDocument.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/DuplicateImageDocument.java
rename to module/javasource/communitycommons/actions/DuplicateImageDocument.java
index a82b5753..aef40953
--- a/test/javasource/communitycommons/actions/DuplicateImageDocument.java
+++ b/module/javasource/communitycommons/actions/DuplicateImageDocument.java
@@ -1,67 +1,67 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Clones the contents of one image document into another, and generates a thumbnail as well. 
- * - fileToClone : the source file
- * - cloneTarget : an initialized file document, in which the file will be stored.
- * 
- * Returns true if copied, returns file if the source had no contents, throws exception in any other case.
- * Pre condition: HasContents of the 'fileToClone' need to be set to true, otherwise the action will not copy anything.
- */
-public class DuplicateImageDocument extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject __fileToClone;
-	private system.proxies.Image fileToClone;
-	private IMendixObject __cloneTarget;
-	private system.proxies.Image cloneTarget;
-	private java.lang.Long thumbWidth;
-	private java.lang.Long thumbHeight;
-
-	public DuplicateImageDocument(IContext context, IMendixObject fileToClone, IMendixObject cloneTarget, java.lang.Long thumbWidth, java.lang.Long thumbHeight)
-	{
-		super(context);
-		this.__fileToClone = fileToClone;
-		this.__cloneTarget = cloneTarget;
-		this.thumbWidth = thumbWidth;
-		this.thumbHeight = thumbHeight;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		this.fileToClone = this.__fileToClone == null ? null : system.proxies.Image.initialize(getContext(), __fileToClone);
-
-		this.cloneTarget = this.__cloneTarget == null ? null : system.proxies.Image.initialize(getContext(), __cloneTarget);
-
-		// BEGIN USER CODE
-		return Misc.duplicateImage(this.getContext(), fileToClone.getMendixObject(), cloneTarget.getMendixObject(), thumbWidth.intValue(), thumbHeight.intValue());
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "DuplicateImageDocument";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Clones the contents of one image document into another, and generates a thumbnail as well. 

+ * - fileToClone : the source file

+ * - cloneTarget : an initialized file document, in which the file will be stored.

+ * 

+ * Returns true if copied, returns file if the source had no contents, throws exception in any other case.

+ * Pre condition: HasContents of the 'fileToClone' need to be set to true, otherwise the action will not copy anything.
+ */
+public class DuplicateImageDocument extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject __fileToClone;
+	private system.proxies.Image fileToClone;
+	private IMendixObject __cloneTarget;
+	private system.proxies.Image cloneTarget;
+	private java.lang.Long thumbWidth;
+	private java.lang.Long thumbHeight;
+
+	public DuplicateImageDocument(IContext context, IMendixObject fileToClone, IMendixObject cloneTarget, java.lang.Long thumbWidth, java.lang.Long thumbHeight)
+	{
+		super(context);
+		this.__fileToClone = fileToClone;
+		this.__cloneTarget = cloneTarget;
+		this.thumbWidth = thumbWidth;
+		this.thumbHeight = thumbHeight;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		this.fileToClone = this.__fileToClone == null ? null : system.proxies.Image.initialize(getContext(), __fileToClone);
+
+		this.cloneTarget = this.__cloneTarget == null ? null : system.proxies.Image.initialize(getContext(), __cloneTarget);
+
+		// BEGIN USER CODE
+		return Misc.duplicateImage(this.getContext(), fileToClone.getMendixObject(), cloneTarget.getMendixObject(), thumbWidth.intValue(), thumbHeight.intValue());
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "DuplicateImageDocument";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/EndTransaction.java b/module/javasource/communitycommons/actions/EndTransaction.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/EndTransaction.java
rename to module/javasource/communitycommons/actions/EndTransaction.java
diff --git a/test/javasource/communitycommons/actions/EnumerationFromString.java b/module/javasource/communitycommons/actions/EnumerationFromString.java
old mode 100755
new mode 100644
similarity index 94%
rename from test/javasource/communitycommons/actions/EnumerationFromString.java
rename to module/javasource/communitycommons/actions/EnumerationFromString.java
index 3d0fd659..341c6870
--- a/test/javasource/communitycommons/actions/EnumerationFromString.java
+++ b/module/javasource/communitycommons/actions/EnumerationFromString.java
@@ -1,56 +1,56 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Misc;
-import communitycommons.proxies.LogLevel;
-import java.util.Optional;
-
-/**
- * Use this Java action as a template for your own String-to-Enumeration conversions.
- * Studio Pro requires specifying the exact Enumeration to return in the definition of a Java action so we cannot provide a generic implementation.
- * This implementation will throw a NoSuchElementException if an invalid toConvert parameter is given, so remember to handle this error gracefully.
- */
-public class EnumerationFromString extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String toConvert;
-
-	public EnumerationFromString(IContext context, java.lang.String toConvert)
-	{
-		super(context);
-		this.toConvert = toConvert;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-            
-                // Replace LogLevel.class by the proxy class for your Enumeration
-		Optional<LogLevel> result = Misc.enumFromString(LogLevel.class, toConvert);
-                return result.orElseThrow().name();
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "EnumerationFromString";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Misc;
+import communitycommons.proxies.LogLevel;
+import java.util.Optional;
+
+/**
+ * Use this Java action as a template for your own String-to-Enumeration conversions.

+ * Studio Pro requires specifying the exact Enumeration to return in the definition of a Java action so we cannot provide a generic implementation.

+ * This implementation will throw a NoSuchElementException if an invalid toConvert parameter is given, so remember to handle this error gracefully.
+ */
+public class EnumerationFromString extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String toConvert;
+
+	public EnumerationFromString(IContext context, java.lang.String toConvert)
+	{
+		super(context);
+		this.toConvert = toConvert;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+            
+                // Replace LogLevel.class by the proxy class for your Enumeration
+		Optional<LogLevel> result = Misc.enumFromString(LogLevel.class, toConvert);
+                return result.orElseThrow().name();
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "EnumerationFromString";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/EscapeHTML.java b/module/javasource/communitycommons/actions/EscapeHTML.java
old mode 100755
new mode 100644
similarity index 89%
rename from test/javasource/communitycommons/actions/EscapeHTML.java
rename to module/javasource/communitycommons/actions/EscapeHTML.java
index 9bdc9993..933721cc
--- a/test/javasource/communitycommons/actions/EscapeHTML.java
+++ b/module/javasource/communitycommons/actions/EscapeHTML.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.StringUtils;
-
-/**
- * Given a, escapes it to html codes, for example
- * 
- * "< Joe & John >" will be converted to 
- * "&lt; Joe &amp; John &gt;"
- */
-public class EscapeHTML extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String rawString;
-
-	public EscapeHTML(IContext context, java.lang.String rawString)
-	{
-		super(context);
-		this.rawString = rawString;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.escapeHTML(rawString);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "EscapeHTML";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.StringUtils;
+
+/**
+ * Given a, escapes it to html codes, for example

+ * 

+ * "< Joe & John >" will be converted to 

+ * "&lt; Joe &amp; John &gt;"
+ */
+public class EscapeHTML extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String rawString;
+
+	public EscapeHTML(IContext context, java.lang.String rawString)
+	{
+		super(context);
+		this.rawString = rawString;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.escapeHTML(rawString);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "EscapeHTML";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/FileDocumentFromFile.java b/module/javasource/communitycommons/actions/FileDocumentFromFile.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/FileDocumentFromFile.java
rename to module/javasource/communitycommons/actions/FileDocumentFromFile.java
diff --git a/test/javasource/communitycommons/actions/FileFromFileDocument.java b/module/javasource/communitycommons/actions/FileFromFileDocument.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/FileFromFileDocument.java
rename to module/javasource/communitycommons/actions/FileFromFileDocument.java
diff --git a/test/javasource/communitycommons/actions/GenerateHMAC_SHA256.java b/module/javasource/communitycommons/actions/GenerateHMAC_SHA256.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GenerateHMAC_SHA256.java
rename to module/javasource/communitycommons/actions/GenerateHMAC_SHA256.java
diff --git a/test/javasource/communitycommons/actions/GenerateHMAC_SHA256_hash.java b/module/javasource/communitycommons/actions/GenerateHMAC_SHA256_hash.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GenerateHMAC_SHA256_hash.java
rename to module/javasource/communitycommons/actions/GenerateHMAC_SHA256_hash.java
diff --git a/test/javasource/communitycommons/actions/GetApplicationUrl.java b/module/javasource/communitycommons/actions/GetApplicationUrl.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GetApplicationUrl.java
rename to module/javasource/communitycommons/actions/GetApplicationUrl.java
diff --git a/test/javasource/communitycommons/actions/GetCFInstanceIndex.java b/module/javasource/communitycommons/actions/GetCFInstanceIndex.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/GetCFInstanceIndex.java
rename to module/javasource/communitycommons/actions/GetCFInstanceIndex.java
index 8c28f71a..4ca02ec0
--- a/test/javasource/communitycommons/actions/GetCFInstanceIndex.java
+++ b/module/javasource/communitycommons/actions/GetCFInstanceIndex.java
@@ -1,50 +1,50 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Misc;
-
-/**
- * Returns the Cloud Foundry Instance Index that is set during deployment of the application in a Cloud native environment. Based on the Cloud Foundry Instance Index, Mendix determines what is the leader instance (index 0 executes scheduled events, db sync, session management etc.) or slave instance.
- * 
- * Returns 0 for the leader instance, 1 or higher for slave instances or -1 when the environment variable could not be read (when running locally or on premise). When -1 is returned, it will probably be the leader in the cluster.
- * 
- * Make sure emulate cloud security is disabled. Otherwise, the policy restrictions will prevent the method to be executed. Action is tested in Mendix Cloud on 19-12-2018.
- */
-public class GetCFInstanceIndex extends CustomJavaAction<java.lang.Long>
-{
-	public GetCFInstanceIndex(IContext context)
-	{
-		super(context);
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Misc.getCFInstanceIndex();
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "GetCFInstanceIndex";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Misc;
+
+/**
+ * Returns the Cloud Foundry Instance Index that is set during deployment of the application in a Cloud native environment. Based on the Cloud Foundry Instance Index, Mendix determines what is the leader instance (index 0 executes scheduled events, db sync, session management etc.) or slave instance.

+ * 

+ * Returns 0 for the leader instance, 1 or higher for slave instances or -1 when the environment variable could not be read (when running locally or on premise). When -1 is returned, it will probably be the leader in the cluster.

+ * 

+ * Make sure emulate cloud security is disabled. Otherwise, the policy restrictions will prevent the method to be executed. Action is tested in Mendix Cloud on 19-12-2018.
+ */
+public class GetCFInstanceIndex extends CustomJavaAction<java.lang.Long>
+{
+	public GetCFInstanceIndex(IContext context)
+	{
+		super(context);
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Misc.getCFInstanceIndex();
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "GetCFInstanceIndex";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/GetDefaultLanguage.java b/module/javasource/communitycommons/actions/GetDefaultLanguage.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GetDefaultLanguage.java
rename to module/javasource/communitycommons/actions/GetDefaultLanguage.java
diff --git a/test/javasource/communitycommons/actions/GetFileContentsFromResource.java b/module/javasource/communitycommons/actions/GetFileContentsFromResource.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GetFileContentsFromResource.java
rename to module/javasource/communitycommons/actions/GetFileContentsFromResource.java
diff --git a/test/javasource/communitycommons/actions/GetImageDimensions.java b/module/javasource/communitycommons/actions/GetImageDimensions.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/GetImageDimensions.java
rename to module/javasource/communitycommons/actions/GetImageDimensions.java
index 582997a3..43d31dd5
--- a/test/javasource/communitycommons/actions/GetImageDimensions.java
+++ b/module/javasource/communitycommons/actions/GetImageDimensions.java
@@ -38,8 +38,10 @@ public IMendixObject executeAction() throws Exception
 		ImageDimensions imageDimensions = new ImageDimensions(getContext());
 		try (InputStream inputStream = Core.getImage(getContext(), this.ImageParameter.getMendixObject(), false)) {
 			BufferedImage bimg = ImageIO.read(inputStream);
-			imageDimensions.setHeight(bimg.getHeight());
-			imageDimensions.setWidth(bimg.getWidth());
+			if (bimg != null) {
+				imageDimensions.setHeight(bimg.getHeight());
+				imageDimensions.setWidth(bimg.getWidth());
+			}
 		}
 
 		return imageDimensions.getMendixObject();
diff --git a/test/javasource/communitycommons/actions/GetIntFromDateTime.java b/module/javasource/communitycommons/actions/GetIntFromDateTime.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/GetIntFromDateTime.java
rename to module/javasource/communitycommons/actions/GetIntFromDateTime.java
index b5c1bde1..82eddb9e
--- a/test/javasource/communitycommons/actions/GetIntFromDateTime.java
+++ b/module/javasource/communitycommons/actions/GetIntFromDateTime.java
@@ -1,56 +1,56 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.DateTime;
-
-/**
- * Converts a datetime to an integer based on the selector used.
- * 
- * Selectors available are:
- * - year (returns f. ex. 1980)
- * - month (returns 1-12)
- * - day (returns 1-31)
- */
-public class GetIntFromDateTime extends CustomJavaAction<java.lang.Long>
-{
-	private java.util.Date dateObj;
-	private communitycommons.proxies.DatePartSelector selectorObj;
-
-	public GetIntFromDateTime(IContext context, java.util.Date dateObj, java.lang.String selectorObj)
-	{
-		super(context);
-		this.dateObj = dateObj;
-		this.selectorObj = selectorObj == null ? null : communitycommons.proxies.DatePartSelector.valueOf(selectorObj);
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return DateTime.dateTimeToInteger(dateObj, selectorObj);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "GetIntFromDateTime";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.DateTime;
+
+/**
+ * Converts a datetime to an integer based on the selector used.

+ * 

+ * Selectors available are:

+ * - year (returns f. ex. 1980)

+ * - month (returns 1-12)

+ * - day (returns 1-31)
+ */
+public class GetIntFromDateTime extends CustomJavaAction<java.lang.Long>
+{
+	private java.util.Date dateObj;
+	private communitycommons.proxies.DatePartSelector selectorObj;
+
+	public GetIntFromDateTime(IContext context, java.util.Date dateObj, java.lang.String selectorObj)
+	{
+		super(context);
+		this.dateObj = dateObj;
+		this.selectorObj = selectorObj == null ? null : communitycommons.proxies.DatePartSelector.valueOf(selectorObj);
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return DateTime.dateTimeToInteger(dateObj, selectorObj);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "GetIntFromDateTime";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/GetModelVersion.java b/module/javasource/communitycommons/actions/GetModelVersion.java
similarity index 100%
rename from test/javasource/communitycommons/actions/GetModelVersion.java
rename to module/javasource/communitycommons/actions/GetModelVersion.java
diff --git a/test/javasource/communitycommons/actions/GetRuntimeVersion.java b/module/javasource/communitycommons/actions/GetRuntimeVersion.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/GetRuntimeVersion.java
rename to module/javasource/communitycommons/actions/GetRuntimeVersion.java
diff --git a/test/javasource/communitycommons/actions/HTMLEncode.java b/module/javasource/communitycommons/actions/HTMLEncode.java
old mode 100755
new mode 100644
similarity index 88%
rename from test/javasource/communitycommons/actions/HTMLEncode.java
rename to module/javasource/communitycommons/actions/HTMLEncode.java
index c18e84fc..7603b934
--- a/test/javasource/communitycommons/actions/HTMLEncode.java
+++ b/module/javasource/communitycommons/actions/HTMLEncode.java
@@ -1,54 +1,54 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Encodes a string to HTML Entities, so that they can be displayed in the browser without breaking any layout. 
- * 
- * This is useful for special widgets which allow HTML to be rendered properly, including special characters as '<' and '&'. 
- * For example '<' will be encoded as '&lt;' and '&' will be encoded as '&amp;'
- * 
- * Returns the encoded string.
- */
-public class HTMLEncode extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String value;
-
-	public HTMLEncode(IContext context, java.lang.String value)
-	{
-		super(context);
-		this.value = value;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.HTMLEncode(value);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "HTMLEncode";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Encodes a string to HTML Entities, so that they can be displayed in the browser without breaking any layout. 

+ * 

+ * This is useful for special widgets which allow HTML to be rendered properly, including special characters as '<' and '&'. 

+ * For example '<' will be encoded as '&lt;' and '&' will be encoded as '&amp;'

+ * 

+ * Returns the encoded string.
+ */
+public class HTMLEncode extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String value;
+
+	public HTMLEncode(IContext context, java.lang.String value)
+	{
+		super(context);
+		this.value = value;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.HTMLEncode(value);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "HTMLEncode";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/HTMLToPlainText.java b/module/javasource/communitycommons/actions/HTMLToPlainText.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/HTMLToPlainText.java
rename to module/javasource/communitycommons/actions/HTMLToPlainText.java
index 8976462a..7a526474
--- a/test/javasource/communitycommons/actions/HTMLToPlainText.java
+++ b/module/javasource/communitycommons/actions/HTMLToPlainText.java
@@ -1,50 +1,50 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Use this function to convert HTML text to plain text. 
- * It will preserve linebreaks but strip all other markup. including html entity decoding.
- */
-public class HTMLToPlainText extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String html;
-
-	public HTMLToPlainText(IContext context, java.lang.String html)
-	{
-		super(context);
-		this.html = html;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.HTMLToPlainText(html);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "HTMLToPlainText";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Use this function to convert HTML text to plain text. 

+ * It will preserve linebreaks but strip all other markup. including html entity decoding.
+ */
+public class HTMLToPlainText extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String html;
+
+	public HTMLToPlainText(IContext context, java.lang.String html)
+	{
+		super(context);
+		this.html = html;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.HTMLToPlainText(html);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "HTMLToPlainText";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/Hash.java b/module/javasource/communitycommons/actions/Hash.java
old mode 100755
new mode 100644
similarity index 83%
rename from test/javasource/communitycommons/actions/Hash.java
rename to module/javasource/communitycommons/actions/Hash.java
index 2d7d2ba0..67f81946
--- a/test/javasource/communitycommons/actions/Hash.java
+++ b/module/javasource/communitycommons/actions/Hash.java
@@ -1,56 +1,55 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Hashes a value using the SHA-256 hash algorithm. 
- * 
- * - value : the value to hash
- * - length : the desired length of the hash. 
- * 
- * Returns a SHA-256 hash of 'value', with length 'length'
- */
-public class Hash extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String value;
-	private java.lang.Long length;
-
-	public Hash(IContext context, java.lang.String value, java.lang.Long length)
-	{
-		super(context);
-		this.value = value;
-		this.length = length;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.hash(value, length.intValue());
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "Hash";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Hashes a value using the SHA-256 hash algorithm. 

+ * 

+ * - value : the value to hash

+ * 

+ * Returns a SHA-256 hash of 'value'
+ */
+public class Hash extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String value;
+	private java.lang.Long length;
+
+	public Hash(IContext context, java.lang.String value, java.lang.Long length)
+	{
+		super(context);
+		this.value = value;
+		this.length = length;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.hash(value);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "Hash";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/IsInDevelopment.java b/module/javasource/communitycommons/actions/IsInDevelopment.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/IsInDevelopment.java
rename to module/javasource/communitycommons/actions/IsInDevelopment.java
diff --git a/test/javasource/communitycommons/actions/IsStringSimplified.java b/module/javasource/communitycommons/actions/IsStringSimplified.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/IsStringSimplified.java
rename to module/javasource/communitycommons/actions/IsStringSimplified.java
diff --git a/test/javasource/communitycommons/actions/ListTop.java b/module/javasource/communitycommons/actions/ListTop.java
similarity index 100%
rename from test/javasource/communitycommons/actions/ListTop.java
rename to module/javasource/communitycommons/actions/ListTop.java
diff --git a/test/javasource/communitycommons/actions/LongToDateTime.java b/module/javasource/communitycommons/actions/LongToDateTime.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/LongToDateTime.java
rename to module/javasource/communitycommons/actions/LongToDateTime.java
diff --git a/test/javasource/communitycommons/actions/MergeMultiplePdfs.java b/module/javasource/communitycommons/actions/MergeMultiplePdfs.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/MergeMultiplePdfs.java
rename to module/javasource/communitycommons/actions/MergeMultiplePdfs.java
diff --git a/test/javasource/communitycommons/actions/MonthsBetween.java b/module/javasource/communitycommons/actions/MonthsBetween.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/MonthsBetween.java
rename to module/javasource/communitycommons/actions/MonthsBetween.java
index 0d14a789..9c102509
--- a/test/javasource/communitycommons/actions/MonthsBetween.java
+++ b/module/javasource/communitycommons/actions/MonthsBetween.java
@@ -1,63 +1,63 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.DateTime;
-import communitycommons.Logging;
-import communitycommons.proxies.LogLevel;
-import communitycommons.proxies.LogNodes;
-import java.util.Date;
-
-/**
- * Calculates the number of months between two dates. 
- * - dateTime : the original (oldest) dateTime
- * - compareDate: the second date. If EMPTY, the current datetime will be used. Effectively this means that the age of the dateTime is calculated.
- */
-public class MonthsBetween extends CustomJavaAction<java.lang.Long>
-{
-	private java.util.Date date1;
-	private java.util.Date date2;
-
-	public MonthsBetween(IContext context, java.util.Date date1, java.util.Date date2)
-	{
-		super(context);
-		this.date1 = date1;
-		this.date2 = date2;
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		try {
-			return DateTime.periodBetween(date1, date2 == null ? new Date() : date2).toTotalMonths();
-		} catch (Exception e) {
-
-			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "DateTime calculation error, returning -1", e);
-			return -1L;
-		}
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "MonthsBetween";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.DateTime;
+import communitycommons.Logging;
+import communitycommons.proxies.LogLevel;
+import communitycommons.proxies.LogNodes;
+import java.util.Date;
+
+/**
+ * Calculates the number of months between two dates. 

+ * - dateTime : the original (oldest) dateTime

+ * - compareDate: the second date. If EMPTY, the current datetime will be used. Effectively this means that the age of the dateTime is calculated.
+ */
+public class MonthsBetween extends CustomJavaAction<java.lang.Long>
+{
+	private java.util.Date date1;
+	private java.util.Date date2;
+
+	public MonthsBetween(IContext context, java.util.Date date1, java.util.Date date2)
+	{
+		super(context);
+		this.date1 = date1;
+		this.date2 = date2;
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		try {
+			return DateTime.periodBetween(date1, date2 == null ? new Date() : date2).toTotalMonths();
+		} catch (Exception e) {
+
+			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "DateTime calculation error, returning -1", e);
+			return -1L;
+		}
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "MonthsBetween";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/OverlayPdfDocument.java b/module/javasource/communitycommons/actions/OverlayPdfDocument.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/OverlayPdfDocument.java
rename to module/javasource/communitycommons/actions/OverlayPdfDocument.java
diff --git a/test/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java b/module/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java
old mode 100755
new mode 100644
similarity index 95%
rename from test/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java
rename to module/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java
index 7465b408..6a96fe74
--- a/test/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java
+++ b/module/javasource/communitycommons/actions/ParseDateTimeWithTimezone.java
@@ -1,72 +1,72 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Logging;
-import communitycommons.proxies.LogLevel;
-import communitycommons.proxies.LogNodes;
-import java.text.ParseException;
-
-/**
- * This method parses a date from a string with a given pattern according to a specific timezone.
- * The timezone has to be a valid timezone id http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html (e.g. one of https://garygregory.wordpress.com/2013/06/18/what-are-the-java-timezone-ids/) 
- */
-public class ParseDateTimeWithTimezone extends CustomJavaAction<java.util.Date>
-{
-	private java.lang.String date;
-	private java.lang.String pattern;
-	private java.lang.String timeZone;
-	private java.util.Date defaultValue;
-
-	public ParseDateTimeWithTimezone(IContext context, java.lang.String date, java.lang.String pattern, java.lang.String timeZone, java.util.Date defaultValue)
-	{
-		super(context);
-		this.date = date;
-		this.pattern = pattern;
-		this.timeZone = timeZone;
-		this.defaultValue = defaultValue;
-	}
-
-	@java.lang.Override
-	public java.util.Date executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		if (date == null || date.trim().equals("")) {
-			return defaultValue;
-		}
-		
-		try {
-			SimpleDateFormat sdf = new SimpleDateFormat(pattern);
-			sdf.setTimeZone(TimeZone.getTimeZone(timeZone));
-			return sdf.parse(date);
-		} catch (ParseException e) {
-			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "Unable to parse date " + date, e);
-			return defaultValue;
-		}
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "ParseDateTimeWithTimezone";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Logging;
+import communitycommons.proxies.LogLevel;
+import communitycommons.proxies.LogNodes;
+import java.text.ParseException;
+
+/**
+ * This method parses a date from a string with a given pattern according to a specific timezone.

+ * The timezone has to be a valid timezone id http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html (e.g. one of https://garygregory.wordpress.com/2013/06/18/what-are-the-java-timezone-ids/) 
+ */
+public class ParseDateTimeWithTimezone extends CustomJavaAction<java.util.Date>
+{
+	private java.lang.String date;
+	private java.lang.String pattern;
+	private java.lang.String timeZone;
+	private java.util.Date defaultValue;
+
+	public ParseDateTimeWithTimezone(IContext context, java.lang.String date, java.lang.String pattern, java.lang.String timeZone, java.util.Date defaultValue)
+	{
+		super(context);
+		this.date = date;
+		this.pattern = pattern;
+		this.timeZone = timeZone;
+		this.defaultValue = defaultValue;
+	}
+
+	@java.lang.Override
+	public java.util.Date executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		if (date == null || date.trim().equals("")) {
+			return defaultValue;
+		}
+		
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+			sdf.setTimeZone(TimeZone.getTimeZone(timeZone));
+			return sdf.parse(date);
+		} catch (ParseException e) {
+			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "Unable to parse date " + date, e);
+			return defaultValue;
+		}
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "ParseDateTimeWithTimezone";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/RandomHash.java b/module/javasource/communitycommons/actions/RandomHash.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/RandomHash.java
rename to module/javasource/communitycommons/actions/RandomHash.java
diff --git a/test/javasource/communitycommons/actions/RandomString.java b/module/javasource/communitycommons/actions/RandomString.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/RandomString.java
rename to module/javasource/communitycommons/actions/RandomString.java
diff --git a/test/javasource/communitycommons/actions/RandomStrongPassword.java b/module/javasource/communitycommons/actions/RandomStrongPassword.java
old mode 100755
new mode 100644
similarity index 82%
rename from test/javasource/communitycommons/actions/RandomStrongPassword.java
rename to module/javasource/communitycommons/actions/RandomStrongPassword.java
index 886aefe0..62222468
--- a/test/javasource/communitycommons/actions/RandomStrongPassword.java
+++ b/module/javasource/communitycommons/actions/RandomStrongPassword.java
@@ -1,65 +1,72 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.StringUtils;
-
-/**
- * Returns a random strong password containing a specified minimum number of digits, uppercase and special characters.
- * 
- * Note:Minimumlength should be equal or larger than NrOfCapitalizedCharacters, NrOfDigits and NrOfSpecialCharacters
- */
-public class RandomStrongPassword extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.Long MinLength;
-	private java.lang.Long MaxLength;
-	private java.lang.Long NrOfCapitalizedCharacters;
-	private java.lang.Long NrOfDigits;
-	private java.lang.Long NrOfSpecialCharacters;
-
-	public RandomStrongPassword(IContext context, java.lang.Long MinLength, java.lang.Long MaxLength, java.lang.Long NrOfCapitalizedCharacters, java.lang.Long NrOfDigits, java.lang.Long NrOfSpecialCharacters)
-	{
-		super(context);
-		this.MinLength = MinLength;
-		this.MaxLength = MaxLength;
-		this.NrOfCapitalizedCharacters = NrOfCapitalizedCharacters;
-		this.NrOfDigits = NrOfDigits;
-		this.NrOfSpecialCharacters = NrOfSpecialCharacters;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.randomStrongPassword(safeLongToInt(this.MinLength), safeLongToInt(this.MaxLength), safeLongToInt(this.NrOfCapitalizedCharacters), safeLongToInt(NrOfDigits), safeLongToInt(NrOfSpecialCharacters));
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "RandomStrongPassword";
-	}
-
-	// BEGIN EXTRA CODE
-	public static int safeLongToInt(long l) {
-		if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
-			throw new IllegalArgumentException(l + " cannot be cast to int without changing its value.");
-		}
-		return (int) l;
-	}
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.StringUtils;
+
+/**
+ * Returns a random strong password containing a specified minimum number of digits, uppercase and special characters.

+ * 

+ * Note:Minimumlength should be equal or larger than NrOfCapitalizedCharacters, NrOfDigits and NrOfSpecialCharacters
+ */
+public class RandomStrongPassword extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.Long MinLength;
+	private java.lang.Long MaxLength;
+	private java.lang.Long NrOfCapitalizedCharacters;
+	private java.lang.Long NrOfDigits;
+	private java.lang.Long NrOfSpecialCharacters;
+
+	public RandomStrongPassword(IContext context, java.lang.Long MinLength, java.lang.Long MaxLength, java.lang.Long NrOfCapitalizedCharacters, java.lang.Long NrOfDigits, java.lang.Long NrOfSpecialCharacters)
+	{
+		super(context);
+		this.MinLength = MinLength;
+		this.MaxLength = MaxLength;
+		this.NrOfCapitalizedCharacters = NrOfCapitalizedCharacters;
+		this.NrOfDigits = NrOfDigits;
+		this.NrOfSpecialCharacters = NrOfSpecialCharacters;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.randomStrongPassword(
+			safeLongToInt(MinLength),
+			safeLongToInt(MaxLength),
+			safeLongToInt(NrOfCapitalizedCharacters),
+			safeLongToInt(NrOfDigits),
+			safeLongToInt(NrOfSpecialCharacters)
+		);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "RandomStrongPassword";
+	}
+
+	// BEGIN EXTRA CODE
+	public static int safeLongToInt(Long l) {
+		if (l == null) return 0;
+		if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
+			throw new IllegalArgumentException(l + " cannot be cast to int without changing its value.");
+		}
+		return l.intValue();
+	}
+	// END EXTRA CODE
+}
diff --git a/module/javasource/communitycommons/actions/RandomStrongPasswordWithLowercase.java b/module/javasource/communitycommons/actions/RandomStrongPasswordWithLowercase.java
new file mode 100644
index 00000000..56d11702
--- /dev/null
+++ b/module/javasource/communitycommons/actions/RandomStrongPasswordWithLowercase.java
@@ -0,0 +1,75 @@
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.StringUtils;
+
+/**
+ * Returns a random strong password containing a specified minimum number of digits, uppercase, lowercase and special characters.

+ * 

+ * Note:Minimumlength should be equal or larger than NrOfCapitalizedCharacters, NrOfLowercaseCharacters, NrOfDigits and NrOfSpecialCharacters
+ */
+public class RandomStrongPasswordWithLowercase extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.Long MinLength;
+	private java.lang.Long MaxLength;
+	private java.lang.Long NrOfCapitalizedCharacters;
+	private java.lang.Long NrOfLowercaseCharacters;
+	private java.lang.Long NrOfDigits;
+	private java.lang.Long NrOfSpecialCharacters;
+
+	public RandomStrongPasswordWithLowercase(IContext context, java.lang.Long MinLength, java.lang.Long MaxLength, java.lang.Long NrOfCapitalizedCharacters, java.lang.Long NrOfLowercaseCharacters, java.lang.Long NrOfDigits, java.lang.Long NrOfSpecialCharacters)
+	{
+		super(context);
+		this.MinLength = MinLength;
+		this.MaxLength = MaxLength;
+		this.NrOfCapitalizedCharacters = NrOfCapitalizedCharacters;
+		this.NrOfLowercaseCharacters = NrOfLowercaseCharacters;
+		this.NrOfDigits = NrOfDigits;
+		this.NrOfSpecialCharacters = NrOfSpecialCharacters;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.randomStrongPassword(
+			safeLongToInt(MinLength),
+			safeLongToInt(MaxLength),
+			safeLongToInt(NrOfCapitalizedCharacters),
+			safeLongToInt(NrOfLowercaseCharacters),
+			safeLongToInt(NrOfDigits),
+			safeLongToInt(NrOfSpecialCharacters)
+		);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "RandomStrongPasswordWithLowercase";
+	}
+
+	// BEGIN EXTRA CODE
+	public static int safeLongToInt(Long l) {
+		if (l == null) return 0;
+		if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
+			throw new IllegalArgumentException(l + " cannot be cast to int without changing its value.");
+		}
+		return l.intValue();
+	}
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/RegexQuote.java b/module/javasource/communitycommons/actions/RegexQuote.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/RegexQuote.java
rename to module/javasource/communitycommons/actions/RegexQuote.java
diff --git a/test/javasource/communitycommons/actions/RegexReplaceAll.java b/module/javasource/communitycommons/actions/RegexReplaceAll.java
old mode 100755
new mode 100644
similarity index 90%
rename from test/javasource/communitycommons/actions/RegexReplaceAll.java
rename to module/javasource/communitycommons/actions/RegexReplaceAll.java
index 3a82d5fe..1a709990
--- a/test/javasource/communitycommons/actions/RegexReplaceAll.java
+++ b/module/javasource/communitycommons/actions/RegexReplaceAll.java
@@ -1,59 +1,59 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Performs a regular expression. Similar to the replaceAll microflow function, but supports more advanced usages such as capture variables.
- * 
- * For the regexp specification see:
- * https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html
- * 
- * A decent regexp tester can be found at:
- * http://www.fileformat.info/tool/regex.htm
- */
-public class RegexReplaceAll extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String haystack;
-	private java.lang.String needleRegex;
-	private java.lang.String replacement;
-
-	public RegexReplaceAll(IContext context, java.lang.String haystack, java.lang.String needleRegex, java.lang.String replacement)
-	{
-		super(context);
-		this.haystack = haystack;
-		this.needleRegex = needleRegex;
-		this.replacement = replacement;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.regexReplaceAll(haystack, needleRegex, replacement);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "RegexReplaceAll";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Performs a regular expression. Similar to the replaceAll microflow function, but supports more advanced usages such as capture variables.

+ * 

+ * For the regexp specification see:

+ * https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html

+ * 

+ * A decent regexp tester can be found at:

+ * http://www.fileformat.info/tool/regex.htm
+ */
+public class RegexReplaceAll extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String haystack;
+	private java.lang.String needleRegex;
+	private java.lang.String replacement;
+
+	public RegexReplaceAll(IContext context, java.lang.String haystack, java.lang.String needleRegex, java.lang.String replacement)
+	{
+		super(context);
+		this.haystack = haystack;
+		this.needleRegex = needleRegex;
+		this.replacement = replacement;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.regexReplaceAll(haystack, needleRegex, replacement);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "RegexReplaceAll";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/RemoveEnd.java b/module/javasource/communitycommons/actions/RemoveEnd.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/RemoveEnd.java
rename to module/javasource/communitycommons/actions/RemoveEnd.java
diff --git a/test/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java b/module/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java
rename to module/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java
index ae18ee45..c3bf7381
--- a/test/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java
+++ b/module/javasource/communitycommons/actions/RunMicroflowAsyncInQueue.java
@@ -1,51 +1,51 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Runs a microflow asynchronous, that is, this action immediately returns but schedules the microflow to be run in the near future. The queue guarantees a first come first serve order of the microflows, and only one action is served at a time.
- * 
- * The microflow is run with system rights in its own transaction, and is very useful to run heavy microflows on the background.
- */
-public class RunMicroflowAsyncInQueue extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String microflow;
-
-	public RunMicroflowAsyncInQueue(IContext context, java.lang.String microflow)
-	{
-		super(context);
-		this.microflow = microflow;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Misc.runMicroflowAsyncInQueue(microflow);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "RunMicroflowAsyncInQueue";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Runs a microflow asynchronous, that is, this action immediately returns but schedules the microflow to be run in the near future. The queue guarantees a first come first serve order of the microflows, and only one action is served at a time.

+ * 

+ * The microflow is run with system rights in its own transaction, and is very useful to run heavy microflows on the background.
+ */
+public class RunMicroflowAsyncInQueue extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String microflow;
+
+	public RunMicroflowAsyncInQueue(IContext context, java.lang.String microflow)
+	{
+		super(context);
+		this.microflow = microflow;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Misc.runMicroflowAsyncInQueue(microflow);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "RunMicroflowAsyncInQueue";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/StartTransaction.java b/module/javasource/communitycommons/actions/StartTransaction.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/StartTransaction.java
rename to module/javasource/communitycommons/actions/StartTransaction.java
diff --git a/test/javasource/communitycommons/actions/StringFromFile.java b/module/javasource/communitycommons/actions/StringFromFile.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/StringFromFile.java
rename to module/javasource/communitycommons/actions/StringFromFile.java
diff --git a/test/javasource/communitycommons/actions/StringLeftPad.java b/module/javasource/communitycommons/actions/StringLeftPad.java
old mode 100755
new mode 100644
similarity index 84%
rename from test/javasource/communitycommons/actions/StringLeftPad.java
rename to module/javasource/communitycommons/actions/StringLeftPad.java
index 72dc4883..1b9152ca
--- a/test/javasource/communitycommons/actions/StringLeftPad.java
+++ b/module/javasource/communitycommons/actions/StringLeftPad.java
@@ -1,59 +1,59 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Pads a string on the left to a certain length. 
- * value : the original value
- * amount: the desired length of the resulting string.
- * fillCharacter: the character to pad with. (or space if empty)
- * 
- * For example
- * StringLeftPad("hello", 8, "-")  returns "---hello"
- * StringLeftPad("hello", 2, "-")  returns "hello"
- */
-public class StringLeftPad extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String value;
-	private java.lang.Long amount;
-	private java.lang.String fillCharacter;
-
-	public StringLeftPad(IContext context, java.lang.String value, java.lang.Long amount, java.lang.String fillCharacter)
-	{
-		super(context);
-		this.value = value;
-		this.amount = amount;
-		this.fillCharacter = fillCharacter;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return communitycommons.StringUtils.leftPad(value, amount, fillCharacter);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "StringLeftPad";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Pads a string on the left to a certain length. 

+ * value : the original value

+ * amount: the desired length of the resulting string.

+ * fillCharacter: the character to pad with. (or space if empty)

+ * 

+ * For example

+ * StringLeftPad("hello", 8, "-")  returns "---hello"

+ * StringLeftPad("hello", 2, "-")  returns "hello"
+ */
+public class StringLeftPad extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String value;
+	private java.lang.Long amount;
+	private java.lang.String fillCharacter;
+
+	public StringLeftPad(IContext context, java.lang.String value, java.lang.Long amount, java.lang.String fillCharacter)
+	{
+		super(context);
+		this.value = value;
+		this.amount = amount;
+		this.fillCharacter = fillCharacter;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return communitycommons.StringUtils.leftPad(value, amount, fillCharacter);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "StringLeftPad";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/StringRightPad.java b/module/javasource/communitycommons/actions/StringRightPad.java
old mode 100755
new mode 100644
similarity index 84%
rename from test/javasource/communitycommons/actions/StringRightPad.java
rename to module/javasource/communitycommons/actions/StringRightPad.java
index 7cf0cf87..2bdb2dc5
--- a/test/javasource/communitycommons/actions/StringRightPad.java
+++ b/module/javasource/communitycommons/actions/StringRightPad.java
@@ -1,59 +1,59 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Pads a string on the right to a certain length. 
- * value : the original value
- * amount: the desired length of the resulting string.
- * fillCharacter: the character to pad with. (or space if empty)
- * 
- * For example
- * StringRightPad("hello", 8, "-")  returns "hello---"
- * StringLeftpad("hello", 2, "-")  returns "hello"
- */
-public class StringRightPad extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String value;
-	private java.lang.Long amount;
-	private java.lang.String fillCharacter;
-
-	public StringRightPad(IContext context, java.lang.String value, java.lang.Long amount, java.lang.String fillCharacter)
-	{
-		super(context);
-		this.value = value;
-		this.amount = amount;
-		this.fillCharacter = fillCharacter;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return communitycommons.StringUtils.rightPad(value, amount, fillCharacter);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "StringRightPad";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Pads a string on the right to a certain length. 

+ * value : the original value

+ * amount: the desired length of the resulting string.

+ * fillCharacter: the character to pad with. (or space if empty)

+ * 

+ * For example

+ * StringRightPad("hello", 8, "-")  returns "hello---"

+ * StringLeftpad("hello", 2, "-")  returns "hello"
+ */
+public class StringRightPad extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String value;
+	private java.lang.Long amount;
+	private java.lang.String fillCharacter;
+
+	public StringRightPad(IContext context, java.lang.String value, java.lang.Long amount, java.lang.String fillCharacter)
+	{
+		super(context);
+		this.value = value;
+		this.amount = amount;
+		this.fillCharacter = fillCharacter;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return communitycommons.StringUtils.rightPad(value, amount, fillCharacter);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "StringRightPad";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/StringSimplify.java b/module/javasource/communitycommons/actions/StringSimplify.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/StringSimplify.java
rename to module/javasource/communitycommons/actions/StringSimplify.java
diff --git a/test/javasource/communitycommons/actions/StringSplit.java b/module/javasource/communitycommons/actions/StringSplit.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/StringSplit.java
rename to module/javasource/communitycommons/actions/StringSplit.java
diff --git a/test/javasource/communitycommons/actions/StringToFile.java b/module/javasource/communitycommons/actions/StringToFile.java
old mode 100755
new mode 100644
similarity index 96%
rename from test/javasource/communitycommons/actions/StringToFile.java
rename to module/javasource/communitycommons/actions/StringToFile.java
index cb87fe76..dbde6802
--- a/test/javasource/communitycommons/actions/StringToFile.java
+++ b/module/javasource/communitycommons/actions/StringToFile.java
@@ -1,64 +1,64 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.StringUtils;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Stores a string into the provided FileDocument, using the specified encoding.
- * Note that destination will be committed.
- */
-public class StringToFile extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String value;
-	private IMendixObject __destination;
-	private system.proxies.FileDocument destination;
-	private communitycommons.proxies.StandardEncodings encoding;
-
-	public StringToFile(IContext context, java.lang.String value, IMendixObject destination, java.lang.String encoding)
-	{
-		super(context);
-		this.value = value;
-		this.__destination = destination;
-		this.encoding = encoding == null ? null : communitycommons.proxies.StandardEncodings.valueOf(encoding);
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		this.destination = this.__destination == null ? null : system.proxies.FileDocument.initialize(getContext(), __destination);
-
-		// BEGIN USER CODE
-		Charset charset = StandardCharsets.UTF_8;
-		if (this.encoding != null)
-			charset = Charset.forName(this.encoding.name().replace('_', '-'));
-		StringUtils.stringToFile(getContext(), value, destination, charset);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "StringToFile";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.StringUtils;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Stores a string into the provided FileDocument, using the specified encoding.

+ * Note that destination will be committed.
+ */
+public class StringToFile extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String value;
+	private IMendixObject __destination;
+	private system.proxies.FileDocument destination;
+	private communitycommons.proxies.StandardEncodings encoding;
+
+	public StringToFile(IContext context, java.lang.String value, IMendixObject destination, java.lang.String encoding)
+	{
+		super(context);
+		this.value = value;
+		this.__destination = destination;
+		this.encoding = encoding == null ? null : communitycommons.proxies.StandardEncodings.valueOf(encoding);
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		this.destination = this.__destination == null ? null : system.proxies.FileDocument.initialize(getContext(), __destination);
+
+		// BEGIN USER CODE
+		Charset charset = StandardCharsets.UTF_8;
+		if (this.encoding != null)
+			charset = Charset.forName(this.encoding.name().replace('_', '-'));
+		StringUtils.stringToFile(getContext(), value, destination, charset);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "StringToFile";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/StringTrim.java b/module/javasource/communitycommons/actions/StringTrim.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/StringTrim.java
rename to module/javasource/communitycommons/actions/StringTrim.java
index fc4f3eee..e343b1aa
--- a/test/javasource/communitycommons/actions/StringTrim.java
+++ b/module/javasource/communitycommons/actions/StringTrim.java
@@ -1,51 +1,51 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Left and right trims a string (that is; removes all surrounding whitespace characters such as tabs, spaces and returns). 
- * Returns the empty string if value is the empty value. Returns the trimmed string otherwise.
- */
-public class StringTrim extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String value;
-
-	public StringTrim(IContext context, java.lang.String value)
-	{
-		super(context);
-		this.value = value;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		if (this.value == null)
-			return "";
-		return this.value.trim();
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "StringTrim";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Left and right trims a string (that is; removes all surrounding whitespace characters such as tabs, spaces and returns). 

+ * Returns the empty string if value is the empty value. Returns the trimmed string otherwise.
+ */
+public class StringTrim extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String value;
+
+	public StringTrim(IContext context, java.lang.String value)
+	{
+		super(context);
+		this.value = value;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		if (this.value == null)
+			return "";
+		return this.value.trim();
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "StringTrim";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/SubstituteTemplate.java b/module/javasource/communitycommons/actions/SubstituteTemplate.java
old mode 100755
new mode 100644
similarity index 84%
rename from test/javasource/communitycommons/actions/SubstituteTemplate.java
rename to module/javasource/communitycommons/actions/SubstituteTemplate.java
index 29507550..e3984bd6
--- a/test/javasource/communitycommons/actions/SubstituteTemplate.java
+++ b/module/javasource/communitycommons/actions/SubstituteTemplate.java
@@ -1,69 +1,69 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Given an object and a template, substitutes all fields in the template. Supports attributes, references, referencesets and constants. 
- * 
- * The general field syntax is '{fieldname}'. 
- * 
- * Fieldname can be a member of the example object, an attribute which need to be retrieved over an reference(set) or a project constant. All paths are relative from the provided substitute obect. An example template:
- * ------------------
- * Dear {EmailOrName},
- * 
- * {System.changedBy/FullName} has invited you to join the project {Module.MemberShip_Project/Name}. 
- * Sign up is free and can be done here:
- * {@Module.PublicURL}link/Signup
- * -------------------------
- * 
- * useHTMLEncoding identifies whether HTMLEncode is applied to the values before substituting.
- * 
- * datetimeformat identifies a format string which is applied to date/time based attributes. Can be left empty. Defaults to "EEE dd MMM yyyy, HH:mm"
- */
-public class SubstituteTemplate extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String template;
-	private IMendixObject substitute;
-	private java.lang.Boolean useHTMLEncoding;
-
-	public SubstituteTemplate(IContext context, java.lang.String template, IMendixObject substitute, java.lang.Boolean useHTMLEncoding)
-	{
-		super(context);
-		this.template = template;
-		this.substitute = substitute;
-		this.useHTMLEncoding = useHTMLEncoding;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.substituteTemplate(this.getContext(), template, substitute, useHTMLEncoding, null);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "SubstituteTemplate";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Given an object and a template, substitutes all fields in the template. Supports attributes, references, referencesets and constants. 

+ * 

+ * The general field syntax is '{fieldname}'. 

+ * 

+ * Fieldname can be a member of the example object, an attribute which need to be retrieved over an reference(set) or a project constant. All paths are relative from the provided substitute obect. An example template:

+ * ------------------

+ * Dear {EmailOrName},

+ * 

+ * {System.changedBy/FullName} has invited you to join the project {Module.MemberShip_Project/Name}. 

+ * Sign up is free and can be done here:

+ * {@Module.PublicURL}link/Signup

+ * -------------------------

+ * 

+ * useHTMLEncoding identifies whether HTMLEncode is applied to the values before substituting.

+ * 

+ * datetimeformat identifies a format string which is applied to date/time based attributes. Can be left empty. Defaults to "EEE dd MMM yyyy, HH:mm"
+ */
+public class SubstituteTemplate extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String template;
+	private IMendixObject substitute;
+	private java.lang.Boolean useHTMLEncoding;
+
+	public SubstituteTemplate(IContext context, java.lang.String template, IMendixObject substitute, java.lang.Boolean useHTMLEncoding)
+	{
+		super(context);
+		this.template = template;
+		this.substitute = substitute;
+		this.useHTMLEncoding = useHTMLEncoding;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.substituteTemplate(this.getContext(), template, substitute, useHTMLEncoding, null);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "SubstituteTemplate";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/SubstituteTemplate2.java b/module/javasource/communitycommons/actions/SubstituteTemplate2.java
old mode 100755
new mode 100644
similarity index 96%
rename from test/javasource/communitycommons/actions/SubstituteTemplate2.java
rename to module/javasource/communitycommons/actions/SubstituteTemplate2.java
index 98195c40..c7318774
--- a/test/javasource/communitycommons/actions/SubstituteTemplate2.java
+++ b/module/javasource/communitycommons/actions/SubstituteTemplate2.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.StringUtils;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Identical to SubstituteTemplate, but adds an datetimeformat argument
- * 
- * DateTimeFormat identifies a format string which is applied to date/time based attributes. Can be left empty. Defaults to "EEE dd MMM yyyy, HH:mm"
- */
-public class SubstituteTemplate2 extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String template;
-	private IMendixObject substitute;
-	private java.lang.Boolean useHTMLEncoding;
-	private java.lang.String datetimeformat;
-
-	public SubstituteTemplate2(IContext context, java.lang.String template, IMendixObject substitute, java.lang.Boolean useHTMLEncoding, java.lang.String datetimeformat)
-	{
-		super(context);
-		this.template = template;
-		this.substitute = substitute;
-		this.useHTMLEncoding = useHTMLEncoding;
-		this.datetimeformat = datetimeformat;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return StringUtils.substituteTemplate(this.getContext(), template, substitute, useHTMLEncoding, this.datetimeformat);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "SubstituteTemplate2";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.StringUtils;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Identical to SubstituteTemplate, but adds an datetimeformat argument

+ * 

+ * DateTimeFormat identifies a format string which is applied to date/time based attributes. Can be left empty. Defaults to "EEE dd MMM yyyy, HH:mm"
+ */
+public class SubstituteTemplate2 extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String template;
+	private IMendixObject substitute;
+	private java.lang.Boolean useHTMLEncoding;
+	private java.lang.String datetimeformat;
+
+	public SubstituteTemplate2(IContext context, java.lang.String template, IMendixObject substitute, java.lang.Boolean useHTMLEncoding, java.lang.String datetimeformat)
+	{
+		super(context);
+		this.template = template;
+		this.substitute = substitute;
+		this.useHTMLEncoding = useHTMLEncoding;
+		this.datetimeformat = datetimeformat;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return StringUtils.substituteTemplate(this.getContext(), template, substitute, useHTMLEncoding, this.datetimeformat);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "SubstituteTemplate2";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/SubstringAfter.java b/module/javasource/communitycommons/actions/SubstringAfter.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/SubstringAfter.java
rename to module/javasource/communitycommons/actions/SubstringAfter.java
diff --git a/test/javasource/communitycommons/actions/SubstringAfterLast.java b/module/javasource/communitycommons/actions/SubstringAfterLast.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/SubstringAfterLast.java
rename to module/javasource/communitycommons/actions/SubstringAfterLast.java
diff --git a/test/javasource/communitycommons/actions/SubstringBefore.java b/module/javasource/communitycommons/actions/SubstringBefore.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/SubstringBefore.java
rename to module/javasource/communitycommons/actions/SubstringBefore.java
diff --git a/test/javasource/communitycommons/actions/SubstringBeforeLast.java b/module/javasource/communitycommons/actions/SubstringBeforeLast.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/SubstringBeforeLast.java
rename to module/javasource/communitycommons/actions/SubstringBeforeLast.java
diff --git a/test/javasource/communitycommons/actions/ThrowException.java b/module/javasource/communitycommons/actions/ThrowException.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/ThrowException.java
rename to module/javasource/communitycommons/actions/ThrowException.java
index f4e9608b..8d8e8b31
--- a/test/javasource/communitycommons/actions/ThrowException.java
+++ b/module/javasource/communitycommons/actions/ThrowException.java
@@ -1,54 +1,54 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * This action always throws an exception (of type communityutils.UserThrownError), which is, in combination with custom error handling, quite useful to end a microflow prematurely or to bail out to the calling action/ microflow. 
- * 
- * The message of the last thrown error can be inspected by using the variable $lasterrormessage
- * 
- * Example usuage: In general, if an Event (before commit especially) returns false, it should call this action and then return true instead. If an Before commit returns false, the object will not be committed, but there is no easy way for the calling Microflow/ action to detect this! An exception on the other hand, will be noticed.
- */
-public class ThrowException extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String message;
-
-	public ThrowException(IContext context, java.lang.String message)
-	{
-		super(context);
-		this.message = message;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Misc.throwException(message);
-		return null;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "ThrowException";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * This action always throws an exception (of type communityutils.UserThrownError), which is, in combination with custom error handling, quite useful to end a microflow prematurely or to bail out to the calling action/ microflow. 

+ * 

+ * The message of the last thrown error can be inspected by using the variable $lasterrormessage

+ * 

+ * Example usuage: In general, if an Event (before commit especially) returns false, it should call this action and then return true instead. If an Before commit returns false, the object will not be committed, but there is no easy way for the calling Microflow/ action to detect this! An exception on the other hand, will be noticed.
+ */
+public class ThrowException extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String message;
+
+	public ThrowException(IContext context, java.lang.String message)
+	{
+		super(context);
+		this.message = message;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Misc.throwException(message);
+		return null;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "ThrowException";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/ThrowWebserviceException.java b/module/javasource/communitycommons/actions/ThrowWebserviceException.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/ThrowWebserviceException.java
rename to module/javasource/communitycommons/actions/ThrowWebserviceException.java
index a27a5ed5..c69b8bf1
--- a/test/javasource/communitycommons/actions/ThrowWebserviceException.java
+++ b/module/javasource/communitycommons/actions/ThrowWebserviceException.java
@@ -1,54 +1,54 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * (Behavior has changed since version 3.2. The exception is now properly propagated to the cient). 
- * 
- * Throws an exception.  This is very useful if the microflow is called by a webservice. If you throw this kind of exceptions, an fault message will be generated in the output, instead of an '501 Internal server' error.
- * 
- * If debug level of community commons is set to 'debug' the errors will be locally visible as well, otherwise not. Throwing a webservice exception states that the webservice invocation was incorrect, not the webservice implementation.
- */
-public class ThrowWebserviceException extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String faultstring;
-
-	public ThrowWebserviceException(IContext context, java.lang.String faultstring)
-	{
-		super(context);
-		this.faultstring = faultstring;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Misc.throwWebserviceException(faultstring);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "ThrowWebserviceException";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * (Behavior has changed since version 3.2. The exception is now properly propagated to the cient). 

+ * 

+ * Throws an exception.  This is very useful if the microflow is called by a webservice. If you throw this kind of exceptions, an fault message will be generated in the output, instead of an '501 Internal server' error.

+ * 

+ * If debug level of community commons is set to 'debug' the errors will be locally visible as well, otherwise not. Throwing a webservice exception states that the webservice invocation was incorrect, not the webservice implementation.
+ */
+public class ThrowWebserviceException extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String faultstring;
+
+	public ThrowWebserviceException(IContext context, java.lang.String faultstring)
+	{
+		super(context);
+		this.faultstring = faultstring;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Misc.throwWebserviceException(faultstring);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "ThrowWebserviceException";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/TimeMeasureEnd.java b/module/javasource/communitycommons/actions/TimeMeasureEnd.java
old mode 100755
new mode 100644
similarity index 89%
rename from test/javasource/communitycommons/actions/TimeMeasureEnd.java
rename to module/javasource/communitycommons/actions/TimeMeasureEnd.java
index 540d6472..90cb8064
--- a/test/javasource/communitycommons/actions/TimeMeasureEnd.java
+++ b/module/javasource/communitycommons/actions/TimeMeasureEnd.java
@@ -1,56 +1,56 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Logging;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * End timing something, and print the result to the log. 
- * - TimerName. Should correspond to the TimerName used with TimeMeasureStart.
- * - LogLevel. The loglevel used to print the result.
- * - The message to be printed in the log.
- */
-public class TimeMeasureEnd extends CustomJavaAction<java.lang.Long>
-{
-	private java.lang.String TimerName;
-	private communitycommons.proxies.LogLevel Loglevel;
-	private java.lang.String message;
-
-	public TimeMeasureEnd(IContext context, java.lang.String TimerName, java.lang.String Loglevel, java.lang.String message)
-	{
-		super(context);
-		this.TimerName = TimerName;
-		this.Loglevel = Loglevel == null ? null : communitycommons.proxies.LogLevel.valueOf(Loglevel);
-		this.message = message;
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Logging.measureEnd(TimerName, Loglevel, message);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "TimeMeasureEnd";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Logging;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * End timing something, and print the result to the log. 

+ * - TimerName. Should correspond to the TimerName used with TimeMeasureStart.

+ * - LogLevel. The loglevel used to print the result.

+ * - The message to be printed in the log.
+ */
+public class TimeMeasureEnd extends CustomJavaAction<java.lang.Long>
+{
+	private java.lang.String TimerName;
+	private communitycommons.proxies.LogLevel Loglevel;
+	private java.lang.String message;
+
+	public TimeMeasureEnd(IContext context, java.lang.String TimerName, java.lang.String Loglevel, java.lang.String message)
+	{
+		super(context);
+		this.TimerName = TimerName;
+		this.Loglevel = Loglevel == null ? null : communitycommons.proxies.LogLevel.valueOf(Loglevel);
+		this.message = message;
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Logging.measureEnd(TimerName, Loglevel, message);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "TimeMeasureEnd";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/TimeMeasureStart.java b/module/javasource/communitycommons/actions/TimeMeasureStart.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/TimeMeasureStart.java
rename to module/javasource/communitycommons/actions/TimeMeasureStart.java
index b8ff5d97..3a478fd7
--- a/test/javasource/communitycommons/actions/TimeMeasureStart.java
+++ b/module/javasource/communitycommons/actions/TimeMeasureStart.java
@@ -1,53 +1,53 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Logging;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Start timing something, and print the result to the log. 
- * - TimerName. Should correspond to the TimerName used in TimeMeasureEnd.
- * 
- * Note that multiple timers can run at once. Existing timers can be restarted using this function as well.
- */
-public class TimeMeasureStart extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String TimerName;
-
-	public TimeMeasureStart(IContext context, java.lang.String TimerName)
-	{
-		super(context);
-		this.TimerName = TimerName;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Logging.measureStart(TimerName);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "TimeMeasureStart";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Logging;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Start timing something, and print the result to the log. 

+ * - TimerName. Should correspond to the TimerName used in TimeMeasureEnd.

+ * 

+ * Note that multiple timers can run at once. Existing timers can be restarted using this function as well.
+ */
+public class TimeMeasureStart extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String TimerName;
+
+	public TimeMeasureStart(IContext context, java.lang.String TimerName)
+	{
+		super(context);
+		this.TimerName = TimerName;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Logging.measureStart(TimerName);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "TimeMeasureStart";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/XSSSanitize.java b/module/javasource/communitycommons/actions/XSSSanitize.java
old mode 100755
new mode 100644
similarity index 88%
rename from test/javasource/communitycommons/actions/XSSSanitize.java
rename to module/javasource/communitycommons/actions/XSSSanitize.java
index ab4a47bd..ae6c8055
--- a/test/javasource/communitycommons/actions/XSSSanitize.java
+++ b/module/javasource/communitycommons/actions/XSSSanitize.java
@@ -1,95 +1,95 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.MendixRuntimeException;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.proxies.SanitizerPolicy;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Removes all potential dangerous HTML from a string so that it can be safely displayed in a browser. 
- * 
- * This function should be applied to all HTML which is displayed in the browser, and can be entered by (untrusted) users.
- * 
- * - HTML: The html to sanitize
- * - policy1... policy6: one or more values of SanitizerPolicy. You may leave these policy parameters empty if you don't want to allow additional elements.
- * 
- * BLOCKS: Allows common block elements including <p>, <h1>, etc.
- * FORMATTING: Allows common formatting elements including <b>, <i>, etc.
- * IMAGES: Allows <img> elements from HTTP, HTTPS, and relative sources.
- * LINKS: Allows HTTP, HTTPS, MAILTO and relative links
- * STYLES: Allows certain safe CSS properties in style="..." attributes.
- * TABLES: Allows commons table elements.
- * 
- * For more information, visit:
- * 
- * http://javadoc.io/doc/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/20180219.1
- */
-public class XSSSanitize extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String html;
-	private communitycommons.proxies.SanitizerPolicy policy1;
-	private communitycommons.proxies.SanitizerPolicy policy2;
-	private communitycommons.proxies.SanitizerPolicy policy3;
-	private communitycommons.proxies.SanitizerPolicy policy4;
-	private communitycommons.proxies.SanitizerPolicy policy5;
-	private communitycommons.proxies.SanitizerPolicy policy6;
-
-	public XSSSanitize(IContext context, java.lang.String html, java.lang.String policy1, java.lang.String policy2, java.lang.String policy3, java.lang.String policy4, java.lang.String policy5, java.lang.String policy6)
-	{
-		super(context);
-		this.html = html;
-		this.policy1 = policy1 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy1);
-		this.policy2 = policy2 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy2);
-		this.policy3 = policy3 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy3);
-		this.policy4 = policy4 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy4);
-		this.policy5 = policy5 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy5);
-		this.policy6 = policy6 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy6);
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		if (StringUtils.isEmpty(html)) {
-			return "";
-		}
-
-		List<SanitizerPolicy> policyParams = Stream.of(policy1, policy2, policy3, policy4, policy5, policy6)
-			.filter(Objects::nonNull)
-			.collect(Collectors.toList());
-
-		if (policyParams.isEmpty()) {
-			throw new MendixRuntimeException("At least one policy is required");
-		}
-
-		return communitycommons.StringUtils.sanitizeHTML(html, policyParams);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "XSSSanitize";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.MendixRuntimeException;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.proxies.SanitizerPolicy;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Removes all potential dangerous HTML from a string so that it can be safely displayed in a browser. 

+ * 

+ * This function should be applied to all HTML which is displayed in the browser, and can be entered by (untrusted) users.

+ * 

+ * - HTML: The html to sanitize

+ * - policy1... policy6: one or more values of SanitizerPolicy. You may leave these policy parameters empty if you don't want to allow additional elements.

+ * 

+ * BLOCKS: Allows common block elements including <p>, <h1>, etc.

+ * FORMATTING: Allows common formatting elements including <b>, <i>, etc.

+ * IMAGES: Allows <img> elements from HTTP, HTTPS, and relative sources.

+ * LINKS: Allows HTTP, HTTPS, MAILTO and relative links

+ * STYLES: Allows certain safe CSS properties in style="..." attributes.

+ * TABLES: Allows commons table elements.

+ * 

+ * For more information, visit:

+ * 

+ * http://javadoc.io/doc/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/20180219.1
+ */
+public class XSSSanitize extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String html;
+	private communitycommons.proxies.SanitizerPolicy policy1;
+	private communitycommons.proxies.SanitizerPolicy policy2;
+	private communitycommons.proxies.SanitizerPolicy policy3;
+	private communitycommons.proxies.SanitizerPolicy policy4;
+	private communitycommons.proxies.SanitizerPolicy policy5;
+	private communitycommons.proxies.SanitizerPolicy policy6;
+
+	public XSSSanitize(IContext context, java.lang.String html, java.lang.String policy1, java.lang.String policy2, java.lang.String policy3, java.lang.String policy4, java.lang.String policy5, java.lang.String policy6)
+	{
+		super(context);
+		this.html = html;
+		this.policy1 = policy1 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy1);
+		this.policy2 = policy2 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy2);
+		this.policy3 = policy3 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy3);
+		this.policy4 = policy4 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy4);
+		this.policy5 = policy5 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy5);
+		this.policy6 = policy6 == null ? null : communitycommons.proxies.SanitizerPolicy.valueOf(policy6);
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		if (StringUtils.isEmpty(html)) {
+			return "";
+		}
+
+		List<SanitizerPolicy> policyParams = Stream.of(policy1, policy2, policy3, policy4, policy5, policy6)
+			.filter(Objects::nonNull)
+			.collect(Collectors.toList());
+
+		if (policyParams.isEmpty()) {
+			throw new MendixRuntimeException("At least one policy is required");
+		}
+
+		return communitycommons.StringUtils.sanitizeHTML(html, policyParams);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "XSSSanitize";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/YearsBetween.java b/module/javasource/communitycommons/actions/YearsBetween.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/YearsBetween.java
rename to module/javasource/communitycommons/actions/YearsBetween.java
index a54a38ae..406ee889
--- a/test/javasource/communitycommons/actions/YearsBetween.java
+++ b/module/javasource/communitycommons/actions/YearsBetween.java
@@ -1,63 +1,63 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.DateTime;
-import communitycommons.Logging;
-import communitycommons.proxies.LogLevel;
-import communitycommons.proxies.LogNodes;
-import java.util.Date;
-
-/**
- * Calculates the number of years between two dates. 
- * - dateTime : the original (oldest) dateTime
- * - compareDate: the second date. If EMPTY, the current datetime will be used. Effectively this means that the age of the dateTime is calculated.
- */
-public class YearsBetween extends CustomJavaAction<java.lang.Long>
-{
-	private java.util.Date dateTime;
-	private java.util.Date compareDate;
-
-	public YearsBetween(IContext context, java.util.Date dateTime, java.util.Date compareDate)
-	{
-		super(context);
-		this.dateTime = dateTime;
-		this.compareDate = compareDate;
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		try {
-			return Long.valueOf(DateTime.periodBetween(this.dateTime, compareDate == null ? new Date() : compareDate)
-				.getYears());
-		} catch (Exception e) {
-			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "DateTime calculation error, returning -1", e);
-			return -1L;
-		}
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "YearsBetween";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.DateTime;
+import communitycommons.Logging;
+import communitycommons.proxies.LogLevel;
+import communitycommons.proxies.LogNodes;
+import java.util.Date;
+
+/**
+ * Calculates the number of years between two dates. 

+ * - dateTime : the original (oldest) dateTime

+ * - compareDate: the second date. If EMPTY, the current datetime will be used. Effectively this means that the age of the dateTime is calculated.
+ */
+public class YearsBetween extends CustomJavaAction<java.lang.Long>
+{
+	private java.util.Date dateTime;
+	private java.util.Date compareDate;
+
+	public YearsBetween(IContext context, java.util.Date dateTime, java.util.Date compareDate)
+	{
+		super(context);
+		this.dateTime = dateTime;
+		this.compareDate = compareDate;
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		try {
+			return Long.valueOf(DateTime.periodBetween(this.dateTime, compareDate == null ? new Date() : compareDate)
+				.getYears());
+		} catch (Exception e) {
+			Logging.log(LogNodes.CommunityCommons.name(), LogLevel.Warning, "DateTime calculation error, returning -1", e);
+			return -1L;
+		}
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "YearsBetween";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java b/module/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java
old mode 100755
new mode 100644
similarity index 83%
rename from test/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java
rename to module/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java
index 368747b0..8845f810
--- a/test/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java
+++ b/module/javasource/communitycommons/actions/commitInSeparateDatabaseTransaction.java
@@ -1,55 +1,57 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.core.Core;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.systemwideinterfaces.core.ISession;
-import com.mendix.webui.CustomJavaAction;
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-
-/**
- * This function commits an object in a seperate context and transaction, making sure it gets persisted in the database (regarding which exception happens after invocation).
- */
-public class commitInSeparateDatabaseTransaction extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject mxObject;
-
-	public commitInSeparateDatabaseTransaction(IContext context, IMendixObject mxObject)
-	{
-		super(context);
-		this.mxObject = mxObject;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		ISession session = getContext().getSession();
-		IContext newContext = session.createContext();
-		Core.commit(newContext, mxObject);
-		newContext.endTransaction();
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "commitInSeparateDatabaseTransaction";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.core.Core;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.systemwideinterfaces.core.ISession;
+import com.mendix.webui.CustomJavaAction;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+
+/**
+ * This function commits an object in a seperate context and transaction, making sure it gets persisted in the database (regarding which exception happens after invocation).

+ * 

+ * Please note that this action is prone to deadlock. For example if you commit an object in one transaction and then use this action to commit the same object in a separate transaction. We do not recommend the use of this action.
+ */
+public class commitInSeparateDatabaseTransaction extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject mxObject;
+
+	public commitInSeparateDatabaseTransaction(IContext context, IMendixObject mxObject)
+	{
+		super(context);
+		this.mxObject = mxObject;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		ISession session = getContext().getSession();
+		IContext newContext = session.createContext();
+		Core.commit(newContext, mxObject);
+		newContext.endTransaction();
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "commitInSeparateDatabaseTransaction";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/commitWithoutEvents.java b/module/javasource/communitycommons/actions/commitWithoutEvents.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/commitWithoutEvents.java
rename to module/javasource/communitycommons/actions/commitWithoutEvents.java
index 110042eb..f8c3de67
--- a/test/javasource/communitycommons/actions/commitWithoutEvents.java
+++ b/module/javasource/communitycommons/actions/commitWithoutEvents.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Commits an object, but without events. 
- * 
- * N.B. This function is not very useful when called from the model, but it is useful when called from custom Java code.
- */
-public class commitWithoutEvents extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject subject;
-
-	public commitWithoutEvents(IContext context, IMendixObject subject)
-	{
-		super(context);
-		this.subject = subject;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.commitWithoutEvents(this.getContext(), subject);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "commitWithoutEvents";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Commits an object, but without events. 

+ * 

+ * N.B. This function is not very useful when called from the model, but it is useful when called from custom Java code.
+ */
+public class commitWithoutEvents extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject subject;
+
+	public commitWithoutEvents(IContext context, IMendixObject subject)
+	{
+		super(context);
+		this.subject = subject;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.commitWithoutEvents(this.getContext(), subject);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "commitWithoutEvents";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/copyAttributes.java b/module/javasource/communitycommons/actions/copyAttributes.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/copyAttributes.java
rename to module/javasource/communitycommons/actions/copyAttributes.java
index 8aefd593..eaa06c87
--- a/test/javasource/communitycommons/actions/copyAttributes.java
+++ b/module/javasource/communitycommons/actions/copyAttributes.java
@@ -1,55 +1,55 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-
-/**
- * Copies all common primitive attributes from source to target, which are not necessarily of the same type. This is useful to, for example, translate database object into view objects.
- * 
- * Note that no automatic type conversion is done. 
- */
-public class copyAttributes extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject source;
-	private IMendixObject target;
-
-	public copyAttributes(IContext context, IMendixObject source, IMendixObject target)
-	{
-		super(context);
-		this.source = source;
-		this.target = target;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		ORM.copyAttributes(getContext(), source, target);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "copyAttributes";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+
+/**
+ * Copies all common primitive attributes from source to target, which are not necessarily of the same type. This is useful to, for example, translate database object into view objects.

+ * 

+ * Note that no automatic type conversion is done. 
+ */
+public class copyAttributes extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject source;
+	private IMendixObject target;
+
+	public copyAttributes(IContext context, IMendixObject source, IMendixObject target)
+	{
+		super(context);
+		this.source = source;
+		this.target = target;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		ORM.copyAttributes(getContext(), source, target);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "copyAttributes";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/deleteAll.java b/module/javasource/communitycommons/actions/deleteAll.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/deleteAll.java
rename to module/javasource/communitycommons/actions/deleteAll.java
diff --git a/test/javasource/communitycommons/actions/executeMicroflowAsUser.java b/module/javasource/communitycommons/actions/executeMicroflowAsUser.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/executeMicroflowAsUser.java
rename to module/javasource/communitycommons/actions/executeMicroflowAsUser.java
index 2c10fe38..ff8e5664
--- a/test/javasource/communitycommons/actions/executeMicroflowAsUser.java
+++ b/module/javasource/communitycommons/actions/executeMicroflowAsUser.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Executes the given microflow as if the $currentuser is the provided user (delegation). Use sudoContext to determine if 'apply entity access' should be used 
- * 
- * - microflowName: the fully qualified microflow name, 'CommunityCommons.CreateUserIfNotExists'
- * - username: The user that should be used to execute the microflow
- * - sudoContext: whether entity access should be applied.
- */
-public class executeMicroflowAsUser extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String microflow;
-	private java.lang.String username;
-	private java.lang.Boolean sudoContext;
-
-	public executeMicroflowAsUser(IContext context, java.lang.String microflow, java.lang.String username, java.lang.Boolean sudoContext)
-	{
-		super(context);
-		this.microflow = microflow;
-		this.username = username;
-		this.sudoContext = sudoContext;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Object res = Misc.executeMicroflowAsUser(getContext(), microflow, username, sudoContext);
-		return res == null ? null : res.toString();
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeMicroflowAsUser";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Executes the given microflow as if the $currentuser is the provided user (delegation). Use sudoContext to determine if 'apply entity access' should be used 

+ * 

+ * - microflowName: the fully qualified microflow name, 'CommunityCommons.CreateUserIfNotExists'

+ * - username: The user that should be used to execute the microflow

+ * - sudoContext: whether entity access should be applied.
+ */
+public class executeMicroflowAsUser extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String microflow;
+	private java.lang.String username;
+	private java.lang.Boolean sudoContext;
+
+	public executeMicroflowAsUser(IContext context, java.lang.String microflow, java.lang.String username, java.lang.Boolean sudoContext)
+	{
+		super(context);
+		this.microflow = microflow;
+		this.username = username;
+		this.sudoContext = sudoContext;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Object res = Misc.executeMicroflowAsUser(getContext(), microflow, username, sudoContext);
+		return res == null ? null : res.toString();
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeMicroflowAsUser";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/executeMicroflowAsUser_1.java b/module/javasource/communitycommons/actions/executeMicroflowAsUser_1.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/executeMicroflowAsUser_1.java
rename to module/javasource/communitycommons/actions/executeMicroflowAsUser_1.java
diff --git a/test/javasource/communitycommons/actions/executeMicroflowAsUser_2.java b/module/javasource/communitycommons/actions/executeMicroflowAsUser_2.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/executeMicroflowAsUser_2.java
rename to module/javasource/communitycommons/actions/executeMicroflowAsUser_2.java
diff --git a/test/javasource/communitycommons/actions/executeMicroflowInBackground.java b/module/javasource/communitycommons/actions/executeMicroflowInBackground.java
old mode 100755
new mode 100644
similarity index 90%
rename from test/javasource/communitycommons/actions/executeMicroflowInBackground.java
rename to module/javasource/communitycommons/actions/executeMicroflowInBackground.java
index 061747bd..5cfcc54a
--- a/test/javasource/communitycommons/actions/executeMicroflowInBackground.java
+++ b/module/javasource/communitycommons/actions/executeMicroflowInBackground.java
@@ -1,64 +1,64 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * This action allows an microflow to be executed independently from this microflow. 
- * This function is identical to "RunMicroflowAsyncInQueue", except that it takes one argument which will be passed to the microflow being called. 
- * 
- * This might be useful to model for example your own batching system, or to run a microflow in its own (system) transaction. The microflow is delayed for at least 200ms and then run with low priority in a system context. Since the microflow run in its own transaction, it is not affected with rollbacks (due to exceptions) or commits in this microflow. 
- * 
- * Invocations to this method are guaranteed to be run in FIFO order, only one microflow is run at a time. 
- * 
- * Note that since the microflow is run as system transaction, $currentUser is not available and no security restrictions are applied. 
- * 
- * - The microflowname specifies the fully qualified name of the microflow (case sensitive) e.g.: 'MyFirstModule.MyFirstMicroflow'. 
- * - The context object specifies an argument that should be passed to the microflow if applicable. Currently only zero or one argument are supported. Note that editing this object in both microflows might lead to unexpected behavior.
- * 
- * Returns true if scheduled successfully.
- */
-public class executeMicroflowInBackground extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String microflow;
-	private IMendixObject contextObject;
-
-	public executeMicroflowInBackground(IContext context, java.lang.String microflow, IMendixObject contextObject)
-	{
-		super(context);
-		this.microflow = microflow;
-		this.contextObject = contextObject;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return  Misc.runMicroflowInBackground(getContext(), microflow, contextObject);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeMicroflowInBackground";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * This action allows an microflow to be executed independently from this microflow. 

+ * This function is identical to "RunMicroflowAsyncInQueue", except that it takes one argument which will be passed to the microflow being called. 

+ * 

+ * This might be useful to model for example your own batching system, or to run a microflow in its own (system) transaction. The microflow is delayed for at least 200ms and then run with low priority in a system context. Since the microflow run in its own transaction, it is not affected with rollbacks (due to exceptions) or commits in this microflow. 

+ * 

+ * Invocations to this method are guaranteed to be run in FIFO order, only one microflow is run at a time. 

+ * 

+ * Note that since the microflow is run as system transaction, $currentUser is not available and no security restrictions are applied. 

+ * 

+ * - The microflowname specifies the fully qualified name of the microflow (case sensitive) e.g.: 'MyFirstModule.MyFirstMicroflow'. 

+ * - The context object specifies an argument that should be passed to the microflow if applicable. Currently only zero or one argument are supported. Note that editing this object in both microflows might lead to unexpected behavior.

+ * 

+ * Returns true if scheduled successfully.
+ */
+public class executeMicroflowInBackground extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String microflow;
+	private IMendixObject contextObject;
+
+	public executeMicroflowInBackground(IContext context, java.lang.String microflow, IMendixObject contextObject)
+	{
+		super(context);
+		this.microflow = microflow;
+		this.contextObject = contextObject;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return  Misc.runMicroflowInBackground(getContext(), microflow, contextObject);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeMicroflowInBackground";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/executeMicroflowInBatches.java b/module/javasource/communitycommons/actions/executeMicroflowInBatches.java
old mode 100755
new mode 100644
similarity index 84%
rename from test/javasource/communitycommons/actions/executeMicroflowInBatches.java
rename to module/javasource/communitycommons/actions/executeMicroflowInBatches.java
index 2b21d24e..6a4595f7
--- a/test/javasource/communitycommons/actions/executeMicroflowInBatches.java
+++ b/module/javasource/communitycommons/actions/executeMicroflowInBatches.java
@@ -1,72 +1,72 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Invokes a microflow in batches. The microflow is invoked for each individual item returned by the xpath query. 
- * 
- * The objects will be processed in small batches (based on the batchsize), which makes this function very useful to process large amounts of objects without using much memory. All defaut behavior such as commit events are applied as defined in your microflow. 
- * 
- * Parameters:
- * - xpath: Fully qualified xpath query that indicates the set of objects the microflow should be invoked on. For example:
- * '//System.User[Active = true()]'
- * - microflow: The microflow that should be invoked. Should accept one argument of the same type as the xpath. For example:
- * 'MyFirstModule.UpdateBirthday'
- * - batchsize: The amount of objects that should be processed in a single transaction. When in doubt, 1 is fine, but larger batches (for example; 100) will be faster due to less overhead.
- * - waitUntilFinished: Whether this call should block (wait) until all objects are
- *  processed.
- * 
- * Returns true if the batch has successfully started, or, if waitUntilFinished is true, returns true if the batch succeeded completely. 
- * 
- * Note, if new objects are added to the dataset while the batch is still running, those objects will be processed as well.
- */
-public class executeMicroflowInBatches extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String xpath;
-	private java.lang.String microflow;
-	private java.lang.Long batchsize;
-	private java.lang.Boolean waitUntilFinished;
-	private java.lang.Boolean ascending;
-
-	public executeMicroflowInBatches(IContext context, java.lang.String xpath, java.lang.String microflow, java.lang.Long batchsize, java.lang.Boolean waitUntilFinished, java.lang.Boolean ascending)
-	{
-		super(context);
-		this.xpath = xpath;
-		this.microflow = microflow;
-		this.batchsize = batchsize;
-		this.waitUntilFinished = waitUntilFinished;
-		this.ascending = ascending;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Misc.executeMicroflowInBatches(xpath, microflow, batchsize.intValue(), waitUntilFinished.booleanValue(), ascending);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeMicroflowInBatches";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Invokes a microflow in batches. The microflow is invoked for each individual item returned by the xpath query. 

+ * 

+ * The objects will be processed in small batches (based on the batchsize), which makes this function very useful to process large amounts of objects without using much memory. All defaut behavior such as commit events are applied as defined in your microflow. 

+ * 

+ * Parameters:

+ * - xpath: Fully qualified xpath query that indicates the set of objects the microflow should be invoked on. For example:

+ * '//System.User[Active = true()]'

+ * - microflow: The microflow that should be invoked. Should accept one argument of the same type as the xpath. For example:

+ * 'MyFirstModule.UpdateBirthday'

+ * - batchsize: The amount of objects that should be processed in a single transaction. When in doubt, 1 is fine, but larger batches (for example; 100) will be faster due to less overhead.

+ * - waitUntilFinished: Whether this call should block (wait) until all objects are

+ *  processed.

+ * 

+ * Returns true if the batch has successfully started, or, if waitUntilFinished is true, returns true if the batch succeeded completely. 

+ * 

+ * Note, if new objects are added to the dataset while the batch is still running, those objects will be processed as well.
+ */
+public class executeMicroflowInBatches extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String xpath;
+	private java.lang.String microflow;
+	private java.lang.Long batchsize;
+	private java.lang.Boolean waitUntilFinished;
+	private java.lang.Boolean ascending;
+
+	public executeMicroflowInBatches(IContext context, java.lang.String xpath, java.lang.String microflow, java.lang.Long batchsize, java.lang.Boolean waitUntilFinished, java.lang.Boolean ascending)
+	{
+		super(context);
+		this.xpath = xpath;
+		this.microflow = microflow;
+		this.batchsize = batchsize;
+		this.waitUntilFinished = waitUntilFinished;
+		this.ascending = ascending;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Misc.executeMicroflowInBatches(xpath, microflow, batchsize.intValue(), waitUntilFinished.booleanValue(), ascending);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeMicroflowInBatches";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java
rename to module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java
index 723a421d..7fc9c25b
--- a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java
+++ b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Misc;
-
-/**
- * Executes the given microflow as if the $currentuser is the provided user (delegation). Use sudoContext to determine if 'apply entity access' should be used 
- * 
- * - microflowName: the fully qualified microflow name, 'CommunityCommons.CreateUserIfNotExists'
- * - username: The user that should be used to execute the microflow
- * - sudoContext: whether entity access should be applied.
- */
-public class executeUnverifiedMicroflowAsUser extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String microflowName;
-	private java.lang.String username;
-	private java.lang.Boolean sudoContext;
-
-	public executeUnverifiedMicroflowAsUser(IContext context, java.lang.String microflowName, java.lang.String username, java.lang.Boolean sudoContext)
-	{
-		super(context);
-		this.microflowName = microflowName;
-		this.username = username;
-		this.sudoContext = sudoContext;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		Object res = Misc.executeMicroflowAsUser(getContext(), microflowName, username, sudoContext);
-		return res == null ? null : res.toString();
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeUnverifiedMicroflowAsUser";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Misc;
+
+/**
+ * Executes the given microflow as if the $currentuser is the provided user (delegation). Use sudoContext to determine if 'apply entity access' should be used 

+ * 

+ * - microflowName: the fully qualified microflow name, 'CommunityCommons.CreateUserIfNotExists'

+ * - username: The user that should be used to execute the microflow

+ * - sudoContext: whether entity access should be applied.
+ */
+public class executeUnverifiedMicroflowAsUser extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String microflowName;
+	private java.lang.String username;
+	private java.lang.Boolean sudoContext;
+
+	public executeUnverifiedMicroflowAsUser(IContext context, java.lang.String microflowName, java.lang.String username, java.lang.Boolean sudoContext)
+	{
+		super(context);
+		this.microflowName = microflowName;
+		this.username = username;
+		this.sudoContext = sudoContext;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		Object res = Misc.executeMicroflowAsUser(getContext(), microflowName, username, sudoContext);
+		return res == null ? null : res.toString();
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeUnverifiedMicroflowAsUser";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_1.java b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_1.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_1.java
rename to module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_1.java
diff --git a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_2.java b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_2.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_2.java
rename to module/javasource/communitycommons/actions/executeUnverifiedMicroflowAsUser_2.java
diff --git a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java
old mode 100755
new mode 100644
similarity index 90%
rename from test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java
rename to module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java
index eea19d8a..42218df0
--- a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java
+++ b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBackground.java
@@ -1,64 +1,64 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-
-/**
- * This action allows an microflow to be executed independently from this microflow. 
- * This function is identical to "RunMicroflowAsyncInQueue", except that it takes one argument which will be passed to the microflow being called. 
- * 
- * This might be useful to model for example your own batching system, or to run a microflow in its own (system) transaction. The microflow is delayed for at least 200ms and then run with low priority in a system context. Since the microflow run in its own transaction, it is not affected with rollbacks (due to exceptions) or commits in this microflow. 
- * 
- * Invocations to this method are guaranteed to be run in FIFO order, only one microflow is run at a time. 
- * 
- * Note that since the microflow is run as system transaction, $currentUser is not available and no security restrictions are applied. 
- * 
- * - The microflowname specifies the fully qualified name of the microflow (case sensitive) e.g.: 'MyFirstModule.MyFirstMicroflow'. 
- * - The context object specifies an argument that should be passed to the microflow if applicable. Currently only zero or one argument are supported. Note that editing this object in both microflows might lead to unexpected behavior.
- * 
- * Returns true if scheduled successfully.
- */
-public class executeUnverifiedMicroflowInBackground extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String microflowName;
-	private IMendixObject contextObject;
-
-	public executeUnverifiedMicroflowInBackground(IContext context, java.lang.String microflowName, IMendixObject contextObject)
-	{
-		super(context);
-		this.microflowName = microflowName;
-		this.contextObject = contextObject;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return  Misc.runMicroflowInBackground(getContext(), microflowName, contextObject);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeUnverifiedMicroflowInBackground";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+
+/**
+ * This action allows an microflow to be executed independently from this microflow. 

+ * This function is identical to "RunMicroflowAsyncInQueue", except that it takes one argument which will be passed to the microflow being called. 

+ * 

+ * This might be useful to model for example your own batching system, or to run a microflow in its own (system) transaction. The microflow is delayed for at least 200ms and then run with low priority in a system context. Since the microflow run in its own transaction, it is not affected with rollbacks (due to exceptions) or commits in this microflow. 

+ * 

+ * Invocations to this method are guaranteed to be run in FIFO order, only one microflow is run at a time. 

+ * 

+ * Note that since the microflow is run as system transaction, $currentUser is not available and no security restrictions are applied. 

+ * 

+ * - The microflowname specifies the fully qualified name of the microflow (case sensitive) e.g.: 'MyFirstModule.MyFirstMicroflow'. 

+ * - The context object specifies an argument that should be passed to the microflow if applicable. Currently only zero or one argument are supported. Note that editing this object in both microflows might lead to unexpected behavior.

+ * 

+ * Returns true if scheduled successfully.
+ */
+public class executeUnverifiedMicroflowInBackground extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String microflowName;
+	private IMendixObject contextObject;
+
+	public executeUnverifiedMicroflowInBackground(IContext context, java.lang.String microflowName, IMendixObject contextObject)
+	{
+		super(context);
+		this.microflowName = microflowName;
+		this.contextObject = contextObject;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return  Misc.runMicroflowInBackground(getContext(), microflowName, contextObject);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeUnverifiedMicroflowInBackground";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java
old mode 100755
new mode 100644
similarity index 85%
rename from test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java
rename to module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java
index 3c5006d0..c3d3700c
--- a/test/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java
+++ b/module/javasource/communitycommons/actions/executeUnverifiedMicroflowInBatches.java
@@ -1,72 +1,72 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import communitycommons.Misc;
-
-/**
- * Invokes a microflow in batches. The microflow is invoked for each individual item returned by the xpath query. 
- * 
- * The objects will be processed in small batches (based on the batchsize), which makes this function very useful to process large amounts of objects without using much memory. All defaut behavior such as commit events are applied as defined in your microflow. 
- * 
- * Parameters:
- * - xpath: Fully qualified xpath query that indicates the set of objects the microflow should be invoked on. For example:
- * '//System.User[Active = true()]'
- * - microflow: The microflow that should be invoked. Should accept one argument of the same type as the xpath. For example:
- * 'MyFirstModule.UpdateBirthday'
- * - batchsize: The amount of objects that should be processed in a single transaction. When in doubt, 1 is fine, but larger batches (for example; 100) will be faster due to less overhead.
- * - waitUntilFinished: Whether this call should block (wait) until all objects are
- *  processed.
- * 
- * Returns true if the batch has successfully started, or, if waitUntilFinished is true, returns true if the batch succeeded completely. 
- * 
- * Note, if new objects are added to the dataset while the batch is still running, those objects will be processed as well.
- */
-public class executeUnverifiedMicroflowInBatches extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String xpath;
-	private java.lang.String microflowName;
-	private java.lang.Long batchsize;
-	private java.lang.Boolean waitUntilFinished;
-	private java.lang.Boolean ascending;
-
-	public executeUnverifiedMicroflowInBatches(IContext context, java.lang.String xpath, java.lang.String microflowName, java.lang.Long batchsize, java.lang.Boolean waitUntilFinished, java.lang.Boolean ascending)
-	{
-		super(context);
-		this.xpath = xpath;
-		this.microflowName = microflowName;
-		this.batchsize = batchsize;
-		this.waitUntilFinished = waitUntilFinished;
-		this.ascending = ascending;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Misc.executeMicroflowInBatches(xpath, microflowName, batchsize.intValue(), waitUntilFinished.booleanValue(), ascending);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "executeUnverifiedMicroflowInBatches";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import communitycommons.Misc;
+
+/**
+ * Invokes a microflow in batches. The microflow is invoked for each individual item returned by the xpath query. 

+ * 

+ * The objects will be processed in small batches (based on the batchsize), which makes this function very useful to process large amounts of objects without using much memory. All defaut behavior such as commit events are applied as defined in your microflow. 

+ * 

+ * Parameters:

+ * - xpath: Fully qualified xpath query that indicates the set of objects the microflow should be invoked on. For example:

+ * '//System.User[Active = true()]'

+ * - microflow: The microflow that should be invoked. Should accept one argument of the same type as the xpath. For example:

+ * 'MyFirstModule.UpdateBirthday'

+ * - batchsize: The amount of objects that should be processed in a single transaction. When in doubt, 1 is fine, but larger batches (for example; 100) will be faster due to less overhead.

+ * - waitUntilFinished: Whether this call should block (wait) until all objects are

+ *  processed.

+ * 

+ * Returns true if the batch has successfully started, or, if waitUntilFinished is true, returns true if the batch succeeded completely. 

+ * 

+ * Note, if new objects are added to the dataset while the batch is still running, those objects will be processed as well.
+ */
+public class executeUnverifiedMicroflowInBatches extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String xpath;
+	private java.lang.String microflowName;
+	private java.lang.Long batchsize;
+	private java.lang.Boolean waitUntilFinished;
+	private java.lang.Boolean ascending;
+
+	public executeUnverifiedMicroflowInBatches(IContext context, java.lang.String xpath, java.lang.String microflowName, java.lang.Long batchsize, java.lang.Boolean waitUntilFinished, java.lang.Boolean ascending)
+	{
+		super(context);
+		this.xpath = xpath;
+		this.microflowName = microflowName;
+		this.batchsize = batchsize;
+		this.waitUntilFinished = waitUntilFinished;
+		this.ascending = ascending;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Misc.executeMicroflowInBatches(xpath, microflowName, batchsize.intValue(), waitUntilFinished.booleanValue(), ascending);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "executeUnverifiedMicroflowInBatches";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/getCreatedByUser.java b/module/javasource/communitycommons/actions/getCreatedByUser.java
old mode 100755
new mode 100644
similarity index 92%
rename from test/javasource/communitycommons/actions/getCreatedByUser.java
rename to module/javasource/communitycommons/actions/getCreatedByUser.java
index 2bf96b7a..cd7dec5c
--- a/test/javasource/communitycommons/actions/getCreatedByUser.java
+++ b/module/javasource/communitycommons/actions/getCreatedByUser.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Returns the user that created an object 
- * 
- * (or empty if not applicable).
- */
-public class getCreatedByUser extends CustomJavaAction<IMendixObject>
-{
-	private IMendixObject thing;
-
-	public getCreatedByUser(IContext context, IMendixObject thing)
-	{
-		super(context);
-		this.thing = thing;
-	}
-
-	@java.lang.Override
-	public IMendixObject executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.getCreatedByUser(getContext(), thing);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "getCreatedByUser";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Returns the user that created an object 

+ * 

+ * (or empty if not applicable).
+ */
+public class getCreatedByUser extends CustomJavaAction<IMendixObject>
+{
+	private IMendixObject thing;
+
+	public getCreatedByUser(IContext context, IMendixObject thing)
+	{
+		super(context);
+		this.thing = thing;
+	}
+
+	@java.lang.Override
+	public IMendixObject executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.getCreatedByUser(getContext(), thing);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "getCreatedByUser";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/getFileSize.java b/module/javasource/communitycommons/actions/getFileSize.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/getFileSize.java
rename to module/javasource/communitycommons/actions/getFileSize.java
index 7cfcdee7..344a3e6c
--- a/test/javasource/communitycommons/actions/getFileSize.java
+++ b/module/javasource/communitycommons/actions/getFileSize.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Returns the filesize of a file document in bytes.
- * 
- * From version 2.3 on, this function can be used in cloud environments as well. 
- * 
- * NOTE:
- * before 2.1, this functioned returned the size in kilobytes, although this documentation mentioned bytes
- */
-public class getFileSize extends CustomJavaAction<java.lang.Long>
-{
-	private IMendixObject __document;
-	private system.proxies.FileDocument document;
-
-	public getFileSize(IContext context, IMendixObject document)
-	{
-		super(context);
-		this.__document = document;
-	}
-
-	@java.lang.Override
-	public java.lang.Long executeAction() throws Exception
-	{
-		this.document = this.__document == null ? null : system.proxies.FileDocument.initialize(getContext(), __document);
-
-		// BEGIN USER CODE
-		return Misc.getFileSize(this.getContext(), document.getMendixObject());
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "getFileSize";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Returns the filesize of a file document in bytes.

+ * 

+ * From version 2.3 on, this function can be used in cloud environments as well. 

+ * 

+ * NOTE:

+ * before 2.1, this functioned returned the size in kilobytes, although this documentation mentioned bytes
+ */
+public class getFileSize extends CustomJavaAction<java.lang.Long>
+{
+	private IMendixObject __document;
+	private system.proxies.FileDocument document;
+
+	public getFileSize(IContext context, IMendixObject document)
+	{
+		super(context);
+		this.__document = document;
+	}
+
+	@java.lang.Override
+	public java.lang.Long executeAction() throws Exception
+	{
+		this.document = this.__document == null ? null : system.proxies.FileDocument.initialize(getContext(), __document);
+
+		// BEGIN USER CODE
+		return Misc.getFileSize(this.getContext(), document.getMendixObject());
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "getFileSize";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/getGUID.java b/module/javasource/communitycommons/actions/getGUID.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/getGUID.java
rename to module/javasource/communitycommons/actions/getGUID.java
diff --git a/test/javasource/communitycommons/actions/getLastChangedByUser.java b/module/javasource/communitycommons/actions/getLastChangedByUser.java
old mode 100755
new mode 100644
similarity index 95%
rename from test/javasource/communitycommons/actions/getLastChangedByUser.java
rename to module/javasource/communitycommons/actions/getLastChangedByUser.java
index d35ca980..dd73fe29
--- a/test/javasource/communitycommons/actions/getLastChangedByUser.java
+++ b/module/javasource/communitycommons/actions/getLastChangedByUser.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Returns the user that last changed this object as System.User 
- * 
- * (or empty if not applicable).
- */
-public class getLastChangedByUser extends CustomJavaAction<IMendixObject>
-{
-	private IMendixObject thing;
-
-	public getLastChangedByUser(IContext context, IMendixObject thing)
-	{
-		super(context);
-		this.thing = thing;
-	}
-
-	@java.lang.Override
-	public IMendixObject executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.getLastChangedByUser(getContext(), thing);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "getLastChangedByUser";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Returns the user that last changed this object as System.User 

+ * 

+ * (or empty if not applicable).
+ */
+public class getLastChangedByUser extends CustomJavaAction<IMendixObject>
+{
+	private IMendixObject thing;
+
+	public getLastChangedByUser(IContext context, IMendixObject thing)
+	{
+		super(context);
+		this.thing = thing;
+	}
+
+	@java.lang.Override
+	public IMendixObject executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.getLastChangedByUser(getContext(), thing);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "getLastChangedByUser";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/getOriginalValueAsString.java b/module/javasource/communitycommons/actions/getOriginalValueAsString.java
old mode 100755
new mode 100644
similarity index 87%
rename from test/javasource/communitycommons/actions/getOriginalValueAsString.java
rename to module/javasource/communitycommons/actions/getOriginalValueAsString.java
index 827445e1..7841b0a7
--- a/test/javasource/communitycommons/actions/getOriginalValueAsString.java
+++ b/module/javasource/communitycommons/actions/getOriginalValueAsString.java
@@ -1,58 +1,58 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Returns the original value of an object member, that is, the last committed value.
- * 
- * This is useful if you want to compare the actual value with the last stored value. 
- * - item : the object of which you want to inspect a member
- * - member: the member to retrieve the previous value from. Note that for references, the module name needs to be included.
- * 
- * The function is applicable for non-String members as well, but always returns a String representation of the previous value.
- */
-public class getOriginalValueAsString extends CustomJavaAction<java.lang.String>
-{
-	private IMendixObject item;
-	private java.lang.String member;
-
-	public getOriginalValueAsString(IContext context, IMendixObject item, java.lang.String member)
-	{
-		super(context);
-		this.item = item;
-		this.member = member;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.getOriginalValueAsString(this.getContext(), item, member);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "getOriginalValueAsString";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Returns the original value of an object member, that is, the last committed value.

+ * 

+ * This is useful if you want to compare the actual value with the last stored value. 

+ * - item : the object of which you want to inspect a member

+ * - member: the member to retrieve the previous value from. Note that for references, the module name needs to be included.

+ * 

+ * The function is applicable for non-String members as well, but always returns a String representation of the previous value.
+ */
+public class getOriginalValueAsString extends CustomJavaAction<java.lang.String>
+{
+	private IMendixObject item;
+	private java.lang.String member;
+
+	public getOriginalValueAsString(IContext context, IMendixObject item, java.lang.String member)
+	{
+		super(context);
+		this.item = item;
+		this.member = member;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.getOriginalValueAsString(this.getContext(), item, member);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "getOriginalValueAsString";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/getTypeAsString.java b/module/javasource/communitycommons/actions/getTypeAsString.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/getTypeAsString.java
rename to module/javasource/communitycommons/actions/getTypeAsString.java
diff --git a/test/javasource/communitycommons/actions/memberHasChanged.java b/module/javasource/communitycommons/actions/memberHasChanged.java
old mode 100755
new mode 100644
similarity index 88%
rename from test/javasource/communitycommons/actions/memberHasChanged.java
rename to module/javasource/communitycommons/actions/memberHasChanged.java
index 1bf69144..ce7b2d66
--- a/test/javasource/communitycommons/actions/memberHasChanged.java
+++ b/module/javasource/communitycommons/actions/memberHasChanged.java
@@ -1,57 +1,57 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Checks whether a member has changed since the last commit. Useful in combination with getOriginalValueAsString.
- * 
- * - item : the object to inspect
- * - member: the name of the member to inspect. Note that for references, the module name needs to be included.
- * 
- * Returns true if changed.
- */
-public class memberHasChanged extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject item;
-	private java.lang.String member;
-
-	public memberHasChanged(IContext context, IMendixObject item, java.lang.String member)
-	{
-		super(context);
-		this.item = item;
-		this.member = member;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.memberHasChanged(this.getContext(), item, member);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "memberHasChanged";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Checks whether a member has changed since the last commit. Useful in combination with getOriginalValueAsString.

+ * 

+ * - item : the object to inspect

+ * - member: the name of the member to inspect. Note that for references, the module name needs to be included.

+ * 

+ * Returns true if changed.
+ */
+public class memberHasChanged extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject item;
+	private java.lang.String member;
+
+	public memberHasChanged(IContext context, IMendixObject item, java.lang.String member)
+	{
+		super(context);
+		this.item = item;
+		this.member = member;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.memberHasChanged(this.getContext(), item, member);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "memberHasChanged";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/objectHasChanged.java b/module/javasource/communitycommons/actions/objectHasChanged.java
old mode 100755
new mode 100644
similarity index 94%
rename from test/javasource/communitycommons/actions/objectHasChanged.java
rename to module/javasource/communitycommons/actions/objectHasChanged.java
index 0d41f6a2..282e4f01
--- a/test/javasource/communitycommons/actions/objectHasChanged.java
+++ b/module/javasource/communitycommons/actions/objectHasChanged.java
@@ -1,52 +1,52 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.ORM;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Returns true if at least one member (including owned associations) of this object has changed.
- * 
- * For Mendix < 9.5 this action keeps track of changes to the object except when 'changing to the same value'. For Mendix >= 9.5 this action keeps track of all changes. This is a result of a change of the underlying Mendix runtime-server behaviour. 
- */
-public class objectHasChanged extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject item;
-
-	public objectHasChanged(IContext context, IMendixObject item)
-	{
-		super(context);
-		this.item = item;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return ORM.objectHasChanged(item);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "objectHasChanged";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.ORM;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Returns true if at least one member (including owned associations) of this object has changed.

+ * 

+ * For Mendix < 9.5 this action keeps track of changes to the object except when 'changing to the same value'. For Mendix >= 9.5 this action keeps track of all changes. This is a result of a change of the underlying Mendix runtime-server behaviour. 
+ */
+public class objectHasChanged extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject item;
+
+	public objectHasChanged(IContext context, IMendixObject item)
+	{
+		super(context);
+		this.item = item;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return ORM.objectHasChanged(item);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "objectHasChanged";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/objectIsNew.java b/module/javasource/communitycommons/actions/objectIsNew.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/objectIsNew.java
rename to module/javasource/communitycommons/actions/objectIsNew.java
diff --git a/test/javasource/communitycommons/actions/recommitInBatches.java b/module/javasource/communitycommons/actions/recommitInBatches.java
old mode 100755
new mode 100644
similarity index 100%
rename from test/javasource/communitycommons/actions/recommitInBatches.java
rename to module/javasource/communitycommons/actions/recommitInBatches.java
diff --git a/test/javasource/communitycommons/actions/refreshClass.java b/module/javasource/communitycommons/actions/refreshClass.java
old mode 100755
new mode 100644
similarity index 91%
rename from test/javasource/communitycommons/actions/refreshClass.java
rename to module/javasource/communitycommons/actions/refreshClass.java
index 6c85cb90..c04b9208
--- a/test/javasource/communitycommons/actions/refreshClass.java
+++ b/module/javasource/communitycommons/actions/refreshClass.java
@@ -1,53 +1,53 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-import com.mendix.webui.FeedbackHelper;
-
-/**
- * Refreshes a certain domain object type in the client. Useful to enforce a datagrid to refresh for example.
- * 
- * -objectType : Type of the domain objects to refresh, such as System.User or MyModule.MyFirstEntity.
- *  (you can use getTypeAsString to determine this dynamically, so that the invoke of this action is not be sensitive to domain model changes).
- */
-public class refreshClass extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String objectType;
-
-	public refreshClass(IContext context, java.lang.String objectType)
-	{
-		super(context);
-		this.objectType = objectType;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		FeedbackHelper.addRefreshClass(this.getContext(), objectType);
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "refreshClass";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+import com.mendix.webui.FeedbackHelper;
+
+/**
+ * Refreshes a certain domain object type in the client. Useful to enforce a datagrid to refresh for example.

+ * 

+ * -objectType : Type of the domain objects to refresh, such as System.User or MyModule.MyFirstEntity.

+ *  (you can use getTypeAsString to determine this dynamically, so that the invoke of this action is not be sensitive to domain model changes).
+ */
+public class refreshClass extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String objectType;
+
+	public refreshClass(IContext context, java.lang.String objectType)
+	{
+		super(context);
+		this.objectType = objectType;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		FeedbackHelper.addRefreshClass(this.getContext(), objectType);
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "refreshClass";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/refreshClassByObject.java b/module/javasource/communitycommons/actions/refreshClassByObject.java
old mode 100755
new mode 100644
similarity index 93%
rename from test/javasource/communitycommons/actions/refreshClassByObject.java
rename to module/javasource/communitycommons/actions/refreshClassByObject.java
index a9a39f53..68e86179
--- a/test/javasource/communitycommons/actions/refreshClassByObject.java
+++ b/module/javasource/communitycommons/actions/refreshClassByObject.java
@@ -1,55 +1,55 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import com.mendix.webui.CustomJavaAction;
-import com.mendix.webui.FeedbackHelper;
-
-/**
- * Refreshes a certain domain object type in the client. Useful to enforce a datagrid to refresh for example.
- * 
- * - instance : This object is used to identify the type of objects that need to be refreshed. For example passing $currentUser will refresh all System.Account's.
- */
-public class refreshClassByObject extends CustomJavaAction<java.lang.Boolean>
-{
-	private IMendixObject instance;
-
-	public refreshClassByObject(IContext context, IMendixObject instance)
-	{
-		super(context);
-		this.instance = instance;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		if (instance != null) {
-		    FeedbackHelper.addRefreshClass(this.getContext(), instance.getType());
-		}
-		return true;
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "refreshClassByObject";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import com.mendix.webui.CustomJavaAction;
+import com.mendix.webui.FeedbackHelper;
+
+/**
+ * Refreshes a certain domain object type in the client. Useful to enforce a datagrid to refresh for example.

+ * 

+ * - instance : This object is used to identify the type of objects that need to be refreshed. For example passing $currentUser will refresh all System.Account's.
+ */
+public class refreshClassByObject extends CustomJavaAction<java.lang.Boolean>
+{
+	private IMendixObject instance;
+
+	public refreshClassByObject(IContext context, IMendixObject instance)
+	{
+		super(context);
+		this.instance = instance;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		if (instance != null) {
+		    FeedbackHelper.addRefreshClass(this.getContext(), instance.getType());
+		}
+		return true;
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "refreshClassByObject";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/retrieveURL.java b/module/javasource/communitycommons/actions/retrieveURL.java
old mode 100755
new mode 100644
similarity index 80%
rename from test/javasource/communitycommons/actions/retrieveURL.java
rename to module/javasource/communitycommons/actions/retrieveURL.java
index 88dd235e..204152e0
--- a/test/javasource/communitycommons/actions/retrieveURL.java
+++ b/module/javasource/communitycommons/actions/retrieveURL.java
@@ -1,61 +1,61 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Retrieves data (such as an HTML page) from an URL using the HTTP protocol, and returns it as string. 
- * 
- * - url : The URL to retrieve. 
- * - post : Data to be sent in the request body. If set, a POST request will be send, otherwise a GET request is used. 
- * 
- * Example urls: 
- * 'https://mxforum.mendix.com/search/'
- * 'http://www.google.nl/#hl=nl&q=download+mendix'
- * 
- * Example post data: 
- * 'ipSearchTag=url&x=0&y=0'
- */
-public class retrieveURL extends CustomJavaAction<java.lang.String>
-{
-	private java.lang.String url;
-	private java.lang.String postdata;
-
-	public retrieveURL(IContext context, java.lang.String url, java.lang.String postdata)
-	{
-		super(context);
-		this.url = url;
-		this.postdata = postdata;
-	}
-
-	@java.lang.Override
-	public java.lang.String executeAction() throws Exception
-	{
-		// BEGIN USER CODE
-		return Misc.retrieveURL(url, postdata);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "retrieveURL";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Retrieves data (such as an HTML page) from an URL using the HTTP protocol, and returns it as string. 

+ * 

+ * - url : The URL to retrieve. 

+ * - post : Data to be sent in the request body. If set, a POST request will be send, otherwise a GET request is used. 

+ * 

+ * Example urls: 

+ * 'https://mxforum.mendix.com/search/'

+ * 'http://www.google.nl/#hl=nl&q=download+mendix'

+ * 

+ * Example post data: 

+ * 'ipSearchTag=url&x=0&y=0'
+ */
+public class retrieveURL extends CustomJavaAction<java.lang.String>
+{
+	private java.lang.String url;
+	private java.lang.String postdata;
+
+	public retrieveURL(IContext context, java.lang.String url, java.lang.String postdata)
+	{
+		super(context);
+		this.url = url;
+		this.postdata = postdata;
+	}
+
+	@java.lang.Override
+	public java.lang.String executeAction() throws Exception
+	{
+		// BEGIN USER CODE
+		return Misc.retrieveURL(url, postdata);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "retrieveURL";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/communitycommons/actions/storeURLToFileDocument.java b/module/javasource/communitycommons/actions/storeURLToFileDocument.java
old mode 100755
new mode 100644
similarity index 86%
rename from test/javasource/communitycommons/actions/storeURLToFileDocument.java
rename to module/javasource/communitycommons/actions/storeURLToFileDocument.java
index 8c0f80d3..14755ab3
--- a/test/javasource/communitycommons/actions/storeURLToFileDocument.java
+++ b/module/javasource/communitycommons/actions/storeURLToFileDocument.java
@@ -1,64 +1,64 @@
-// This file was generated by Mendix Studio Pro.
-//
-// WARNING: Only the following code will be retained when actions are regenerated:
-// - the import list
-// - the code between BEGIN USER CODE and END USER CODE
-// - the code between BEGIN EXTRA CODE and END EXTRA CODE
-// Other code you write will be lost the next time you deploy the project.
-// Special characters, e.g., é, ö, à, etc. are supported in comments.
-
-package communitycommons.actions;
-
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import communitycommons.Misc;
-import com.mendix.systemwideinterfaces.core.IContext;
-import com.mendix.webui.CustomJavaAction;
-
-/**
- * Retrieve a document from an URL using a HTTP GET request. 
- * - url : the URL to retrieve 
- * - document: the document to store the data into
- * - filename: the filename to store it under. Only for internal use, so it can be an arbitrary filename. 
- * 
- * Example URL: 'http://www.mendix.com/wordpress/wp-content/themes/mendix_new/images/mendix.png'
- * 
- * NOTE: For images, no thumbnail will be generated.
- */
-public class storeURLToFileDocument extends CustomJavaAction<java.lang.Boolean>
-{
-	private java.lang.String url;
-	private IMendixObject __document;
-	private system.proxies.FileDocument document;
-	private java.lang.String filename;
-
-	public storeURLToFileDocument(IContext context, java.lang.String url, IMendixObject document, java.lang.String filename)
-	{
-		super(context);
-		this.url = url;
-		this.__document = document;
-		this.filename = filename;
-	}
-
-	@java.lang.Override
-	public java.lang.Boolean executeAction() throws Exception
-	{
-		this.document = this.__document == null ? null : system.proxies.FileDocument.initialize(getContext(), __document);
-
-		// BEGIN USER CODE
-		return Misc.storeURLToFileDocument(this.getContext(), url, document.getMendixObject(), filename);
-		// END USER CODE
-	}
-
-	/**
-	 * Returns a string representation of this action
-	 * @return a string representation of this action
-	 */
-	@java.lang.Override
-	public java.lang.String toString()
-	{
-		return "storeURLToFileDocument";
-	}
-
-	// BEGIN EXTRA CODE
-	// END EXTRA CODE
-}
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+// Special characters, e.g., é, ö, à, etc. are supported in comments.
+
+package communitycommons.actions;
+
+import com.mendix.systemwideinterfaces.core.IMendixObject;
+import communitycommons.Misc;
+import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.webui.CustomJavaAction;
+
+/**
+ * Retrieve a document from an URL using a HTTP GET request. 

+ * - url : the URL to retrieve 

+ * - document: the document to store the data into

+ * - filename: the filename to store it under. Only for internal use, so it can be an arbitrary filename. 

+ * 

+ * Example URL: 'http://www.mendix.com/wordpress/wp-content/themes/mendix_new/images/mendix.png'

+ * 

+ * NOTE: For images, no thumbnail will be generated.
+ */
+public class storeURLToFileDocument extends CustomJavaAction<java.lang.Boolean>
+{
+	private java.lang.String url;
+	private IMendixObject __document;
+	private system.proxies.FileDocument document;
+	private java.lang.String filename;
+
+	public storeURLToFileDocument(IContext context, java.lang.String url, IMendixObject document, java.lang.String filename)
+	{
+		super(context);
+		this.url = url;
+		this.__document = document;
+		this.filename = filename;
+	}
+
+	@java.lang.Override
+	public java.lang.Boolean executeAction() throws Exception
+	{
+		this.document = this.__document == null ? null : system.proxies.FileDocument.initialize(getContext(), __document);
+
+		// BEGIN USER CODE
+		return Misc.storeURLToFileDocument(this.getContext(), url, document.getMendixObject(), filename);
+		// END USER CODE
+	}
+
+	/**
+	 * Returns a string representation of this action
+	 * @return a string representation of this action
+	 */
+	@java.lang.Override
+	public java.lang.String toString()
+	{
+		return "storeURLToFileDocument";
+	}
+
+	// BEGIN EXTRA CODE
+	// END EXTRA CODE
+}
diff --git a/test/javasource/encryption/actions/DecryptString.java b/module/javasource/encryption/actions/DecryptString.java
similarity index 100%
rename from test/javasource/encryption/actions/DecryptString.java
rename to module/javasource/encryption/actions/DecryptString.java
diff --git a/test/javasource/encryption/actions/EncryptString.java b/module/javasource/encryption/actions/EncryptString.java
similarity index 100%
rename from test/javasource/encryption/actions/EncryptString.java
rename to module/javasource/encryption/actions/EncryptString.java
diff --git a/test/javasource/encryption/actions/GeneratePGPKeyRing.java b/module/javasource/encryption/actions/GeneratePGPKeyRing.java
similarity index 100%
rename from test/javasource/encryption/actions/GeneratePGPKeyRing.java
rename to module/javasource/encryption/actions/GeneratePGPKeyRing.java
diff --git a/test/javasource/encryption/actions/PGPDecryptDocument.java b/module/javasource/encryption/actions/PGPDecryptDocument.java
similarity index 100%
rename from test/javasource/encryption/actions/PGPDecryptDocument.java
rename to module/javasource/encryption/actions/PGPDecryptDocument.java
diff --git a/test/javasource/encryption/actions/PGPEncryptDocument.java b/module/javasource/encryption/actions/PGPEncryptDocument.java
similarity index 100%
rename from test/javasource/encryption/actions/PGPEncryptDocument.java
rename to module/javasource/encryption/actions/PGPEncryptDocument.java
diff --git a/test/javasource/encryption/actions/ValidatePrivateKeyRing.java b/module/javasource/encryption/actions/ValidatePrivateKeyRing.java
similarity index 100%
rename from test/javasource/encryption/actions/ValidatePrivateKeyRing.java
rename to module/javasource/encryption/actions/ValidatePrivateKeyRing.java
diff --git a/test/javasource/encryption/pgp/PGPFileProcessor.java b/module/javasource/encryption/pgp/PGPFileProcessor.java
similarity index 100%
rename from test/javasource/encryption/pgp/PGPFileProcessor.java
rename to module/javasource/encryption/pgp/PGPFileProcessor.java
diff --git a/test/javasource/encryption/pgp/PGPUtils.java b/module/javasource/encryption/pgp/PGPUtils.java
similarity index 100%
rename from test/javasource/encryption/pgp/PGPUtils.java
rename to module/javasource/encryption/pgp/PGPUtils.java
diff --git a/test/javasource/pushnotifications/actions/GetFCMAccessToken.java b/module/javasource/pushnotifications/actions/GetFCMAccessToken.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/GetFCMAccessToken.java
rename to module/javasource/pushnotifications/actions/GetFCMAccessToken.java
diff --git a/test/javasource/pushnotifications/actions/SendAPNSMessage_Impl.java b/module/javasource/pushnotifications/actions/SendAPNSMessage_Impl.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/SendAPNSMessage_Impl.java
rename to module/javasource/pushnotifications/actions/SendAPNSMessage_Impl.java
diff --git a/test/javasource/pushnotifications/actions/SendMessageToDevice.java b/module/javasource/pushnotifications/actions/SendMessageToDevice.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/SendMessageToDevice.java
rename to module/javasource/pushnotifications/actions/SendMessageToDevice.java
diff --git a/test/javasource/pushnotifications/actions/SendMessageToDevices.java b/module/javasource/pushnotifications/actions/SendMessageToDevices.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/SendMessageToDevices.java
rename to module/javasource/pushnotifications/actions/SendMessageToDevices.java
diff --git a/test/javasource/pushnotifications/actions/SendMessageToUser.java b/module/javasource/pushnotifications/actions/SendMessageToUser.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/SendMessageToUser.java
rename to module/javasource/pushnotifications/actions/SendMessageToUser.java
diff --git a/test/javasource/pushnotifications/actions/SendMessageToUsers.java b/module/javasource/pushnotifications/actions/SendMessageToUsers.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/SendMessageToUsers.java
rename to module/javasource/pushnotifications/actions/SendMessageToUsers.java
diff --git a/test/javasource/pushnotifications/actions/StartAPNS.java b/module/javasource/pushnotifications/actions/StartAPNS.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/StartAPNS.java
rename to module/javasource/pushnotifications/actions/StartAPNS.java
diff --git a/test/javasource/pushnotifications/actions/StopAPNS.java b/module/javasource/pushnotifications/actions/StopAPNS.java
similarity index 100%
rename from test/javasource/pushnotifications/actions/StopAPNS.java
rename to module/javasource/pushnotifications/actions/StopAPNS.java
diff --git a/test/javasource/pushnotifications/implementation/apns/APNSConnection.java b/module/javasource/pushnotifications/implementation/apns/APNSConnection.java
similarity index 100%
rename from test/javasource/pushnotifications/implementation/apns/APNSConnection.java
rename to module/javasource/pushnotifications/implementation/apns/APNSConnection.java
diff --git a/test/javasource/pushnotifications/implementation/apns/Exceptions.java b/module/javasource/pushnotifications/implementation/apns/Exceptions.java
similarity index 100%
rename from test/javasource/pushnotifications/implementation/apns/Exceptions.java
rename to module/javasource/pushnotifications/implementation/apns/Exceptions.java
diff --git a/test/resources/Design_header.png b/module/resources/Design_header.png
similarity index 100%
rename from test/resources/Design_header.png
rename to module/resources/Design_header.png
diff --git a/test/resources/communitycommons/antisamy/Developer Guide.pdf b/module/resources/communitycommons/antisamy/Developer Guide.pdf
similarity index 100%
rename from test/resources/communitycommons/antisamy/Developer Guide.pdf
rename to module/resources/communitycommons/antisamy/Developer Guide.pdf
diff --git a/test/resources/communitycommons/antisamy/antisamy-anythinggoes-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-anythinggoes-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-anythinggoes-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-anythinggoes-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-bootstraprte-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-bootstraprte-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-bootstraprte-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-bootstraprte-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-bootstraprte_nolink-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-bootstraprte_nolink-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-bootstraprte_nolink-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-bootstraprte_nolink-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-ebay-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-ebay-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-ebay-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-ebay-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-myspace-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-myspace-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-myspace-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-myspace-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-slashdot-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-slashdot-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-slashdot-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-slashdot-1.4.4.xml
diff --git a/test/resources/communitycommons/antisamy/antisamy-tinymce-1.4.4.xml b/module/resources/communitycommons/antisamy/antisamy-tinymce-1.4.4.xml
similarity index 100%
rename from test/resources/communitycommons/antisamy/antisamy-tinymce-1.4.4.xml
rename to module/resources/communitycommons/antisamy/antisamy-tinymce-1.4.4.xml
diff --git a/test/resources/icon-bb.png b/module/resources/icon-bb.png
similarity index 100%
rename from test/resources/icon-bb.png
rename to module/resources/icon-bb.png
diff --git a/test/resources/icon-list.png b/module/resources/icon-list.png
similarity index 100%
rename from test/resources/icon-list.png
rename to module/resources/icon-list.png
diff --git a/test/resources/icon-list2.png b/module/resources/icon-list2.png
similarity index 100%
rename from test/resources/icon-list2.png
rename to module/resources/icon-list2.png
diff --git a/test/resources/icon-widget.png b/module/resources/icon-widget.png
similarity index 100%
rename from test/resources/icon-widget.png
rename to module/resources/icon-widget.png
diff --git a/test/theme/native/custom-variables.js b/module/theme/native/custom-variables.js
similarity index 100%
rename from test/theme/native/custom-variables.js
rename to module/theme/native/custom-variables.js
diff --git a/test/theme/native/exclusion-variables.js b/module/theme/native/exclusion-variables.js
similarity index 100%
rename from test/theme/native/exclusion-variables.js
rename to module/theme/native/exclusion-variables.js
diff --git a/test/theme/native/main.js b/module/theme/native/main.js
similarity index 100%
rename from test/theme/native/main.js
rename to module/theme/native/main.js
diff --git a/test/theme/web/custom-variables.scss b/module/theme/web/custom-variables.scss
similarity index 100%
rename from test/theme/web/custom-variables.scss
rename to module/theme/web/custom-variables.scss
diff --git a/test/theme/web/exclusion-variables.scss b/module/theme/web/exclusion-variables.scss
similarity index 100%
rename from test/theme/web/exclusion-variables.scss
rename to module/theme/web/exclusion-variables.scss
diff --git a/test/theme/web/firebase-messaging-sw.js b/module/theme/web/firebase-messaging-sw.js
similarity index 59%
rename from test/theme/web/firebase-messaging-sw.js
rename to module/theme/web/firebase-messaging-sw.js
index 5d444c64..b123bd57 100644
--- a/test/theme/web/firebase-messaging-sw.js
+++ b/module/theme/web/firebase-messaging-sw.js
@@ -2,12 +2,12 @@ importScripts('https://www.gstatic.com/firebasejs/10.11.0/firebase-app-compat.js
 importScripts('https://www.gstatic.com/firebasejs/10.11.0/firebase-messaging-compat.js');
 
 const firebaseConfig = {
-    apiKey: "<apiKey>",
-    authDomain: "<authDomain>",
-    projectId: "<projectId>",
-    storageBucket: "<storageBucket>",
-    messagingSenderId: "<messagingSenderId>",
-    appId: "<appId>"
+    apiKey: "",
+    authDomain: "",
+    projectId: "",
+    storageBucket: "",
+    messagingSenderId: "",
+    appId: ""
 };
 
 firebase.initializeApp(firebaseConfig);
diff --git a/test/theme/web/index.html b/module/theme/web/index.html
similarity index 85%
rename from test/theme/web/index.html
rename to module/theme/web/index.html
index 77a56abf..8e66c4f6 100644
--- a/test/theme/web/index.html
+++ b/module/theme/web/index.html
@@ -32,12 +32,12 @@
         <script src="https://www.gstatic.com/firebasejs/10.11.0/firebase-messaging-compat.js"></script>
         <script>
         const firebaseConfig = {
-            apiKey: "<apiKey>",
-            authDomain: "<authDomain>",
-            projectId: "<projectId>",
-            storageBucket: "<storageBucket>",
-            messagingSenderId: "<messagingSenderId>",
-            appId: "<appId>"
+            apiKey: "",
+            authDomain: "",
+            projectId: "",
+            storageBucket: "",
+            messagingSenderId: "",
+            appId: ""
         };
 
         firebase.initializeApp(firebaseConfig);
diff --git a/test/theme/web/login-with-mendixsso-automatically.html b/module/theme/web/login-with-mendixsso-automatically.html
similarity index 100%
rename from test/theme/web/login-with-mendixsso-automatically.html
rename to module/theme/web/login-with-mendixsso-automatically.html
diff --git a/test/theme/web/login-with-mendixsso-button.html b/module/theme/web/login-with-mendixsso-button.html
similarity index 100%
rename from test/theme/web/login-with-mendixsso-button.html
rename to module/theme/web/login-with-mendixsso-button.html
diff --git a/test/theme/web/login.html b/module/theme/web/login.html
similarity index 100%
rename from test/theme/web/login.html
rename to module/theme/web/login.html
diff --git a/test/theme/web/logo.png b/module/theme/web/logo.png
similarity index 100%
rename from test/theme/web/logo.png
rename to module/theme/web/logo.png
diff --git a/test/theme/web/main.scss b/module/theme/web/main.scss
similarity index 100%
rename from test/theme/web/main.scss
rename to module/theme/web/main.scss
diff --git a/test/theme/web/manifest-overrides.webmanifest b/module/theme/web/manifest-overrides.webmanifest
similarity index 100%
rename from test/theme/web/manifest-overrides.webmanifest
rename to module/theme/web/manifest-overrides.webmanifest
diff --git a/test/theme/web/robots.txt b/module/theme/web/robots.txt
similarity index 100%
rename from test/theme/web/robots.txt
rename to module/theme/web/robots.txt
diff --git a/test/theme/web/settings.json b/module/theme/web/settings.json
similarity index 100%
rename from test/theme/web/settings.json
rename to module/theme/web/settings.json
diff --git a/test/themesource/administration/native/design-properties.json b/module/themesource/administration/native/design-properties.json
similarity index 100%
rename from test/themesource/administration/native/design-properties.json
rename to module/themesource/administration/native/design-properties.json
diff --git a/test/themesource/administration/native/main.js b/module/themesource/administration/native/main.js
similarity index 100%
rename from test/themesource/administration/native/main.js
rename to module/themesource/administration/native/main.js
diff --git a/test/themesource/administration/web/design-properties.json b/module/themesource/administration/web/design-properties.json
similarity index 100%
rename from test/themesource/administration/web/design-properties.json
rename to module/themesource/administration/web/design-properties.json
diff --git a/test/themesource/administration/web/main.scss b/module/themesource/administration/web/main.scss
similarity index 100%
rename from test/themesource/administration/web/main.scss
rename to module/themesource/administration/web/main.scss
diff --git a/test/themesource/atlas_core/.version b/module/themesource/atlas_core/.version
similarity index 100%
rename from test/themesource/atlas_core/.version
rename to module/themesource/atlas_core/.version
diff --git a/test/themesource/atlas_core/native/api.js b/module/themesource/atlas_core/native/api.js
similarity index 100%
rename from test/themesource/atlas_core/native/api.js
rename to module/themesource/atlas_core/native/api.js
diff --git a/test/themesource/atlas_core/native/core/base/flex.js b/module/themesource/atlas_core/native/core/base/flex.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/base/flex.js
rename to module/themesource/atlas_core/native/core/base/flex.js
diff --git a/test/themesource/atlas_core/native/core/base/spacing.js b/module/themesource/atlas_core/native/core/base/spacing.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/base/spacing.js
rename to module/themesource/atlas_core/native/core/base/spacing.js
diff --git a/test/themesource/atlas_core/native/core/helpers/_functions/adjustfont.js b/module/themesource/atlas_core/native/core/helpers/_functions/adjustfont.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/_functions/adjustfont.js
rename to module/themesource/atlas_core/native/core/helpers/_functions/adjustfont.js
diff --git a/test/themesource/atlas_core/native/core/helpers/_functions/colorwords.js b/module/themesource/atlas_core/native/core/helpers/_functions/colorwords.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/_functions/colorwords.js
rename to module/themesource/atlas_core/native/core/helpers/_functions/colorwords.js
diff --git a/test/themesource/atlas_core/native/core/helpers/_functions/convertcolors.js b/module/themesource/atlas_core/native/core/helpers/_functions/convertcolors.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/_functions/convertcolors.js
rename to module/themesource/atlas_core/native/core/helpers/_functions/convertcolors.js
diff --git a/test/themesource/atlas_core/native/core/helpers/_functions/device.js b/module/themesource/atlas_core/native/core/helpers/_functions/device.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/_functions/device.js
rename to module/themesource/atlas_core/native/core/helpers/_functions/device.js
diff --git a/test/themesource/atlas_core/native/core/helpers/_functions/mergeobjects.js b/module/themesource/atlas_core/native/core/helpers/_functions/mergeobjects.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/_functions/mergeobjects.js
rename to module/themesource/atlas_core/native/core/helpers/_functions/mergeobjects.js
diff --git a/test/themesource/atlas_core/native/core/helpers/accordion.js b/module/themesource/atlas_core/native/core/helpers/accordion.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/accordion.js
rename to module/themesource/atlas_core/native/core/helpers/accordion.js
diff --git a/test/themesource/atlas_core/native/core/helpers/activityindicator.js b/module/themesource/atlas_core/native/core/helpers/activityindicator.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/activityindicator.js
rename to module/themesource/atlas_core/native/core/helpers/activityindicator.js
diff --git a/test/themesource/atlas_core/native/core/helpers/backgroundgradient.js b/module/themesource/atlas_core/native/core/helpers/backgroundgradient.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/backgroundgradient.js
rename to module/themesource/atlas_core/native/core/helpers/backgroundgradient.js
diff --git a/test/themesource/atlas_core/native/core/helpers/badge.js b/module/themesource/atlas_core/native/core/helpers/badge.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/badge.js
rename to module/themesource/atlas_core/native/core/helpers/badge.js
diff --git a/test/themesource/atlas_core/native/core/helpers/barchart.js b/module/themesource/atlas_core/native/core/helpers/barchart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/barchart.js
rename to module/themesource/atlas_core/native/core/helpers/barchart.js
diff --git a/test/themesource/atlas_core/native/core/helpers/buttons.js b/module/themesource/atlas_core/native/core/helpers/buttons.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/buttons.js
rename to module/themesource/atlas_core/native/core/helpers/buttons.js
diff --git a/test/themesource/atlas_core/native/core/helpers/columnchart.js b/module/themesource/atlas_core/native/core/helpers/columnchart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/columnchart.js
rename to module/themesource/atlas_core/native/core/helpers/columnchart.js
diff --git a/test/themesource/atlas_core/native/core/helpers/floatingactionbutton.js b/module/themesource/atlas_core/native/core/helpers/floatingactionbutton.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/floatingactionbutton.js
rename to module/themesource/atlas_core/native/core/helpers/floatingactionbutton.js
diff --git a/test/themesource/atlas_core/native/core/helpers/gallery.js b/module/themesource/atlas_core/native/core/helpers/gallery.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/gallery.js
rename to module/themesource/atlas_core/native/core/helpers/gallery.js
diff --git a/test/themesource/atlas_core/native/core/helpers/gallerytextfilter.js b/module/themesource/atlas_core/native/core/helpers/gallerytextfilter.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/gallerytextfilter.js
rename to module/themesource/atlas_core/native/core/helpers/gallerytextfilter.js
diff --git a/test/themesource/atlas_core/native/core/helpers/helperclasses.js b/module/themesource/atlas_core/native/core/helpers/helperclasses.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/helperclasses.js
rename to module/themesource/atlas_core/native/core/helpers/helperclasses.js
diff --git a/test/themesource/atlas_core/native/core/helpers/image.js b/module/themesource/atlas_core/native/core/helpers/image.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/image.js
rename to module/themesource/atlas_core/native/core/helpers/image.js
diff --git a/test/themesource/atlas_core/native/core/helpers/introscreen.js b/module/themesource/atlas_core/native/core/helpers/introscreen.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/introscreen.js
rename to module/themesource/atlas_core/native/core/helpers/introscreen.js
diff --git a/test/themesource/atlas_core/native/core/helpers/linechart.js b/module/themesource/atlas_core/native/core/helpers/linechart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/linechart.js
rename to module/themesource/atlas_core/native/core/helpers/linechart.js
diff --git a/test/themesource/atlas_core/native/core/helpers/listview.js b/module/themesource/atlas_core/native/core/helpers/listview.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/listview.js
rename to module/themesource/atlas_core/native/core/helpers/listview.js
diff --git a/test/themesource/atlas_core/native/core/helpers/listviewswipe.js b/module/themesource/atlas_core/native/core/helpers/listviewswipe.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/listviewswipe.js
rename to module/themesource/atlas_core/native/core/helpers/listviewswipe.js
diff --git a/test/themesource/atlas_core/native/core/helpers/maps.js b/module/themesource/atlas_core/native/core/helpers/maps.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/maps.js
rename to module/themesource/atlas_core/native/core/helpers/maps.js
diff --git a/test/themesource/atlas_core/native/core/helpers/progressbar.js b/module/themesource/atlas_core/native/core/helpers/progressbar.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/progressbar.js
rename to module/themesource/atlas_core/native/core/helpers/progressbar.js
diff --git a/test/themesource/atlas_core/native/core/helpers/progresscircle.js b/module/themesource/atlas_core/native/core/helpers/progresscircle.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/progresscircle.js
rename to module/themesource/atlas_core/native/core/helpers/progresscircle.js
diff --git a/test/themesource/atlas_core/native/core/helpers/radiobuttons.js b/module/themesource/atlas_core/native/core/helpers/radiobuttons.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/radiobuttons.js
rename to module/themesource/atlas_core/native/core/helpers/radiobuttons.js
diff --git a/test/themesource/atlas_core/native/core/helpers/rangeslider.js b/module/themesource/atlas_core/native/core/helpers/rangeslider.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/rangeslider.js
rename to module/themesource/atlas_core/native/core/helpers/rangeslider.js
diff --git a/test/themesource/atlas_core/native/core/helpers/slider.js b/module/themesource/atlas_core/native/core/helpers/slider.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/slider.js
rename to module/themesource/atlas_core/native/core/helpers/slider.js
diff --git a/test/themesource/atlas_core/native/core/helpers/switch.js b/module/themesource/atlas_core/native/core/helpers/switch.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/switch.js
rename to module/themesource/atlas_core/native/core/helpers/switch.js
diff --git a/test/themesource/atlas_core/native/core/helpers/tabcontainer.js b/module/themesource/atlas_core/native/core/helpers/tabcontainer.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/tabcontainer.js
rename to module/themesource/atlas_core/native/core/helpers/tabcontainer.js
diff --git a/test/themesource/atlas_core/native/core/helpers/textbox.js b/module/themesource/atlas_core/native/core/helpers/textbox.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/textbox.js
rename to module/themesource/atlas_core/native/core/helpers/textbox.js
diff --git a/test/themesource/atlas_core/native/core/helpers/typography.js b/module/themesource/atlas_core/native/core/helpers/typography.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/helpers/typography.js
rename to module/themesource/atlas_core/native/core/helpers/typography.js
diff --git a/test/themesource/atlas_core/native/core/manifest.json b/module/themesource/atlas_core/native/core/manifest.json
similarity index 100%
rename from test/themesource/atlas_core/native/core/manifest.json
rename to module/themesource/atlas_core/native/core/manifest.json
diff --git a/test/themesource/atlas_core/native/core/widgets/accordion.js b/module/themesource/atlas_core/native/core/widgets/accordion.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/accordion.js
rename to module/themesource/atlas_core/native/core/widgets/accordion.js
diff --git a/test/themesource/atlas_core/native/core/widgets/activityindicator.js b/module/themesource/atlas_core/native/core/widgets/activityindicator.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/activityindicator.js
rename to module/themesource/atlas_core/native/core/widgets/activityindicator.js
diff --git a/test/themesource/atlas_core/native/core/widgets/animation.js b/module/themesource/atlas_core/native/core/widgets/animation.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/animation.js
rename to module/themesource/atlas_core/native/core/widgets/animation.js
diff --git a/test/themesource/atlas_core/native/core/widgets/backgroundgradient.js b/module/themesource/atlas_core/native/core/widgets/backgroundgradient.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/backgroundgradient.js
rename to module/themesource/atlas_core/native/core/widgets/backgroundgradient.js
diff --git a/test/themesource/atlas_core/native/core/widgets/backgroundimage.js b/module/themesource/atlas_core/native/core/widgets/backgroundimage.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/backgroundimage.js
rename to module/themesource/atlas_core/native/core/widgets/backgroundimage.js
diff --git a/test/themesource/atlas_core/native/core/widgets/badge.js b/module/themesource/atlas_core/native/core/widgets/badge.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/badge.js
rename to module/themesource/atlas_core/native/core/widgets/badge.js
diff --git a/test/themesource/atlas_core/native/core/widgets/barchart.js b/module/themesource/atlas_core/native/core/widgets/barchart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/barchart.js
rename to module/themesource/atlas_core/native/core/widgets/barchart.js
diff --git a/test/themesource/atlas_core/native/core/widgets/bottomsheet.js b/module/themesource/atlas_core/native/core/widgets/bottomsheet.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/bottomsheet.js
rename to module/themesource/atlas_core/native/core/widgets/bottomsheet.js
diff --git a/test/themesource/atlas_core/native/core/widgets/buttons.js b/module/themesource/atlas_core/native/core/widgets/buttons.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/buttons.js
rename to module/themesource/atlas_core/native/core/widgets/buttons.js
diff --git a/test/themesource/atlas_core/native/core/widgets/carousel.js b/module/themesource/atlas_core/native/core/widgets/carousel.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/carousel.js
rename to module/themesource/atlas_core/native/core/widgets/carousel.js
diff --git a/test/themesource/atlas_core/native/core/widgets/checkbox.js b/module/themesource/atlas_core/native/core/widgets/checkbox.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/checkbox.js
rename to module/themesource/atlas_core/native/core/widgets/checkbox.js
diff --git a/test/themesource/atlas_core/native/core/widgets/colorpicker.js b/module/themesource/atlas_core/native/core/widgets/colorpicker.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/colorpicker.js
rename to module/themesource/atlas_core/native/core/widgets/colorpicker.js
diff --git a/test/themesource/atlas_core/native/core/widgets/columnchart.js b/module/themesource/atlas_core/native/core/widgets/columnchart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/columnchart.js
rename to module/themesource/atlas_core/native/core/widgets/columnchart.js
diff --git a/test/themesource/atlas_core/native/core/widgets/container.js b/module/themesource/atlas_core/native/core/widgets/container.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/container.js
rename to module/themesource/atlas_core/native/core/widgets/container.js
diff --git a/test/themesource/atlas_core/native/core/widgets/datepicker.js b/module/themesource/atlas_core/native/core/widgets/datepicker.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/datepicker.js
rename to module/themesource/atlas_core/native/core/widgets/datepicker.js
diff --git a/test/themesource/atlas_core/native/core/widgets/dropdown.js b/module/themesource/atlas_core/native/core/widgets/dropdown.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/dropdown.js
rename to module/themesource/atlas_core/native/core/widgets/dropdown.js
diff --git a/test/themesource/atlas_core/native/core/widgets/feedback.js b/module/themesource/atlas_core/native/core/widgets/feedback.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/feedback.js
rename to module/themesource/atlas_core/native/core/widgets/feedback.js
diff --git a/test/themesource/atlas_core/native/core/widgets/floatingactionbutton.js b/module/themesource/atlas_core/native/core/widgets/floatingactionbutton.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/floatingactionbutton.js
rename to module/themesource/atlas_core/native/core/widgets/floatingactionbutton.js
diff --git a/test/themesource/atlas_core/native/core/widgets/gallery.js b/module/themesource/atlas_core/native/core/widgets/gallery.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/gallery.js
rename to module/themesource/atlas_core/native/core/widgets/gallery.js
diff --git a/test/themesource/atlas_core/native/core/widgets/gallerytextfilter.js b/module/themesource/atlas_core/native/core/widgets/gallerytextfilter.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/gallerytextfilter.js
rename to module/themesource/atlas_core/native/core/widgets/gallerytextfilter.js
diff --git a/test/themesource/atlas_core/native/core/widgets/image.js b/module/themesource/atlas_core/native/core/widgets/image.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/image.js
rename to module/themesource/atlas_core/native/core/widgets/image.js
diff --git a/test/themesource/atlas_core/native/core/widgets/introscreen.js b/module/themesource/atlas_core/native/core/widgets/introscreen.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/introscreen.js
rename to module/themesource/atlas_core/native/core/widgets/introscreen.js
diff --git a/test/themesource/atlas_core/native/core/widgets/layoutgrid.js b/module/themesource/atlas_core/native/core/widgets/layoutgrid.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/layoutgrid.js
rename to module/themesource/atlas_core/native/core/widgets/layoutgrid.js
diff --git a/test/themesource/atlas_core/native/core/widgets/linechart.js b/module/themesource/atlas_core/native/core/widgets/linechart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/linechart.js
rename to module/themesource/atlas_core/native/core/widgets/linechart.js
diff --git a/test/themesource/atlas_core/native/core/widgets/listview.js b/module/themesource/atlas_core/native/core/widgets/listview.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/listview.js
rename to module/themesource/atlas_core/native/core/widgets/listview.js
diff --git a/test/themesource/atlas_core/native/core/widgets/listviewswipe.js b/module/themesource/atlas_core/native/core/widgets/listviewswipe.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/listviewswipe.js
rename to module/themesource/atlas_core/native/core/widgets/listviewswipe.js
diff --git a/test/themesource/atlas_core/native/core/widgets/maps.js b/module/themesource/atlas_core/native/core/widgets/maps.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/maps.js
rename to module/themesource/atlas_core/native/core/widgets/maps.js
diff --git a/test/themesource/atlas_core/native/core/widgets/navigation.js b/module/themesource/atlas_core/native/core/widgets/navigation.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/navigation.js
rename to module/themesource/atlas_core/native/core/widgets/navigation.js
diff --git a/test/themesource/atlas_core/native/core/widgets/pagetitle.js b/module/themesource/atlas_core/native/core/widgets/pagetitle.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/pagetitle.js
rename to module/themesource/atlas_core/native/core/widgets/pagetitle.js
diff --git a/test/themesource/atlas_core/native/core/widgets/piedoughnutchart.js b/module/themesource/atlas_core/native/core/widgets/piedoughnutchart.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/piedoughnutchart.js
rename to module/themesource/atlas_core/native/core/widgets/piedoughnutchart.js
diff --git a/test/themesource/atlas_core/native/core/widgets/popupmenu.js b/module/themesource/atlas_core/native/core/widgets/popupmenu.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/popupmenu.js
rename to module/themesource/atlas_core/native/core/widgets/popupmenu.js
diff --git a/test/themesource/atlas_core/native/core/widgets/progressbar.js b/module/themesource/atlas_core/native/core/widgets/progressbar.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/progressbar.js
rename to module/themesource/atlas_core/native/core/widgets/progressbar.js
diff --git a/test/themesource/atlas_core/native/core/widgets/progresscircle.js b/module/themesource/atlas_core/native/core/widgets/progresscircle.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/progresscircle.js
rename to module/themesource/atlas_core/native/core/widgets/progresscircle.js
diff --git a/test/themesource/atlas_core/native/core/widgets/qrcode.js b/module/themesource/atlas_core/native/core/widgets/qrcode.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/qrcode.js
rename to module/themesource/atlas_core/native/core/widgets/qrcode.js
diff --git a/test/themesource/atlas_core/native/core/widgets/radiobuttons.js b/module/themesource/atlas_core/native/core/widgets/radiobuttons.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/radiobuttons.js
rename to module/themesource/atlas_core/native/core/widgets/radiobuttons.js
diff --git a/test/themesource/atlas_core/native/core/widgets/rangeslider.js b/module/themesource/atlas_core/native/core/widgets/rangeslider.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/rangeslider.js
rename to module/themesource/atlas_core/native/core/widgets/rangeslider.js
diff --git a/test/themesource/atlas_core/native/core/widgets/rating.js b/module/themesource/atlas_core/native/core/widgets/rating.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/rating.js
rename to module/themesource/atlas_core/native/core/widgets/rating.js
diff --git a/test/themesource/atlas_core/native/core/widgets/referenceselector.js b/module/themesource/atlas_core/native/core/widgets/referenceselector.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/referenceselector.js
rename to module/themesource/atlas_core/native/core/widgets/referenceselector.js
diff --git a/test/themesource/atlas_core/native/core/widgets/safeareaview.js b/module/themesource/atlas_core/native/core/widgets/safeareaview.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/safeareaview.js
rename to module/themesource/atlas_core/native/core/widgets/safeareaview.js
diff --git a/test/themesource/atlas_core/native/core/widgets/slider.js b/module/themesource/atlas_core/native/core/widgets/slider.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/slider.js
rename to module/themesource/atlas_core/native/core/widgets/slider.js
diff --git a/test/themesource/atlas_core/native/core/widgets/switch.js b/module/themesource/atlas_core/native/core/widgets/switch.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/switch.js
rename to module/themesource/atlas_core/native/core/widgets/switch.js
diff --git a/test/themesource/atlas_core/native/core/widgets/tabcontainer.js b/module/themesource/atlas_core/native/core/widgets/tabcontainer.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/tabcontainer.js
rename to module/themesource/atlas_core/native/core/widgets/tabcontainer.js
diff --git a/test/themesource/atlas_core/native/core/widgets/textarea.js b/module/themesource/atlas_core/native/core/widgets/textarea.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/textarea.js
rename to module/themesource/atlas_core/native/core/widgets/textarea.js
diff --git a/test/themesource/atlas_core/native/core/widgets/textbox.js b/module/themesource/atlas_core/native/core/widgets/textbox.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/textbox.js
rename to module/themesource/atlas_core/native/core/widgets/textbox.js
diff --git a/test/themesource/atlas_core/native/core/widgets/togglebuttons.js b/module/themesource/atlas_core/native/core/widgets/togglebuttons.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/togglebuttons.js
rename to module/themesource/atlas_core/native/core/widgets/togglebuttons.js
diff --git a/test/themesource/atlas_core/native/core/widgets/typography.js b/module/themesource/atlas_core/native/core/widgets/typography.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/typography.js
rename to module/themesource/atlas_core/native/core/widgets/typography.js
diff --git a/test/themesource/atlas_core/native/core/widgets/videoplayer.js b/module/themesource/atlas_core/native/core/widgets/videoplayer.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/videoplayer.js
rename to module/themesource/atlas_core/native/core/widgets/videoplayer.js
diff --git a/test/themesource/atlas_core/native/core/widgets/webview.js b/module/themesource/atlas_core/native/core/widgets/webview.js
similarity index 100%
rename from test/themesource/atlas_core/native/core/widgets/webview.js
rename to module/themesource/atlas_core/native/core/widgets/webview.js
diff --git a/test/themesource/atlas_core/native/design-properties.json b/module/themesource/atlas_core/native/design-properties.json
similarity index 100%
rename from test/themesource/atlas_core/native/design-properties.json
rename to module/themesource/atlas_core/native/design-properties.json
diff --git a/test/themesource/atlas_core/native/layouts/layout.js b/module/themesource/atlas_core/native/layouts/layout.js
similarity index 100%
rename from test/themesource/atlas_core/native/layouts/layout.js
rename to module/themesource/atlas_core/native/layouts/layout.js
diff --git a/test/themesource/atlas_core/native/layouts/page.js b/module/themesource/atlas_core/native/layouts/page.js
similarity index 100%
rename from test/themesource/atlas_core/native/layouts/page.js
rename to module/themesource/atlas_core/native/layouts/page.js
diff --git a/test/themesource/atlas_core/native/main.js b/module/themesource/atlas_core/native/main.js
similarity index 100%
rename from test/themesource/atlas_core/native/main.js
rename to module/themesource/atlas_core/native/main.js
diff --git a/test/themesource/atlas_core/native/variables.js b/module/themesource/atlas_core/native/variables.js
similarity index 100%
rename from test/themesource/atlas_core/native/variables.js
rename to module/themesource/atlas_core/native/variables.js
diff --git a/test/themesource/atlas_core/public/resources/arrow.svg b/module/themesource/atlas_core/public/resources/arrow.svg
similarity index 100%
rename from test/themesource/atlas_core/public/resources/arrow.svg
rename to module/themesource/atlas_core/public/resources/arrow.svg
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/LICENSE.txt b/module/themesource/atlas_core/public/resources/fonts/open-sans/LICENSE.txt
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/LICENSE.txt
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/LICENSE.txt
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Bold.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Bold.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Bold.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Bold.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-BoldItalic.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-BoldItalic.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-BoldItalic.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-BoldItalic.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Italic.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Italic.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Italic.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Italic.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Light.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Light.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Light.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Light.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-LightItalic.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-LightItalic.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-LightItalic.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-LightItalic.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Regular.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Regular.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Regular.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-Regular.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBold.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBold.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBold.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBold.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBoldItalic.woff b/module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBoldItalic.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBoldItalic.woff
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/OpenSans-SemiBoldItalic.woff
diff --git a/test/themesource/atlas_core/public/resources/fonts/open-sans/open-sans.css b/module/themesource/atlas_core/public/resources/fonts/open-sans/open-sans.css
similarity index 100%
rename from test/themesource/atlas_core/public/resources/fonts/open-sans/open-sans.css
rename to module/themesource/atlas_core/public/resources/fonts/open-sans/open-sans.css
diff --git a/test/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff b/module/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff
similarity index 100%
rename from test/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff
rename to module/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff
diff --git a/test/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff2 b/module/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff2
similarity index 100%
rename from test/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff2
rename to module/themesource/atlas_core/public/resources/glyphicons-halflings-regular.woff2
diff --git a/test/themesource/atlas_core/public/resources/menubar-more-icon.png b/module/themesource/atlas_core/public/resources/menubar-more-icon.png
similarity index 100%
rename from test/themesource/atlas_core/public/resources/menubar-more-icon.png
rename to module/themesource/atlas_core/public/resources/menubar-more-icon.png
diff --git a/test/themesource/atlas_core/public/resources/progress-indicator.gif b/module/themesource/atlas_core/public/resources/progress-indicator.gif
similarity index 100%
rename from test/themesource/atlas_core/public/resources/progress-indicator.gif
rename to module/themesource/atlas_core/public/resources/progress-indicator.gif
diff --git a/test/themesource/atlas_core/public/resources/swipe-progress.gif b/module/themesource/atlas_core/public/resources/swipe-progress.gif
similarity index 100%
rename from test/themesource/atlas_core/public/resources/swipe-progress.gif
rename to module/themesource/atlas_core/public/resources/swipe-progress.gif
diff --git a/test/themesource/atlas_core/public/resources/switcher-toggle.png b/module/themesource/atlas_core/public/resources/switcher-toggle.png
similarity index 100%
rename from test/themesource/atlas_core/public/resources/switcher-toggle.png
rename to module/themesource/atlas_core/public/resources/switcher-toggle.png
diff --git a/test/themesource/atlas_core/public/resources/switcher.png b/module/themesource/atlas_core/public/resources/switcher.png
similarity index 100%
rename from test/themesource/atlas_core/public/resources/switcher.png
rename to module/themesource/atlas_core/public/resources/switcher.png
diff --git a/test/themesource/atlas_core/public/resources/tabcontainer-loading.gif b/module/themesource/atlas_core/public/resources/tabcontainer-loading.gif
similarity index 100%
rename from test/themesource/atlas_core/public/resources/tabcontainer-loading.gif
rename to module/themesource/atlas_core/public/resources/tabcontainer-loading.gif
diff --git a/test/themesource/atlas_core/public/resources/ttp.gif b/module/themesource/atlas_core/public/resources/ttp.gif
similarity index 100%
rename from test/themesource/atlas_core/public/resources/ttp.gif
rename to module/themesource/atlas_core/public/resources/ttp.gif
diff --git a/test/themesource/atlas_core/public/resources/work-do-more.jpeg b/module/themesource/atlas_core/public/resources/work-do-more.jpeg
similarity index 100%
rename from test/themesource/atlas_core/public/resources/work-do-more.jpeg
rename to module/themesource/atlas_core/public/resources/work-do-more.jpeg
diff --git a/test/themesource/atlas_core/web/_exclusion-variables.scss b/module/themesource/atlas_core/web/_exclusion-variables.scss
similarity index 100%
rename from test/themesource/atlas_core/web/_exclusion-variables.scss
rename to module/themesource/atlas_core/web/_exclusion-variables.scss
diff --git a/test/themesource/atlas_core/web/_variables-css-mappings.scss b/module/themesource/atlas_core/web/_variables-css-mappings.scss
similarity index 100%
rename from test/themesource/atlas_core/web/_variables-css-mappings.scss
rename to module/themesource/atlas_core/web/_variables-css-mappings.scss
diff --git a/test/themesource/atlas_core/web/_variables.scss b/module/themesource/atlas_core/web/_variables.scss
similarity index 100%
rename from test/themesource/atlas_core/web/_variables.scss
rename to module/themesource/atlas_core/web/_variables.scss
diff --git a/test/themesource/atlas_core/web/core/_legacy/_mxui.scss b/module/themesource/atlas_core/web/core/_legacy/_mxui.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/_legacy/_mxui.scss
rename to module/themesource/atlas_core/web/core/_legacy/_mxui.scss
diff --git a/test/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap-rtl.scss b/module/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap-rtl.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap-rtl.scss
rename to module/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap-rtl.scss
diff --git a/test/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap.scss b/module/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap.scss
rename to module/themesource/atlas_core/web/core/_legacy/bootstrap/_bootstrap.scss
diff --git a/test/themesource/atlas_core/web/core/base/_animation.scss b/module/themesource/atlas_core/web/core/base/_animation.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/_animation.scss
rename to module/themesource/atlas_core/web/core/base/_animation.scss
diff --git a/test/themesource/atlas_core/web/core/base/_base.scss b/module/themesource/atlas_core/web/core/base/_base.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/_base.scss
rename to module/themesource/atlas_core/web/core/base/_base.scss
diff --git a/test/themesource/atlas_core/web/core/base/_flex.scss b/module/themesource/atlas_core/web/core/base/_flex.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/_flex.scss
rename to module/themesource/atlas_core/web/core/base/_flex.scss
diff --git a/test/themesource/atlas_core/web/core/base/_login.scss b/module/themesource/atlas_core/web/core/base/_login.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/_login.scss
rename to module/themesource/atlas_core/web/core/base/_login.scss
diff --git a/test/themesource/atlas_core/web/core/base/_spacing.scss b/module/themesource/atlas_core/web/core/base/_spacing.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/_spacing.scss
rename to module/themesource/atlas_core/web/core/base/_spacing.scss
diff --git a/test/themesource/atlas_core/web/core/base/mixins/_animations.scss b/module/themesource/atlas_core/web/core/base/mixins/_animations.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/mixins/_animations.scss
rename to module/themesource/atlas_core/web/core/base/mixins/_animations.scss
diff --git a/test/themesource/atlas_core/web/core/base/mixins/_buttons.scss b/module/themesource/atlas_core/web/core/base/mixins/_buttons.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/mixins/_buttons.scss
rename to module/themesource/atlas_core/web/core/base/mixins/_buttons.scss
diff --git a/test/themesource/atlas_core/web/core/base/mixins/_groupbox.scss b/module/themesource/atlas_core/web/core/base/mixins/_groupbox.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/mixins/_groupbox.scss
rename to module/themesource/atlas_core/web/core/base/mixins/_groupbox.scss
diff --git a/test/themesource/atlas_core/web/core/base/mixins/_layout-spacing.scss b/module/themesource/atlas_core/web/core/base/mixins/_layout-spacing.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/mixins/_layout-spacing.scss
rename to module/themesource/atlas_core/web/core/base/mixins/_layout-spacing.scss
diff --git a/test/themesource/atlas_core/web/core/base/mixins/_spacing.scss b/module/themesource/atlas_core/web/core/base/mixins/_spacing.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/base/mixins/_spacing.scss
rename to module/themesource/atlas_core/web/core/base/mixins/_spacing.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_accordion.scss b/module/themesource/atlas_core/web/core/helpers/_accordion.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_accordion.scss
rename to module/themesource/atlas_core/web/core/helpers/_accordion.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_background.scss b/module/themesource/atlas_core/web/core/helpers/_background.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_background.scss
rename to module/themesource/atlas_core/web/core/helpers/_background.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_badge-button.scss b/module/themesource/atlas_core/web/core/helpers/_badge-button.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_badge-button.scss
rename to module/themesource/atlas_core/web/core/helpers/_badge-button.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_button.scss b/module/themesource/atlas_core/web/core/helpers/_button.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_button.scss
rename to module/themesource/atlas_core/web/core/helpers/_button.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_data-grid.scss b/module/themesource/atlas_core/web/core/helpers/_data-grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_data-grid.scss
rename to module/themesource/atlas_core/web/core/helpers/_data-grid.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_group-box.scss b/module/themesource/atlas_core/web/core/helpers/_group-box.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_group-box.scss
rename to module/themesource/atlas_core/web/core/helpers/_group-box.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_helper-classes.scss b/module/themesource/atlas_core/web/core/helpers/_helper-classes.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_helper-classes.scss
rename to module/themesource/atlas_core/web/core/helpers/_helper-classes.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_image.scss b/module/themesource/atlas_core/web/core/helpers/_image.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_image.scss
rename to module/themesource/atlas_core/web/core/helpers/_image.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_label.scss b/module/themesource/atlas_core/web/core/helpers/_label.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_label.scss
rename to module/themesource/atlas_core/web/core/helpers/_label.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_list-view.scss b/module/themesource/atlas_core/web/core/helpers/_list-view.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_list-view.scss
rename to module/themesource/atlas_core/web/core/helpers/_list-view.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_navigation-bar.scss b/module/themesource/atlas_core/web/core/helpers/_navigation-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_navigation-bar.scss
rename to module/themesource/atlas_core/web/core/helpers/_navigation-bar.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_navigation-tree.scss b/module/themesource/atlas_core/web/core/helpers/_navigation-tree.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_navigation-tree.scss
rename to module/themesource/atlas_core/web/core/helpers/_navigation-tree.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_progress-bar.scss b/module/themesource/atlas_core/web/core/helpers/_progress-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_progress-bar.scss
rename to module/themesource/atlas_core/web/core/helpers/_progress-bar.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_progress-circle.scss b/module/themesource/atlas_core/web/core/helpers/_progress-circle.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_progress-circle.scss
rename to module/themesource/atlas_core/web/core/helpers/_progress-circle.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_range-slider.scss b/module/themesource/atlas_core/web/core/helpers/_range-slider.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_range-slider.scss
rename to module/themesource/atlas_core/web/core/helpers/_range-slider.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_rating.scss b/module/themesource/atlas_core/web/core/helpers/_rating.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_rating.scss
rename to module/themesource/atlas_core/web/core/helpers/_rating.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_simple-menu-bar.scss b/module/themesource/atlas_core/web/core/helpers/_simple-menu-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_simple-menu-bar.scss
rename to module/themesource/atlas_core/web/core/helpers/_simple-menu-bar.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_slider-color-variant.scss b/module/themesource/atlas_core/web/core/helpers/_slider-color-variant.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_slider-color-variant.scss
rename to module/themesource/atlas_core/web/core/helpers/_slider-color-variant.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_slider.scss b/module/themesource/atlas_core/web/core/helpers/_slider.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_slider.scss
rename to module/themesource/atlas_core/web/core/helpers/_slider.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_tab-container.scss b/module/themesource/atlas_core/web/core/helpers/_tab-container.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_tab-container.scss
rename to module/themesource/atlas_core/web/core/helpers/_tab-container.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_table.scss b/module/themesource/atlas_core/web/core/helpers/_table.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_table.scss
rename to module/themesource/atlas_core/web/core/helpers/_table.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_template-grid.scss b/module/themesource/atlas_core/web/core/helpers/_template-grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_template-grid.scss
rename to module/themesource/atlas_core/web/core/helpers/_template-grid.scss
diff --git a/test/themesource/atlas_core/web/core/helpers/_typography.scss b/module/themesource/atlas_core/web/core/helpers/_typography.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/helpers/_typography.scss
rename to module/themesource/atlas_core/web/core/helpers/_typography.scss
diff --git a/test/themesource/atlas_core/web/core/manifest.json b/module/themesource/atlas_core/web/core/manifest.json
similarity index 100%
rename from test/themesource/atlas_core/web/core/manifest.json
rename to module/themesource/atlas_core/web/core/manifest.json
diff --git a/test/themesource/atlas_core/web/core/widgets/_accordion.scss b/module/themesource/atlas_core/web/core/widgets/_accordion.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_accordion.scss
rename to module/themesource/atlas_core/web/core/widgets/_accordion.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_badge-button.scss b/module/themesource/atlas_core/web/core/widgets/_badge-button.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_badge-button.scss
rename to module/themesource/atlas_core/web/core/widgets/_badge-button.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_badge.scss b/module/themesource/atlas_core/web/core/widgets/_badge.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_badge.scss
rename to module/themesource/atlas_core/web/core/widgets/_badge.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_barcode-scanner.scss b/module/themesource/atlas_core/web/core/widgets/_barcode-scanner.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_barcode-scanner.scss
rename to module/themesource/atlas_core/web/core/widgets/_barcode-scanner.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_button.scss b/module/themesource/atlas_core/web/core/widgets/_button.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_button.scss
rename to module/themesource/atlas_core/web/core/widgets/_button.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_check-box.scss b/module/themesource/atlas_core/web/core/widgets/_check-box.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_check-box.scss
rename to module/themesource/atlas_core/web/core/widgets/_check-box.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_data-grid.scss b/module/themesource/atlas_core/web/core/widgets/_data-grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_data-grid.scss
rename to module/themesource/atlas_core/web/core/widgets/_data-grid.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_data-view.scss b/module/themesource/atlas_core/web/core/widgets/_data-view.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_data-view.scss
rename to module/themesource/atlas_core/web/core/widgets/_data-view.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_date-picker.scss b/module/themesource/atlas_core/web/core/widgets/_date-picker.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_date-picker.scss
rename to module/themesource/atlas_core/web/core/widgets/_date-picker.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_glyphicon.scss b/module/themesource/atlas_core/web/core/widgets/_glyphicon.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_glyphicon.scss
rename to module/themesource/atlas_core/web/core/widgets/_glyphicon.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_grid.scss b/module/themesource/atlas_core/web/core/widgets/_grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_grid.scss
rename to module/themesource/atlas_core/web/core/widgets/_grid.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_group-box.scss b/module/themesource/atlas_core/web/core/widgets/_group-box.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_group-box.scss
rename to module/themesource/atlas_core/web/core/widgets/_group-box.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_header.scss b/module/themesource/atlas_core/web/core/widgets/_header.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_header.scss
rename to module/themesource/atlas_core/web/core/widgets/_header.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_input.scss b/module/themesource/atlas_core/web/core/widgets/_input.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_input.scss
rename to module/themesource/atlas_core/web/core/widgets/_input.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_label.scss b/module/themesource/atlas_core/web/core/widgets/_label.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_label.scss
rename to module/themesource/atlas_core/web/core/widgets/_label.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_layout-grid.scss b/module/themesource/atlas_core/web/core/widgets/_layout-grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_layout-grid.scss
rename to module/themesource/atlas_core/web/core/widgets/_layout-grid.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_list-view.scss b/module/themesource/atlas_core/web/core/widgets/_list-view.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_list-view.scss
rename to module/themesource/atlas_core/web/core/widgets/_list-view.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_modal.scss b/module/themesource/atlas_core/web/core/widgets/_modal.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_modal.scss
rename to module/themesource/atlas_core/web/core/widgets/_modal.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_navigation-bar.scss b/module/themesource/atlas_core/web/core/widgets/_navigation-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_navigation-bar.scss
rename to module/themesource/atlas_core/web/core/widgets/_navigation-bar.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_navigation-list.scss b/module/themesource/atlas_core/web/core/widgets/_navigation-list.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_navigation-list.scss
rename to module/themesource/atlas_core/web/core/widgets/_navigation-list.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_navigation-tree.scss b/module/themesource/atlas_core/web/core/widgets/_navigation-tree.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_navigation-tree.scss
rename to module/themesource/atlas_core/web/core/widgets/_navigation-tree.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_pagination.scss b/module/themesource/atlas_core/web/core/widgets/_pagination.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_pagination.scss
rename to module/themesource/atlas_core/web/core/widgets/_pagination.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_pop-up-menu.scss b/module/themesource/atlas_core/web/core/widgets/_pop-up-menu.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_pop-up-menu.scss
rename to module/themesource/atlas_core/web/core/widgets/_pop-up-menu.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_progress-bar.scss b/module/themesource/atlas_core/web/core/widgets/_progress-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_progress-bar.scss
rename to module/themesource/atlas_core/web/core/widgets/_progress-bar.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_progress-circle.scss b/module/themesource/atlas_core/web/core/widgets/_progress-circle.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_progress-circle.scss
rename to module/themesource/atlas_core/web/core/widgets/_progress-circle.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_progress.scss b/module/themesource/atlas_core/web/core/widgets/_progress.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_progress.scss
rename to module/themesource/atlas_core/web/core/widgets/_progress.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_radio-button.scss b/module/themesource/atlas_core/web/core/widgets/_radio-button.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_radio-button.scss
rename to module/themesource/atlas_core/web/core/widgets/_radio-button.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_range-slider.scss b/module/themesource/atlas_core/web/core/widgets/_range-slider.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_range-slider.scss
rename to module/themesource/atlas_core/web/core/widgets/_range-slider.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_rating.scss b/module/themesource/atlas_core/web/core/widgets/_rating.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_rating.scss
rename to module/themesource/atlas_core/web/core/widgets/_rating.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_scroll-container-dojo.scss b/module/themesource/atlas_core/web/core/widgets/_scroll-container-dojo.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_scroll-container-dojo.scss
rename to module/themesource/atlas_core/web/core/widgets/_scroll-container-dojo.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_scroll-container-react.scss b/module/themesource/atlas_core/web/core/widgets/_scroll-container-react.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_scroll-container-react.scss
rename to module/themesource/atlas_core/web/core/widgets/_scroll-container-react.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_scroll-container.scss b/module/themesource/atlas_core/web/core/widgets/_scroll-container.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_scroll-container.scss
rename to module/themesource/atlas_core/web/core/widgets/_scroll-container.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_simple-menu-bar.scss b/module/themesource/atlas_core/web/core/widgets/_simple-menu-bar.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_simple-menu-bar.scss
rename to module/themesource/atlas_core/web/core/widgets/_simple-menu-bar.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_slider.scss b/module/themesource/atlas_core/web/core/widgets/_slider.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_slider.scss
rename to module/themesource/atlas_core/web/core/widgets/_slider.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_switch.scss b/module/themesource/atlas_core/web/core/widgets/_switch.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_switch.scss
rename to module/themesource/atlas_core/web/core/widgets/_switch.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_tab-container.scss b/module/themesource/atlas_core/web/core/widgets/_tab-container.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_tab-container.scss
rename to module/themesource/atlas_core/web/core/widgets/_tab-container.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_table.scss b/module/themesource/atlas_core/web/core/widgets/_table.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_table.scss
rename to module/themesource/atlas_core/web/core/widgets/_table.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_template-grid.scss b/module/themesource/atlas_core/web/core/widgets/_template-grid.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_template-grid.scss
rename to module/themesource/atlas_core/web/core/widgets/_template-grid.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_timeline.scss b/module/themesource/atlas_core/web/core/widgets/_timeline.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_timeline.scss
rename to module/themesource/atlas_core/web/core/widgets/_timeline.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_tooltip.scss b/module/themesource/atlas_core/web/core/widgets/_tooltip.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_tooltip.scss
rename to module/themesource/atlas_core/web/core/widgets/_tooltip.scss
diff --git a/test/themesource/atlas_core/web/core/widgets/_typography.scss b/module/themesource/atlas_core/web/core/widgets/_typography.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgets/_typography.scss
rename to module/themesource/atlas_core/web/core/widgets/_typography.scss
diff --git a/test/themesource/atlas_core/web/core/widgetscustom/_dijit-widget.scss b/module/themesource/atlas_core/web/core/widgetscustom/_dijit-widget.scss
similarity index 100%
rename from test/themesource/atlas_core/web/core/widgetscustom/_dijit-widget.scss
rename to module/themesource/atlas_core/web/core/widgetscustom/_dijit-widget.scss
diff --git a/test/themesource/atlas_core/web/design-properties.json b/module/themesource/atlas_core/web/design-properties.json
similarity index 100%
rename from test/themesource/atlas_core/web/design-properties.json
rename to module/themesource/atlas_core/web/design-properties.json
diff --git a/test/themesource/atlas_core/web/layouts/_layout-atlas-phone.scss b/module/themesource/atlas_core/web/layouts/_layout-atlas-phone.scss
similarity index 100%
rename from test/themesource/atlas_core/web/layouts/_layout-atlas-phone.scss
rename to module/themesource/atlas_core/web/layouts/_layout-atlas-phone.scss
diff --git a/test/themesource/atlas_core/web/layouts/_layout-atlas-responsive.scss b/module/themesource/atlas_core/web/layouts/_layout-atlas-responsive.scss
similarity index 100%
rename from test/themesource/atlas_core/web/layouts/_layout-atlas-responsive.scss
rename to module/themesource/atlas_core/web/layouts/_layout-atlas-responsive.scss
diff --git a/test/themesource/atlas_core/web/layouts/_layout-atlas-tablet.scss b/module/themesource/atlas_core/web/layouts/_layout-atlas-tablet.scss
similarity index 100%
rename from test/themesource/atlas_core/web/layouts/_layout-atlas-tablet.scss
rename to module/themesource/atlas_core/web/layouts/_layout-atlas-tablet.scss
diff --git a/test/themesource/atlas_core/web/layouts/_layout-atlas.scss b/module/themesource/atlas_core/web/layouts/_layout-atlas.scss
similarity index 100%
rename from test/themesource/atlas_core/web/layouts/_layout-atlas.scss
rename to module/themesource/atlas_core/web/layouts/_layout-atlas.scss
diff --git a/test/themesource/atlas_core/web/main.scss b/module/themesource/atlas_core/web/main.scss
similarity index 100%
rename from test/themesource/atlas_core/web/main.scss
rename to module/themesource/atlas_core/web/main.scss
diff --git a/test/themesource/atlas_nativemobile_content/native/buildingblocks/card.js b/module/themesource/atlas_nativemobile_content/native/buildingblocks/card.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/buildingblocks/card.js
rename to module/themesource/atlas_nativemobile_content/native/buildingblocks/card.js
diff --git a/test/themesource/atlas_nativemobile_content/native/buildingblocks/header.js b/module/themesource/atlas_nativemobile_content/native/buildingblocks/header.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/buildingblocks/header.js
rename to module/themesource/atlas_nativemobile_content/native/buildingblocks/header.js
diff --git a/test/themesource/atlas_nativemobile_content/native/buildingblocks/splitview.js b/module/themesource/atlas_nativemobile_content/native/buildingblocks/splitview.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/buildingblocks/splitview.js
rename to module/themesource/atlas_nativemobile_content/native/buildingblocks/splitview.js
diff --git a/test/themesource/atlas_nativemobile_content/native/main.js b/module/themesource/atlas_nativemobile_content/native/main.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/main.js
rename to module/themesource/atlas_nativemobile_content/native/main.js
diff --git a/test/themesource/atlas_nativemobile_content/native/pagetemplates/dashboard.js b/module/themesource/atlas_nativemobile_content/native/pagetemplates/dashboard.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/pagetemplates/dashboard.js
rename to module/themesource/atlas_nativemobile_content/native/pagetemplates/dashboard.js
diff --git a/test/themesource/atlas_nativemobile_content/native/pagetemplates/inspectiondetails.js b/module/themesource/atlas_nativemobile_content/native/pagetemplates/inspectiondetails.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/pagetemplates/inspectiondetails.js
rename to module/themesource/atlas_nativemobile_content/native/pagetemplates/inspectiondetails.js
diff --git a/test/themesource/atlas_nativemobile_content/native/pagetemplates/maps.js b/module/themesource/atlas_nativemobile_content/native/pagetemplates/maps.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/pagetemplates/maps.js
rename to module/themesource/atlas_nativemobile_content/native/pagetemplates/maps.js
diff --git a/test/themesource/atlas_nativemobile_content/native/pagetemplates/signinsignup.js b/module/themesource/atlas_nativemobile_content/native/pagetemplates/signinsignup.js
similarity index 100%
rename from test/themesource/atlas_nativemobile_content/native/pagetemplates/signinsignup.js
rename to module/themesource/atlas_nativemobile_content/native/pagetemplates/signinsignup.js
diff --git a/test/themesource/atlas_web_content/.version b/module/themesource/atlas_web_content/.version
similarity index 100%
rename from test/themesource/atlas_web_content/.version
rename to module/themesource/atlas_web_content/.version
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_alert.scss b/module/themesource/atlas_web_content/web/buildingblocks/_alert.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_alert.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_alert.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_breadcrumb.scss b/module/themesource/atlas_web_content/web/buildingblocks/_breadcrumb.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_breadcrumb.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_breadcrumb.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_card.scss b/module/themesource/atlas_web_content/web/buildingblocks/_card.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_card.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_card.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_chat.scss b/module/themesource/atlas_web_content/web/buildingblocks/_chat.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_chat.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_chat.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_controlgroup.scss b/module/themesource/atlas_web_content/web/buildingblocks/_controlgroup.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_controlgroup.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_controlgroup.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_formblock.scss b/module/themesource/atlas_web_content/web/buildingblocks/_formblock.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_formblock.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_formblock.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_heroheader.scss b/module/themesource/atlas_web_content/web/buildingblocks/_heroheader.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_heroheader.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_heroheader.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_master-detail.scss b/module/themesource/atlas_web_content/web/buildingblocks/_master-detail.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_master-detail.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_master-detail.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_pageblocks.scss b/module/themesource/atlas_web_content/web/buildingblocks/_pageblocks.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_pageblocks.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_pageblocks.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_pageheader.scss b/module/themesource/atlas_web_content/web/buildingblocks/_pageheader.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_pageheader.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_pageheader.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_userprofile.scss b/module/themesource/atlas_web_content/web/buildingblocks/_userprofile.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_userprofile.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_userprofile.scss
diff --git a/test/themesource/atlas_web_content/web/buildingblocks/_wizard.scss b/module/themesource/atlas_web_content/web/buildingblocks/_wizard.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/buildingblocks/_wizard.scss
rename to module/themesource/atlas_web_content/web/buildingblocks/_wizard.scss
diff --git a/test/themesource/atlas_web_content/web/main.scss b/module/themesource/atlas_web_content/web/main.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/main.scss
rename to module/themesource/atlas_web_content/web/main.scss
diff --git a/test/themesource/atlas_web_content/web/pagetemplates/_list-tab.scss b/module/themesource/atlas_web_content/web/pagetemplates/_list-tab.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/pagetemplates/_list-tab.scss
rename to module/themesource/atlas_web_content/web/pagetemplates/_list-tab.scss
diff --git a/test/themesource/atlas_web_content/web/pagetemplates/_login.scss b/module/themesource/atlas_web_content/web/pagetemplates/_login.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/pagetemplates/_login.scss
rename to module/themesource/atlas_web_content/web/pagetemplates/_login.scss
diff --git a/test/themesource/atlas_web_content/web/pagetemplates/_springboard.scss b/module/themesource/atlas_web_content/web/pagetemplates/_springboard.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/pagetemplates/_springboard.scss
rename to module/themesource/atlas_web_content/web/pagetemplates/_springboard.scss
diff --git a/test/themesource/atlas_web_content/web/pagetemplates/_statuspage.scss b/module/themesource/atlas_web_content/web/pagetemplates/_statuspage.scss
similarity index 100%
rename from test/themesource/atlas_web_content/web/pagetemplates/_statuspage.scss
rename to module/themesource/atlas_web_content/web/pagetemplates/_statuspage.scss
diff --git a/test/themesource/communitycommons/native/design-properties.json b/module/themesource/communitycommons/native/design-properties.json
similarity index 100%
rename from test/themesource/communitycommons/native/design-properties.json
rename to module/themesource/communitycommons/native/design-properties.json
diff --git a/test/themesource/communitycommons/native/main.js b/module/themesource/communitycommons/native/main.js
similarity index 100%
rename from test/themesource/communitycommons/native/main.js
rename to module/themesource/communitycommons/native/main.js
diff --git a/test/themesource/communitycommons/settings.json b/module/themesource/communitycommons/settings.json
similarity index 100%
rename from test/themesource/communitycommons/settings.json
rename to module/themesource/communitycommons/settings.json
diff --git a/test/themesource/communitycommons/web/design-properties.json b/module/themesource/communitycommons/web/design-properties.json
similarity index 100%
rename from test/themesource/communitycommons/web/design-properties.json
rename to module/themesource/communitycommons/web/design-properties.json
diff --git a/test/themesource/communitycommons/web/main.scss b/module/themesource/communitycommons/web/main.scss
similarity index 100%
rename from test/themesource/communitycommons/web/main.scss
rename to module/themesource/communitycommons/web/main.scss
diff --git a/test/themesource/datawidgets/.version b/module/themesource/datawidgets/.version
similarity index 100%
rename from test/themesource/datawidgets/.version
rename to module/themesource/datawidgets/.version
diff --git a/test/themesource/datawidgets/LICENSE b/module/themesource/datawidgets/LICENSE
similarity index 100%
rename from test/themesource/datawidgets/LICENSE
rename to module/themesource/datawidgets/LICENSE
diff --git a/test/themesource/datawidgets/public/fonts/datagrid-filters.eot b/module/themesource/datawidgets/public/fonts/datagrid-filters.eot
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/datagrid-filters.eot
rename to module/themesource/datawidgets/public/fonts/datagrid-filters.eot
diff --git a/test/themesource/datawidgets/public/fonts/datagrid-filters.svg b/module/themesource/datawidgets/public/fonts/datagrid-filters.svg
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/datagrid-filters.svg
rename to module/themesource/datawidgets/public/fonts/datagrid-filters.svg
diff --git a/test/themesource/datawidgets/public/fonts/datagrid-filters.ttf b/module/themesource/datawidgets/public/fonts/datagrid-filters.ttf
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/datagrid-filters.ttf
rename to module/themesource/datawidgets/public/fonts/datagrid-filters.ttf
diff --git a/test/themesource/datawidgets/public/fonts/datagrid-filters.woff b/module/themesource/datawidgets/public/fonts/datagrid-filters.woff
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/datagrid-filters.woff
rename to module/themesource/datawidgets/public/fonts/datagrid-filters.woff
diff --git a/test/themesource/datawidgets/public/fonts/datagrid-filters.woff2 b/module/themesource/datawidgets/public/fonts/datagrid-filters.woff2
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/datagrid-filters.woff2
rename to module/themesource/datawidgets/public/fonts/datagrid-filters.woff2
diff --git a/test/themesource/datawidgets/public/fonts/dropdown-sort.eot b/module/themesource/datawidgets/public/fonts/dropdown-sort.eot
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/dropdown-sort.eot
rename to module/themesource/datawidgets/public/fonts/dropdown-sort.eot
diff --git a/test/themesource/datawidgets/public/fonts/dropdown-sort.svg b/module/themesource/datawidgets/public/fonts/dropdown-sort.svg
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/dropdown-sort.svg
rename to module/themesource/datawidgets/public/fonts/dropdown-sort.svg
diff --git a/test/themesource/datawidgets/public/fonts/dropdown-sort.ttf b/module/themesource/datawidgets/public/fonts/dropdown-sort.ttf
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/dropdown-sort.ttf
rename to module/themesource/datawidgets/public/fonts/dropdown-sort.ttf
diff --git a/test/themesource/datawidgets/public/fonts/dropdown-sort.woff b/module/themesource/datawidgets/public/fonts/dropdown-sort.woff
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/dropdown-sort.woff
rename to module/themesource/datawidgets/public/fonts/dropdown-sort.woff
diff --git a/test/themesource/datawidgets/public/fonts/dropdown-sort.woff2 b/module/themesource/datawidgets/public/fonts/dropdown-sort.woff2
similarity index 100%
rename from test/themesource/datawidgets/public/fonts/dropdown-sort.woff2
rename to module/themesource/datawidgets/public/fonts/dropdown-sort.woff2
diff --git a/test/themesource/datawidgets/public/resources/dropdown-arrow.svg b/module/themesource/datawidgets/public/resources/dropdown-arrow.svg
similarity index 100%
rename from test/themesource/datawidgets/public/resources/dropdown-arrow.svg
rename to module/themesource/datawidgets/public/resources/dropdown-arrow.svg
diff --git a/test/themesource/datawidgets/web/_datagrid-design-properties.scss b/module/themesource/datawidgets/web/_datagrid-design-properties.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_datagrid-design-properties.scss
rename to module/themesource/datawidgets/web/_datagrid-design-properties.scss
diff --git a/test/themesource/datawidgets/web/_datagrid-filters.scss b/module/themesource/datawidgets/web/_datagrid-filters.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_datagrid-filters.scss
rename to module/themesource/datawidgets/web/_datagrid-filters.scss
diff --git a/test/themesource/datawidgets/web/_datagrid-scroll.scss b/module/themesource/datawidgets/web/_datagrid-scroll.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_datagrid-scroll.scss
rename to module/themesource/datawidgets/web/_datagrid-scroll.scss
diff --git a/test/themesource/datawidgets/web/_datagrid.scss b/module/themesource/datawidgets/web/_datagrid.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_datagrid.scss
rename to module/themesource/datawidgets/web/_datagrid.scss
diff --git a/test/themesource/datawidgets/web/_date-picker.scss b/module/themesource/datawidgets/web/_date-picker.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_date-picker.scss
rename to module/themesource/datawidgets/web/_date-picker.scss
diff --git a/test/themesource/datawidgets/web/_drop-down-sort.scss b/module/themesource/datawidgets/web/_drop-down-sort.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_drop-down-sort.scss
rename to module/themesource/datawidgets/web/_drop-down-sort.scss
diff --git a/test/themesource/datawidgets/web/_gallery-design-properties.scss b/module/themesource/datawidgets/web/_gallery-design-properties.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_gallery-design-properties.scss
rename to module/themesource/datawidgets/web/_gallery-design-properties.scss
diff --git a/test/themesource/datawidgets/web/_gallery.scss b/module/themesource/datawidgets/web/_gallery.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_gallery.scss
rename to module/themesource/datawidgets/web/_gallery.scss
diff --git a/test/themesource/datawidgets/web/_three-state-checkbox.scss b/module/themesource/datawidgets/web/_three-state-checkbox.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_three-state-checkbox.scss
rename to module/themesource/datawidgets/web/_three-state-checkbox.scss
diff --git a/test/themesource/datawidgets/web/_tree-node-design-properties.scss b/module/themesource/datawidgets/web/_tree-node-design-properties.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_tree-node-design-properties.scss
rename to module/themesource/datawidgets/web/_tree-node-design-properties.scss
diff --git a/test/themesource/datawidgets/web/_tree-node.scss b/module/themesource/datawidgets/web/_tree-node.scss
similarity index 100%
rename from test/themesource/datawidgets/web/_tree-node.scss
rename to module/themesource/datawidgets/web/_tree-node.scss
diff --git a/test/themesource/datawidgets/web/design-properties.json b/module/themesource/datawidgets/web/design-properties.json
similarity index 100%
rename from test/themesource/datawidgets/web/design-properties.json
rename to module/themesource/datawidgets/web/design-properties.json
diff --git a/test/themesource/datawidgets/web/main.scss b/module/themesource/datawidgets/web/main.scss
similarity index 100%
rename from test/themesource/datawidgets/web/main.scss
rename to module/themesource/datawidgets/web/main.scss
diff --git a/test/themesource/feedbackmodule/native/design-properties.json b/module/themesource/feedbackmodule/native/design-properties.json
similarity index 100%
rename from test/themesource/feedbackmodule/native/design-properties.json
rename to module/themesource/feedbackmodule/native/design-properties.json
diff --git a/test/themesource/feedbackmodule/native/main.js b/module/themesource/feedbackmodule/native/main.js
similarity index 100%
rename from test/themesource/feedbackmodule/native/main.js
rename to module/themesource/feedbackmodule/native/main.js
diff --git a/test/themesource/feedbackmodule/settings.json b/module/themesource/feedbackmodule/settings.json
similarity index 100%
rename from test/themesource/feedbackmodule/settings.json
rename to module/themesource/feedbackmodule/settings.json
diff --git a/test/themesource/feedbackmodule/web/_failed.scss b/module/themesource/feedbackmodule/web/_failed.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_failed.scss
rename to module/themesource/feedbackmodule/web/_failed.scss
diff --git a/test/themesource/feedbackmodule/web/_feedbackForm.scss b/module/themesource/feedbackmodule/web/_feedbackForm.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_feedbackForm.scss
rename to module/themesource/feedbackmodule/web/_feedbackForm.scss
diff --git a/test/themesource/feedbackmodule/web/_labelGroup.scss b/module/themesource/feedbackmodule/web/_labelGroup.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_labelGroup.scss
rename to module/themesource/feedbackmodule/web/_labelGroup.scss
diff --git a/test/themesource/feedbackmodule/web/_lightbox.scss b/module/themesource/feedbackmodule/web/_lightbox.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_lightbox.scss
rename to module/themesource/feedbackmodule/web/_lightbox.scss
diff --git a/test/themesource/feedbackmodule/web/_result.scss b/module/themesource/feedbackmodule/web/_result.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_result.scss
rename to module/themesource/feedbackmodule/web/_result.scss
diff --git a/test/themesource/feedbackmodule/web/_screenshotPreview.scss b/module/themesource/feedbackmodule/web/_screenshotPreview.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_screenshotPreview.scss
rename to module/themesource/feedbackmodule/web/_screenshotPreview.scss
diff --git a/test/themesource/feedbackmodule/web/_startButton.scss b/module/themesource/feedbackmodule/web/_startButton.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_startButton.scss
rename to module/themesource/feedbackmodule/web/_startButton.scss
diff --git a/test/themesource/feedbackmodule/web/_tooltip.scss b/module/themesource/feedbackmodule/web/_tooltip.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/_tooltip.scss
rename to module/themesource/feedbackmodule/web/_tooltip.scss
diff --git a/test/themesource/feedbackmodule/web/annotation/_annotation-canvas.scss b/module/themesource/feedbackmodule/web/annotation/_annotation-canvas.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/annotation/_annotation-canvas.scss
rename to module/themesource/feedbackmodule/web/annotation/_annotation-canvas.scss
diff --git a/test/themesource/feedbackmodule/web/annotation/_annotation-frame.scss b/module/themesource/feedbackmodule/web/annotation/_annotation-frame.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/annotation/_annotation-frame.scss
rename to module/themesource/feedbackmodule/web/annotation/_annotation-frame.scss
diff --git a/test/themesource/feedbackmodule/web/button/_button.scss b/module/themesource/feedbackmodule/web/button/_button.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/button/_button.scss
rename to module/themesource/feedbackmodule/web/button/_button.scss
diff --git a/test/themesource/feedbackmodule/web/button/_buttonGroup.scss b/module/themesource/feedbackmodule/web/button/_buttonGroup.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/button/_buttonGroup.scss
rename to module/themesource/feedbackmodule/web/button/_buttonGroup.scss
diff --git a/test/themesource/feedbackmodule/web/design-properties.json b/module/themesource/feedbackmodule/web/design-properties.json
similarity index 100%
rename from test/themesource/feedbackmodule/web/design-properties.json
rename to module/themesource/feedbackmodule/web/design-properties.json
diff --git a/test/themesource/feedbackmodule/web/dialog/_closeButton.scss b/module/themesource/feedbackmodule/web/dialog/_closeButton.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/dialog/_closeButton.scss
rename to module/themesource/feedbackmodule/web/dialog/_closeButton.scss
diff --git a/test/themesource/feedbackmodule/web/dialog/_dialog.scss b/module/themesource/feedbackmodule/web/dialog/_dialog.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/dialog/_dialog.scss
rename to module/themesource/feedbackmodule/web/dialog/_dialog.scss
diff --git a/test/themesource/feedbackmodule/web/dialog/_underlay.scss b/module/themesource/feedbackmodule/web/dialog/_underlay.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/dialog/_underlay.scss
rename to module/themesource/feedbackmodule/web/dialog/_underlay.scss
diff --git a/test/themesource/feedbackmodule/web/includes/_atlasVariables.scss b/module/themesource/feedbackmodule/web/includes/_atlasVariables.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/includes/_atlasVariables.scss
rename to module/themesource/feedbackmodule/web/includes/_atlasVariables.scss
diff --git a/test/themesource/feedbackmodule/web/includes/_helpers.scss b/module/themesource/feedbackmodule/web/includes/_helpers.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/includes/_helpers.scss
rename to module/themesource/feedbackmodule/web/includes/_helpers.scss
diff --git a/test/themesource/feedbackmodule/web/includes/_variables.scss b/module/themesource/feedbackmodule/web/includes/_variables.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/includes/_variables.scss
rename to module/themesource/feedbackmodule/web/includes/_variables.scss
diff --git a/test/themesource/feedbackmodule/web/main.scss b/module/themesource/feedbackmodule/web/main.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/main.scss
rename to module/themesource/feedbackmodule/web/main.scss
diff --git a/test/themesource/feedbackmodule/web/toolbar/_toolButton.scss b/module/themesource/feedbackmodule/web/toolbar/_toolButton.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/toolbar/_toolButton.scss
rename to module/themesource/feedbackmodule/web/toolbar/_toolButton.scss
diff --git a/test/themesource/feedbackmodule/web/toolbar/_toolbar.scss b/module/themesource/feedbackmodule/web/toolbar/_toolbar.scss
similarity index 100%
rename from test/themesource/feedbackmodule/web/toolbar/_toolbar.scss
rename to module/themesource/feedbackmodule/web/toolbar/_toolbar.scss
diff --git a/test/themesource/nanoflowcommons/.version b/module/themesource/nanoflowcommons/.version
similarity index 100%
rename from test/themesource/nanoflowcommons/.version
rename to module/themesource/nanoflowcommons/.version
diff --git a/test/themesource/nanoflowcommons/native/design-properties.json b/module/themesource/nanoflowcommons/native/design-properties.json
similarity index 100%
rename from test/themesource/nanoflowcommons/native/design-properties.json
rename to module/themesource/nanoflowcommons/native/design-properties.json
diff --git a/test/themesource/nanoflowcommons/native/main.js b/module/themesource/nanoflowcommons/native/main.js
similarity index 100%
rename from test/themesource/nanoflowcommons/native/main.js
rename to module/themesource/nanoflowcommons/native/main.js
diff --git a/test/themesource/nanoflowcommons/web/design-properties.json b/module/themesource/nanoflowcommons/web/design-properties.json
similarity index 100%
rename from test/themesource/nanoflowcommons/web/design-properties.json
rename to module/themesource/nanoflowcommons/web/design-properties.json
diff --git a/test/themesource/nanoflowcommons/web/main.scss b/module/themesource/nanoflowcommons/web/main.scss
similarity index 100%
rename from test/themesource/nanoflowcommons/web/main.scss
rename to module/themesource/nanoflowcommons/web/main.scss
diff --git a/test/themesource/nativemobileresources/.version b/module/themesource/nativemobileresources/.version
similarity index 100%
rename from test/themesource/nativemobileresources/.version
rename to module/themesource/nativemobileresources/.version
diff --git a/test/themesource/nativemobileresources/native/design-properties.json b/module/themesource/nativemobileresources/native/design-properties.json
similarity index 100%
rename from test/themesource/nativemobileresources/native/design-properties.json
rename to module/themesource/nativemobileresources/native/design-properties.json
diff --git a/test/themesource/nativemobileresources/native/main.js b/module/themesource/nativemobileresources/native/main.js
similarity index 100%
rename from test/themesource/nativemobileresources/native/main.js
rename to module/themesource/nativemobileresources/native/main.js
diff --git a/test/themesource/nativemobileresources/web/design-properties.json b/module/themesource/nativemobileresources/web/design-properties.json
similarity index 100%
rename from test/themesource/nativemobileresources/web/design-properties.json
rename to module/themesource/nativemobileresources/web/design-properties.json
diff --git a/test/themesource/nativemobileresources/web/main.scss b/module/themesource/nativemobileresources/web/main.scss
similarity index 100%
rename from test/themesource/nativemobileresources/web/main.scss
rename to module/themesource/nativemobileresources/web/main.scss
diff --git a/test/themesource/pushnotificationexampleimplementation/native/design-properties.json b/module/themesource/pushnotificationexampleimplementation/native/design-properties.json
similarity index 100%
rename from test/themesource/pushnotificationexampleimplementation/native/design-properties.json
rename to module/themesource/pushnotificationexampleimplementation/native/design-properties.json
diff --git a/test/themesource/pushnotificationexampleimplementation/native/main.js b/module/themesource/pushnotificationexampleimplementation/native/main.js
similarity index 100%
rename from test/themesource/pushnotificationexampleimplementation/native/main.js
rename to module/themesource/pushnotificationexampleimplementation/native/main.js
diff --git a/test/themesource/pushnotificationexampleimplementation/web/design-properties.json b/module/themesource/pushnotificationexampleimplementation/web/design-properties.json
similarity index 100%
rename from test/themesource/pushnotificationexampleimplementation/web/design-properties.json
rename to module/themesource/pushnotificationexampleimplementation/web/design-properties.json
diff --git a/test/themesource/pushnotificationexampleimplementation/web/main.scss b/module/themesource/pushnotificationexampleimplementation/web/main.scss
similarity index 100%
rename from test/themesource/pushnotificationexampleimplementation/web/main.scss
rename to module/themesource/pushnotificationexampleimplementation/web/main.scss
diff --git a/test/themesource/pushnotifications/web/administration.scss b/module/themesource/pushnotifications/web/administration.scss
similarity index 100%
rename from test/themesource/pushnotifications/web/administration.scss
rename to module/themesource/pushnotifications/web/administration.scss
diff --git a/test/themesource/pushnotifications/web/main.scss b/module/themesource/pushnotifications/web/main.scss
similarity index 100%
rename from test/themesource/pushnotifications/web/main.scss
rename to module/themesource/pushnotifications/web/main.scss
diff --git a/module/userlib/CommunityCommons.migration b/module/userlib/CommunityCommons.migration
new file mode 100644
index 00000000..d7601c08
--- /dev/null
+++ b/module/userlib/CommunityCommons.migration
@@ -0,0 +1,32 @@
+dependency com.google.guava:guava:33.4.7-jre
+dependency com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2
+dependency commons-io:commons-io:2.17.0
+dependency org.apache.pdfbox:pdfbox:2.0.30
+dependency org.apache.commons:commons-lang3:3.12.0
+dependency org.apache.commons:commons-text:1.10.0
+delete owasp-java-html-sanitizer-20211018.2.jar
+delete owasp-java-html-sanitizer-20211018.2.jar.CommunityCommons.RequiredLib
+delete guava-33.4.7-jre.jar
+delete guava-33.4.7-jre.jar.CommunityCommons.RequiredLib
+delete commons-io-2.17.0.jar
+delete commons-io-2.17.0.jar.CommunityCommons.RequiredLib
+delete pdfbox-2.0.30.jar
+delete pdfbox-2.0.30.jar.CommunityCommons.RequiredLib
+delete commons-text-1.10.0.jar
+delete commons-text-1.10.0.jar.CommunityCommons.RequiredLib
+delete commons-lang3-3.12.0.jar
+delete commons-lang3-3.12.0.jar.CommunityCommons.RequiredLib
+delete failureaccess-1.0.3.jar
+delete failureaccess-1.0.3.jar.CommunityCommons.RequiredLib
+delete listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+delete listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.CommunityCommons.RequiredLib
+delete jspecify-1.0.0.jar
+delete jspecify-1.0.0.jar.CommunityCommons.RequiredLib
+delete error_prone_annotations-2.36.0.jar
+delete error_prone_annotations-2.36.0.jar.CommunityCommons.RequiredLib
+delete j2objc-annotations-3.0.0.jar
+delete j2objc-annotations-3.0.0.jar.CommunityCommons.RequiredLib
+delete fontbox-2.0.30.jar
+delete fontbox-2.0.30.jar.CommunityCommons.RequiredLib
+delete commons-logging-1.2.jar
+delete commons-logging-1.2.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/Encryption.migration b/module/userlib/Encryption.migration
similarity index 100%
rename from test/userlib/Encryption.migration
rename to module/userlib/Encryption.migration
diff --git a/test/userlib/PushNotifications.migration b/module/userlib/PushNotifications.migration
similarity index 100%
rename from test/userlib/PushNotifications.migration
rename to module/userlib/PushNotifications.migration
diff --git a/test/userlib/animal-sniffer-annotations-1.17.jar b/module/userlib/animal-sniffer-annotations-1.17.jar
similarity index 100%
rename from test/userlib/animal-sniffer-annotations-1.17.jar
rename to module/userlib/animal-sniffer-annotations-1.17.jar
diff --git a/test/userlib/auto-value-annotations-1.9.jar.PushNotifications.RequiredLib b/module/userlib/animal-sniffer-annotations-1.17.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/auto-value-annotations-1.9.jar.PushNotifications.RequiredLib
rename to module/userlib/animal-sniffer-annotations-1.17.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/bcpg-jdk18on-1.78.1.jar b/module/userlib/bcpg-jdk18on-1.78.1.jar
similarity index 100%
rename from test/userlib/bcpg-jdk18on-1.78.1.jar
rename to module/userlib/bcpg-jdk18on-1.78.1.jar
diff --git a/test/userlib/bcpg-jdk18on-1.78.1.jar.Encryption.RequiredLib b/module/userlib/bcpg-jdk18on-1.78.1.jar.Encryption.RequiredLib
similarity index 100%
rename from test/userlib/bcpg-jdk18on-1.78.1.jar.Encryption.RequiredLib
rename to module/userlib/bcpg-jdk18on-1.78.1.jar.Encryption.RequiredLib
diff --git a/test/userlib/bcpkix-jdk18on-1.78.1.jar b/module/userlib/bcpkix-jdk18on-1.78.1.jar
similarity index 100%
rename from test/userlib/bcpkix-jdk18on-1.78.1.jar
rename to module/userlib/bcpkix-jdk18on-1.78.1.jar
diff --git a/test/userlib/bcpkix-jdk18on-1.78.1.jar.Encryption.RequiredLib b/module/userlib/bcpkix-jdk18on-1.78.1.jar.Encryption.RequiredLib
similarity index 100%
rename from test/userlib/bcpkix-jdk18on-1.78.1.jar.Encryption.RequiredLib
rename to module/userlib/bcpkix-jdk18on-1.78.1.jar.Encryption.RequiredLib
diff --git a/test/userlib/bcprov-jdk18on-1.78.1.jar b/module/userlib/bcprov-jdk18on-1.78.1.jar
similarity index 100%
rename from test/userlib/bcprov-jdk18on-1.78.1.jar
rename to module/userlib/bcprov-jdk18on-1.78.1.jar
diff --git a/test/userlib/bcprov-jdk18on-1.78.1.jar.Encryption.RequiredLib b/module/userlib/bcprov-jdk18on-1.78.1.jar.Encryption.RequiredLib
similarity index 100%
rename from test/userlib/bcprov-jdk18on-1.78.1.jar.Encryption.RequiredLib
rename to module/userlib/bcprov-jdk18on-1.78.1.jar.Encryption.RequiredLib
diff --git a/test/userlib/bcutil-jdk18on-1.78.1.jar b/module/userlib/bcutil-jdk18on-1.78.1.jar
similarity index 100%
rename from test/userlib/bcutil-jdk18on-1.78.1.jar
rename to module/userlib/bcutil-jdk18on-1.78.1.jar
diff --git a/test/userlib/bcutil-jdk18on-1.78.1.jar.Encryption.RequiredLib b/module/userlib/bcutil-jdk18on-1.78.1.jar.Encryption.RequiredLib
similarity index 100%
rename from test/userlib/bcutil-jdk18on-1.78.1.jar.Encryption.RequiredLib
rename to module/userlib/bcutil-jdk18on-1.78.1.jar.Encryption.RequiredLib
diff --git a/test/userlib/commons-io-2.11.0.jar b/module/userlib/commons-io-2.11.0.jar
similarity index 100%
rename from test/userlib/commons-io-2.11.0.jar
rename to module/userlib/commons-io-2.11.0.jar
diff --git a/test/userlib/commons-io-2.11.0.jar.Encryption.RequiredLib b/module/userlib/commons-io-2.11.0.jar.Encryption.RequiredLib
similarity index 100%
rename from test/userlib/commons-io-2.11.0.jar.Encryption.RequiredLib
rename to module/userlib/commons-io-2.11.0.jar.Encryption.RequiredLib
diff --git a/module/userlib/commons-io-2.17.0.jar b/module/userlib/commons-io-2.17.0.jar
new file mode 100644
index 00000000..ad00ddc4
Binary files /dev/null and b/module/userlib/commons-io-2.17.0.jar differ
diff --git a/test/userlib/checker-qual-3.33.0.jar.CommunityCommons.RequiredLib b/module/userlib/commons-io-2.17.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/checker-qual-3.33.0.jar.CommunityCommons.RequiredLib
rename to module/userlib/commons-io-2.17.0.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/commons-lang3-3.12.0.jar b/module/userlib/commons-lang3-3.12.0.jar
similarity index 100%
rename from test/userlib/commons-lang3-3.12.0.jar
rename to module/userlib/commons-lang3-3.12.0.jar
diff --git a/test/userlib/commons-lang3-3.12.0.jar.CommunityCommons.RequiredLib b/module/userlib/commons-lang3-3.12.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-lang3-3.12.0.jar.CommunityCommons.RequiredLib
rename to module/userlib/commons-lang3-3.12.0.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/commons-logging-1.2.jar b/module/userlib/commons-logging-1.2.jar
similarity index 100%
rename from test/userlib/commons-logging-1.2.jar
rename to module/userlib/commons-logging-1.2.jar
diff --git a/test/userlib/commons-logging-1.2.jar.CommunityCommons.RequiredLib b/module/userlib/commons-logging-1.2.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-logging-1.2.jar.CommunityCommons.RequiredLib
rename to module/userlib/commons-logging-1.2.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/commons-text-1.10.0.jar b/module/userlib/commons-text-1.10.0.jar
similarity index 100%
rename from test/userlib/commons-text-1.10.0.jar
rename to module/userlib/commons-text-1.10.0.jar
diff --git a/test/userlib/commons-text-1.10.0.jar.CommunityCommons.RequiredLib b/module/userlib/commons-text-1.10.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-text-1.10.0.jar.CommunityCommons.RequiredLib
rename to module/userlib/commons-text-1.10.0.jar.CommunityCommons.RequiredLib
diff --git a/module/userlib/error_prone_annotations-2.36.0.jar b/module/userlib/error_prone_annotations-2.36.0.jar
new file mode 100644
index 00000000..740268b5
Binary files /dev/null and b/module/userlib/error_prone_annotations-2.36.0.jar differ
diff --git a/test/userlib/checker-qual-3.33.0.jar.PushNotifications.RequiredLib b/module/userlib/error_prone_annotations-2.36.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/checker-qual-3.33.0.jar.PushNotifications.RequiredLib
rename to module/userlib/error_prone_annotations-2.36.0.jar.CommunityCommons.RequiredLib
diff --git a/module/userlib/failureaccess-1.0.3.jar b/module/userlib/failureaccess-1.0.3.jar
new file mode 100644
index 00000000..2834ba17
Binary files /dev/null and b/module/userlib/failureaccess-1.0.3.jar differ
diff --git a/test/userlib/commons-codec-1.15.jar.PushNotifications.RequiredLib b/module/userlib/failureaccess-1.0.3.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-codec-1.15.jar.PushNotifications.RequiredLib
rename to module/userlib/failureaccess-1.0.3.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/fontbox-2.0.24.jar b/module/userlib/fontbox-2.0.30.jar
similarity index 87%
rename from test/userlib/fontbox-2.0.24.jar
rename to module/userlib/fontbox-2.0.30.jar
index e93794c1..b49c9117 100644
Binary files a/test/userlib/fontbox-2.0.24.jar and b/module/userlib/fontbox-2.0.30.jar differ
diff --git a/test/userlib/commons-io-2.11.0.jar.CommunityCommons.RequiredLib b/module/userlib/fontbox-2.0.30.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-io-2.11.0.jar.CommunityCommons.RequiredLib
rename to module/userlib/fontbox-2.0.30.jar.CommunityCommons.RequiredLib
diff --git a/module/userlib/guava-33.4.7-jre.jar b/module/userlib/guava-33.4.7-jre.jar
new file mode 100644
index 00000000..809bd1c3
Binary files /dev/null and b/module/userlib/guava-33.4.7-jre.jar differ
diff --git a/test/userlib/commons-logging-1.2.jar.PushNotifications.RequiredLib b/module/userlib/guava-33.4.7-jre.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/commons-logging-1.2.jar.PushNotifications.RequiredLib
rename to module/userlib/guava-33.4.7-jre.jar.CommunityCommons.RequiredLib
diff --git a/module/userlib/j2objc-annotations-3.0.0.jar b/module/userlib/j2objc-annotations-3.0.0.jar
new file mode 100644
index 00000000..c293336f
Binary files /dev/null and b/module/userlib/j2objc-annotations-3.0.0.jar differ
diff --git a/test/userlib/error_prone_annotations-2.18.0.jar.CommunityCommons.RequiredLib b/module/userlib/j2objc-annotations-3.0.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/error_prone_annotations-2.18.0.jar.CommunityCommons.RequiredLib
rename to module/userlib/j2objc-annotations-3.0.0.jar.CommunityCommons.RequiredLib
diff --git a/module/userlib/jspecify-1.0.0.jar b/module/userlib/jspecify-1.0.0.jar
new file mode 100644
index 00000000..466b8757
Binary files /dev/null and b/module/userlib/jspecify-1.0.0.jar differ
diff --git a/test/userlib/error_prone_annotations-2.18.0.jar.PushNotifications.RequiredLib b/module/userlib/jspecify-1.0.0.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/error_prone_annotations-2.18.0.jar.PushNotifications.RequiredLib
rename to module/userlib/jspecify-1.0.0.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/module/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
similarity index 100%
rename from test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
rename to module/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
diff --git a/test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.CommunityCommons.RequiredLib b/module/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.CommunityCommons.RequiredLib
rename to module/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/owasp-java-html-sanitizer-20211018.2.jar b/module/userlib/owasp-java-html-sanitizer-20211018.2.jar
similarity index 100%
rename from test/userlib/owasp-java-html-sanitizer-20211018.2.jar
rename to module/userlib/owasp-java-html-sanitizer-20211018.2.jar
diff --git a/test/userlib/owasp-java-html-sanitizer-20211018.2.jar.CommunityCommons.RequiredLib b/module/userlib/owasp-java-html-sanitizer-20211018.2.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/owasp-java-html-sanitizer-20211018.2.jar.CommunityCommons.RequiredLib
rename to module/userlib/owasp-java-html-sanitizer-20211018.2.jar.CommunityCommons.RequiredLib
diff --git a/test/userlib/pdfbox-2.0.24.jar b/module/userlib/pdfbox-2.0.30.jar
similarity index 62%
rename from test/userlib/pdfbox-2.0.24.jar
rename to module/userlib/pdfbox-2.0.30.jar
index c6515b84..93299422 100644
Binary files a/test/userlib/pdfbox-2.0.24.jar and b/module/userlib/pdfbox-2.0.30.jar differ
diff --git a/test/userlib/failureaccess-1.0.1.jar.CommunityCommons.RequiredLib b/module/userlib/pdfbox-2.0.30.jar.CommunityCommons.RequiredLib
similarity index 100%
rename from test/userlib/failureaccess-1.0.1.jar.CommunityCommons.RequiredLib
rename to module/userlib/pdfbox-2.0.30.jar.CommunityCommons.RequiredLib
diff --git a/test/widgets/Badge.mpk b/module/widgets/Badge.mpk
similarity index 100%
rename from test/widgets/Badge.mpk
rename to module/widgets/Badge.mpk
diff --git a/test/widgets/Charts.mpk b/module/widgets/Charts.mpk
similarity index 100%
rename from test/widgets/Charts.mpk
rename to module/widgets/Charts.mpk
diff --git a/test/widgets/ListViewControls.mpk b/module/widgets/ListViewControls.mpk
similarity index 100%
rename from test/widgets/ListViewControls.mpk
rename to module/widgets/ListViewControls.mpk
diff --git a/test/widgets/Maps.mpk b/module/widgets/Maps.mpk
similarity index 100%
rename from test/widgets/Maps.mpk
rename to module/widgets/Maps.mpk
diff --git a/test/widgets/ProgressBar.mpk b/module/widgets/ProgressBar.mpk
similarity index 100%
rename from test/widgets/ProgressBar.mpk
rename to module/widgets/ProgressBar.mpk
diff --git a/test/widgets/ProgressCircle.mpk b/module/widgets/ProgressCircle.mpk
similarity index 100%
rename from test/widgets/ProgressCircle.mpk
rename to module/widgets/ProgressCircle.mpk
diff --git a/test/widgets/Pusher.mpk b/module/widgets/Pusher.mpk
similarity index 100%
rename from test/widgets/Pusher.mpk
rename to module/widgets/Pusher.mpk
diff --git a/test/widgets/SprintrFeedbackWidget.mpk b/module/widgets/SprintrFeedbackWidget.mpk
similarity index 100%
rename from test/widgets/SprintrFeedbackWidget.mpk
rename to module/widgets/SprintrFeedbackWidget.mpk
diff --git a/test/widgets/StarRating.mpk b/module/widgets/StarRating.mpk
similarity index 100%
rename from test/widgets/StarRating.mpk
rename to module/widgets/StarRating.mpk
diff --git a/test/widgets/Switch.mpk b/module/widgets/Switch.mpk
similarity index 100%
rename from test/widgets/Switch.mpk
rename to module/widgets/Switch.mpk
diff --git a/test/widgets/com.mendix.widget.native.Accordion.mpk b/module/widgets/com.mendix.widget.native.Accordion.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Accordion.mpk
rename to module/widgets/com.mendix.widget.native.Accordion.mpk
diff --git a/test/widgets/com.mendix.widget.native.ActivityIndicator.mpk b/module/widgets/com.mendix.widget.native.ActivityIndicator.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ActivityIndicator.mpk
rename to module/widgets/com.mendix.widget.native.ActivityIndicator.mpk
diff --git a/test/widgets/com.mendix.widget.native.Animation.mpk b/module/widgets/com.mendix.widget.native.Animation.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Animation.mpk
rename to module/widgets/com.mendix.widget.native.Animation.mpk
diff --git a/test/widgets/com.mendix.widget.native.AppEvents.mpk b/module/widgets/com.mendix.widget.native.AppEvents.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.AppEvents.mpk
rename to module/widgets/com.mendix.widget.native.AppEvents.mpk
diff --git a/test/widgets/com.mendix.widget.native.BackgroundGradient.mpk b/module/widgets/com.mendix.widget.native.BackgroundGradient.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.BackgroundGradient.mpk
rename to module/widgets/com.mendix.widget.native.BackgroundGradient.mpk
diff --git a/test/widgets/com.mendix.widget.native.BackgroundImage.mpk b/module/widgets/com.mendix.widget.native.BackgroundImage.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.BackgroundImage.mpk
rename to module/widgets/com.mendix.widget.native.BackgroundImage.mpk
diff --git a/test/widgets/com.mendix.widget.native.Badge.mpk b/module/widgets/com.mendix.widget.native.Badge.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Badge.mpk
rename to module/widgets/com.mendix.widget.native.Badge.mpk
diff --git a/test/widgets/com.mendix.widget.native.BarChart.mpk b/module/widgets/com.mendix.widget.native.BarChart.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.BarChart.mpk
rename to module/widgets/com.mendix.widget.native.BarChart.mpk
diff --git a/test/widgets/com.mendix.widget.native.BarcodeScanner.mpk b/module/widgets/com.mendix.widget.native.BarcodeScanner.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.BarcodeScanner.mpk
rename to module/widgets/com.mendix.widget.native.BarcodeScanner.mpk
diff --git a/test/widgets/com.mendix.widget.native.BottomSheet.mpk b/module/widgets/com.mendix.widget.native.BottomSheet.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.BottomSheet.mpk
rename to module/widgets/com.mendix.widget.native.BottomSheet.mpk
diff --git a/test/widgets/com.mendix.widget.native.Carousel.mpk b/module/widgets/com.mendix.widget.native.Carousel.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Carousel.mpk
rename to module/widgets/com.mendix.widget.native.Carousel.mpk
diff --git a/test/widgets/com.mendix.widget.native.ColorPicker.mpk b/module/widgets/com.mendix.widget.native.ColorPicker.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ColorPicker.mpk
rename to module/widgets/com.mendix.widget.native.ColorPicker.mpk
diff --git a/test/widgets/com.mendix.widget.native.ColumnChart.mpk b/module/widgets/com.mendix.widget.native.ColumnChart.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ColumnChart.mpk
rename to module/widgets/com.mendix.widget.native.ColumnChart.mpk
diff --git a/test/widgets/com.mendix.widget.native.Feedback.mpk b/module/widgets/com.mendix.widget.native.Feedback.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Feedback.mpk
rename to module/widgets/com.mendix.widget.native.Feedback.mpk
diff --git a/test/widgets/com.mendix.widget.native.FloatingActionButton.mpk b/module/widgets/com.mendix.widget.native.FloatingActionButton.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.FloatingActionButton.mpk
rename to module/widgets/com.mendix.widget.native.FloatingActionButton.mpk
diff --git a/test/widgets/com.mendix.widget.native.Gallery.mpk b/module/widgets/com.mendix.widget.native.Gallery.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Gallery.mpk
rename to module/widgets/com.mendix.widget.native.Gallery.mpk
diff --git a/test/widgets/com.mendix.widget.native.GalleryTextFilter.mpk b/module/widgets/com.mendix.widget.native.GalleryTextFilter.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.GalleryTextFilter.mpk
rename to module/widgets/com.mendix.widget.native.GalleryTextFilter.mpk
diff --git a/test/widgets/com.mendix.widget.native.Image.mpk b/module/widgets/com.mendix.widget.native.Image.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Image.mpk
rename to module/widgets/com.mendix.widget.native.Image.mpk
diff --git a/test/widgets/com.mendix.widget.native.IntroScreen.mpk b/module/widgets/com.mendix.widget.native.IntroScreen.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.IntroScreen.mpk
rename to module/widgets/com.mendix.widget.native.IntroScreen.mpk
diff --git a/test/widgets/com.mendix.widget.native.LineChart.mpk b/module/widgets/com.mendix.widget.native.LineChart.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.LineChart.mpk
rename to module/widgets/com.mendix.widget.native.LineChart.mpk
diff --git a/test/widgets/com.mendix.widget.native.ListViewSwipe.mpk b/module/widgets/com.mendix.widget.native.ListViewSwipe.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ListViewSwipe.mpk
rename to module/widgets/com.mendix.widget.native.ListViewSwipe.mpk
diff --git a/test/widgets/com.mendix.widget.native.Maps.mpk b/module/widgets/com.mendix.widget.native.Maps.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Maps.mpk
rename to module/widgets/com.mendix.widget.native.Maps.mpk
diff --git a/test/widgets/com.mendix.widget.native.Notifications.mpk b/module/widgets/com.mendix.widget.native.Notifications.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Notifications.mpk
rename to module/widgets/com.mendix.widget.native.Notifications.mpk
diff --git a/test/widgets/com.mendix.widget.native.PieDoughnutChart.mpk b/module/widgets/com.mendix.widget.native.PieDoughnutChart.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.PieDoughnutChart.mpk
rename to module/widgets/com.mendix.widget.native.PieDoughnutChart.mpk
diff --git a/test/widgets/com.mendix.widget.native.PopupMenu.mpk b/module/widgets/com.mendix.widget.native.PopupMenu.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.PopupMenu.mpk
rename to module/widgets/com.mendix.widget.native.PopupMenu.mpk
diff --git a/test/widgets/com.mendix.widget.native.ProgressBar.mpk b/module/widgets/com.mendix.widget.native.ProgressBar.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ProgressBar.mpk
rename to module/widgets/com.mendix.widget.native.ProgressBar.mpk
diff --git a/test/widgets/com.mendix.widget.native.ProgressCircle.mpk b/module/widgets/com.mendix.widget.native.ProgressCircle.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ProgressCircle.mpk
rename to module/widgets/com.mendix.widget.native.ProgressCircle.mpk
diff --git a/test/widgets/com.mendix.widget.native.QRCode.mpk b/module/widgets/com.mendix.widget.native.QRCode.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.QRCode.mpk
rename to module/widgets/com.mendix.widget.native.QRCode.mpk
diff --git a/test/widgets/com.mendix.widget.native.RadioButtons.mpk b/module/widgets/com.mendix.widget.native.RadioButtons.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.RadioButtons.mpk
rename to module/widgets/com.mendix.widget.native.RadioButtons.mpk
diff --git a/test/widgets/com.mendix.widget.native.RangeSlider.mpk b/module/widgets/com.mendix.widget.native.RangeSlider.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.RangeSlider.mpk
rename to module/widgets/com.mendix.widget.native.RangeSlider.mpk
diff --git a/test/widgets/com.mendix.widget.native.Rating.mpk b/module/widgets/com.mendix.widget.native.Rating.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Rating.mpk
rename to module/widgets/com.mendix.widget.native.Rating.mpk
diff --git a/test/widgets/com.mendix.widget.native.Repeater.mpk b/module/widgets/com.mendix.widget.native.Repeater.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Repeater.mpk
rename to module/widgets/com.mendix.widget.native.Repeater.mpk
diff --git a/test/widgets/com.mendix.widget.native.SafeAreaView.mpk b/module/widgets/com.mendix.widget.native.SafeAreaView.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.SafeAreaView.mpk
rename to module/widgets/com.mendix.widget.native.SafeAreaView.mpk
diff --git a/test/widgets/com.mendix.widget.native.Signature.mpk b/module/widgets/com.mendix.widget.native.Signature.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Signature.mpk
rename to module/widgets/com.mendix.widget.native.Signature.mpk
diff --git a/test/widgets/com.mendix.widget.native.Slider.mpk b/module/widgets/com.mendix.widget.native.Slider.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Slider.mpk
rename to module/widgets/com.mendix.widget.native.Slider.mpk
diff --git a/test/widgets/com.mendix.widget.native.Switch.mpk b/module/widgets/com.mendix.widget.native.Switch.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.Switch.mpk
rename to module/widgets/com.mendix.widget.native.Switch.mpk
diff --git a/test/widgets/com.mendix.widget.native.ToggleButtons.mpk b/module/widgets/com.mendix.widget.native.ToggleButtons.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.ToggleButtons.mpk
rename to module/widgets/com.mendix.widget.native.ToggleButtons.mpk
diff --git a/test/widgets/com.mendix.widget.native.VideoPlayer.mpk b/module/widgets/com.mendix.widget.native.VideoPlayer.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.VideoPlayer.mpk
rename to module/widgets/com.mendix.widget.native.VideoPlayer.mpk
diff --git a/test/widgets/com.mendix.widget.native.WebView.mpk b/module/widgets/com.mendix.widget.native.WebView.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.native.WebView.mpk
rename to module/widgets/com.mendix.widget.native.WebView.mpk
diff --git a/test/widgets/com.mendix.widget.web.Combobox.mpk b/module/widgets/com.mendix.widget.web.Combobox.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.Combobox.mpk
rename to module/widgets/com.mendix.widget.web.Combobox.mpk
diff --git a/test/widgets/com.mendix.widget.web.Datagrid.mpk b/module/widgets/com.mendix.widget.web.Datagrid.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.Datagrid.mpk
rename to module/widgets/com.mendix.widget.web.Datagrid.mpk
diff --git a/test/widgets/com.mendix.widget.web.DatagridDateFilter.mpk b/module/widgets/com.mendix.widget.web.DatagridDateFilter.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.DatagridDateFilter.mpk
rename to module/widgets/com.mendix.widget.web.DatagridDateFilter.mpk
diff --git a/test/widgets/com.mendix.widget.web.DatagridDropdownFilter.mpk b/module/widgets/com.mendix.widget.web.DatagridDropdownFilter.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.DatagridDropdownFilter.mpk
rename to module/widgets/com.mendix.widget.web.DatagridDropdownFilter.mpk
diff --git a/test/widgets/com.mendix.widget.web.DatagridNumberFilter.mpk b/module/widgets/com.mendix.widget.web.DatagridNumberFilter.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.DatagridNumberFilter.mpk
rename to module/widgets/com.mendix.widget.web.DatagridNumberFilter.mpk
diff --git a/test/widgets/com.mendix.widget.web.DatagridTextFilter.mpk b/module/widgets/com.mendix.widget.web.DatagridTextFilter.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.DatagridTextFilter.mpk
rename to module/widgets/com.mendix.widget.web.DatagridTextFilter.mpk
diff --git a/test/widgets/com.mendix.widget.web.DropdownSort.mpk b/module/widgets/com.mendix.widget.web.DropdownSort.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.DropdownSort.mpk
rename to module/widgets/com.mendix.widget.web.DropdownSort.mpk
diff --git a/test/widgets/com.mendix.widget.web.Gallery.mpk b/module/widgets/com.mendix.widget.web.Gallery.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.Gallery.mpk
rename to module/widgets/com.mendix.widget.web.Gallery.mpk
diff --git a/test/widgets/com.mendix.widget.web.Image.mpk b/module/widgets/com.mendix.widget.web.Image.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.Image.mpk
rename to module/widgets/com.mendix.widget.web.Image.mpk
diff --git a/test/widgets/com.mendix.widget.web.LanguageSelector.mpk b/module/widgets/com.mendix.widget.web.LanguageSelector.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.LanguageSelector.mpk
rename to module/widgets/com.mendix.widget.web.LanguageSelector.mpk
diff --git a/test/widgets/com.mendix.widget.web.PopupMenu.mpk b/module/widgets/com.mendix.widget.web.PopupMenu.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.PopupMenu.mpk
rename to module/widgets/com.mendix.widget.web.PopupMenu.mpk
diff --git a/test/widgets/com.mendix.widget.web.SelectionHelper.mpk b/module/widgets/com.mendix.widget.web.SelectionHelper.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.SelectionHelper.mpk
rename to module/widgets/com.mendix.widget.web.SelectionHelper.mpk
diff --git a/test/widgets/com.mendix.widget.web.Timeline.mpk b/module/widgets/com.mendix.widget.web.Timeline.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.Timeline.mpk
rename to module/widgets/com.mendix.widget.web.Timeline.mpk
diff --git a/test/widgets/com.mendix.widget.web.TreeNode.mpk b/module/widgets/com.mendix.widget.web.TreeNode.mpk
similarity index 100%
rename from test/widgets/com.mendix.widget.web.TreeNode.mpk
rename to module/widgets/com.mendix.widget.web.TreeNode.mpk
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..b01f47c4
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        maven {
+            url = uri("https://maven.pkg.github.com/mendix/MxPushNotifications")
+            credentials {
+                username System.getenv("GITHUB_ACTOR") ?: "$gprusername"
+                password System.getenv("GITHUB_TOKEN") ?: "$gprpassword"
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = 'PushNotifications'
+
+include('module')
\ No newline at end of file
diff --git a/test/userlib/auto-value-annotations-1.9.jar b/test/userlib/auto-value-annotations-1.9.jar
deleted file mode 100644
index ebc185b0..00000000
Binary files a/test/userlib/auto-value-annotations-1.9.jar and /dev/null differ
diff --git a/test/userlib/checker-qual-3.33.0.jar b/test/userlib/checker-qual-3.33.0.jar
deleted file mode 100644
index 61761fdc..00000000
Binary files a/test/userlib/checker-qual-3.33.0.jar and /dev/null differ
diff --git a/test/userlib/commons-codec-1.15.jar b/test/userlib/commons-codec-1.15.jar
deleted file mode 100644
index f14985ac..00000000
Binary files a/test/userlib/commons-codec-1.15.jar and /dev/null differ
diff --git a/test/userlib/error_prone_annotations-2.18.0.jar b/test/userlib/error_prone_annotations-2.18.0.jar
deleted file mode 100644
index e072fe02..00000000
Binary files a/test/userlib/error_prone_annotations-2.18.0.jar and /dev/null differ
diff --git a/test/userlib/failureaccess-1.0.1.jar b/test/userlib/failureaccess-1.0.1.jar
deleted file mode 100644
index 9b56dc75..00000000
Binary files a/test/userlib/failureaccess-1.0.1.jar and /dev/null differ
diff --git a/test/userlib/failureaccess-1.0.1.jar.PushNotifications.RequiredLib b/test/userlib/failureaccess-1.0.1.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/fast-uuid-0.1.jar b/test/userlib/fast-uuid-0.1.jar
deleted file mode 100644
index 4051bdc6..00000000
Binary files a/test/userlib/fast-uuid-0.1.jar and /dev/null differ
diff --git a/test/userlib/fast-uuid-0.1.jar.PushNotifications.RequiredLib b/test/userlib/fast-uuid-0.1.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/fontbox-2.0.24.jar.CommunityCommons.RequiredLib b/test/userlib/fontbox-2.0.24.jar.CommunityCommons.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/google-auth-library-credentials-1.7.0.jar b/test/userlib/google-auth-library-credentials-1.7.0.jar
deleted file mode 100644
index 1528a5b9..00000000
Binary files a/test/userlib/google-auth-library-credentials-1.7.0.jar and /dev/null differ
diff --git a/test/userlib/google-auth-library-credentials-1.7.0.jar.PushNotifications.RequiredLib b/test/userlib/google-auth-library-credentials-1.7.0.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/google-auth-library-oauth2-http-1.7.0.jar b/test/userlib/google-auth-library-oauth2-http-1.7.0.jar
deleted file mode 100644
index 196b516d..00000000
Binary files a/test/userlib/google-auth-library-oauth2-http-1.7.0.jar and /dev/null differ
diff --git a/test/userlib/google-auth-library-oauth2-http-1.7.0.jar.PushNotifications.RequiredLib b/test/userlib/google-auth-library-oauth2-http-1.7.0.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/google-http-client-1.41.8.jar b/test/userlib/google-http-client-1.41.8.jar
deleted file mode 100644
index 1913bbab..00000000
Binary files a/test/userlib/google-http-client-1.41.8.jar and /dev/null differ
diff --git a/test/userlib/google-http-client-1.41.8.jar.PushNotifications.RequiredLib b/test/userlib/google-http-client-1.41.8.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/google-http-client-gson-1.41.8.jar b/test/userlib/google-http-client-gson-1.41.8.jar
deleted file mode 100644
index aa93de56..00000000
Binary files a/test/userlib/google-http-client-gson-1.41.8.jar and /dev/null differ
diff --git a/test/userlib/google-http-client-gson-1.41.8.jar.PushNotifications.RequiredLib b/test/userlib/google-http-client-gson-1.41.8.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/grpc-context-1.27.2.jar b/test/userlib/grpc-context-1.27.2.jar
deleted file mode 100644
index fd8615e7..00000000
Binary files a/test/userlib/grpc-context-1.27.2.jar and /dev/null differ
diff --git a/test/userlib/grpc-context-1.27.2.jar.PushNotifications.RequiredLib b/test/userlib/grpc-context-1.27.2.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/gson-2.9.0.jar b/test/userlib/gson-2.9.0.jar
deleted file mode 100644
index fb62e056..00000000
Binary files a/test/userlib/gson-2.9.0.jar and /dev/null differ
diff --git a/test/userlib/gson-2.9.0.jar.PushNotifications.RequiredLib b/test/userlib/gson-2.9.0.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/guava-32.0.1-android.jar b/test/userlib/guava-32.0.1-android.jar
deleted file mode 100644
index 16d95920..00000000
Binary files a/test/userlib/guava-32.0.1-android.jar and /dev/null differ
diff --git a/test/userlib/guava-32.0.1-android.jar.PushNotifications.RequiredLib b/test/userlib/guava-32.0.1-android.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/guava-32.0.1-jre.jar b/test/userlib/guava-32.0.1-jre.jar
deleted file mode 100644
index 5f3a1eee..00000000
Binary files a/test/userlib/guava-32.0.1-jre.jar and /dev/null differ
diff --git a/test/userlib/guava-32.0.1-jre.jar.CommunityCommons.RequiredLib b/test/userlib/guava-32.0.1-jre.jar.CommunityCommons.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/httpclient-4.5.13.jar b/test/userlib/httpclient-4.5.13.jar
deleted file mode 100644
index 218ee25f..00000000
Binary files a/test/userlib/httpclient-4.5.13.jar and /dev/null differ
diff --git a/test/userlib/httpclient-4.5.13.jar.PushNotifications.RequiredLib b/test/userlib/httpclient-4.5.13.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/httpcore-4.4.15.jar b/test/userlib/httpcore-4.4.15.jar
deleted file mode 100644
index dc4b9fc7..00000000
Binary files a/test/userlib/httpcore-4.4.15.jar and /dev/null differ
diff --git a/test/userlib/httpcore-4.4.15.jar.PushNotifications.RequiredLib b/test/userlib/httpcore-4.4.15.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/j2objc-annotations-2.8.jar b/test/userlib/j2objc-annotations-2.8.jar
deleted file mode 100644
index 3595c4f9..00000000
Binary files a/test/userlib/j2objc-annotations-2.8.jar and /dev/null differ
diff --git a/test/userlib/j2objc-annotations-2.8.jar.CommunityCommons.RequiredLib b/test/userlib/j2objc-annotations-2.8.jar.CommunityCommons.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/j2objc-annotations-2.8.jar.PushNotifications.RequiredLib b/test/userlib/j2objc-annotations-2.8.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/jsr305-3.0.2.jar b/test/userlib/jsr305-3.0.2.jar
deleted file mode 100644
index 59222d9c..00000000
Binary files a/test/userlib/jsr305-3.0.2.jar and /dev/null differ
diff --git a/test/userlib/jsr305-3.0.2.jar.CommunityCommons.RequiredLib b/test/userlib/jsr305-3.0.2.jar.CommunityCommons.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/jsr305-3.0.2.jar.PushNotifications.RequiredLib b/test/userlib/jsr305-3.0.2.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.PushNotifications.RequiredLib b/test/userlib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-buffer-4.2.0.Final.jar b/test/userlib/netty-buffer-4.2.0.Final.jar
deleted file mode 100644
index 5dc2dcb4..00000000
Binary files a/test/userlib/netty-buffer-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-buffer-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-buffer-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-4.2.0.Final.jar b/test/userlib/netty-codec-4.2.0.Final.jar
deleted file mode 100644
index 6d03cd6e..00000000
Binary files a/test/userlib/netty-codec-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-base-4.2.0.Final.jar b/test/userlib/netty-codec-base-4.2.0.Final.jar
deleted file mode 100644
index 0fc22583..00000000
Binary files a/test/userlib/netty-codec-base-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-base-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-base-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-compression-4.2.0.Final.jar b/test/userlib/netty-codec-compression-4.2.0.Final.jar
deleted file mode 100644
index 06b18fef..00000000
Binary files a/test/userlib/netty-codec-compression-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-compression-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-compression-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-dns-4.2.0.Final.jar b/test/userlib/netty-codec-dns-4.2.0.Final.jar
deleted file mode 100644
index 292bd6f8..00000000
Binary files a/test/userlib/netty-codec-dns-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-dns-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-dns-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-http-4.2.0.Final.jar b/test/userlib/netty-codec-http-4.2.0.Final.jar
deleted file mode 100644
index 772eadc6..00000000
Binary files a/test/userlib/netty-codec-http-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-http-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-http2-4.2.0.Final.jar b/test/userlib/netty-codec-http2-4.2.0.Final.jar
deleted file mode 100644
index 89944a3e..00000000
Binary files a/test/userlib/netty-codec-http2-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-http2-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-http2-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-marshalling-4.2.0.Final.jar b/test/userlib/netty-codec-marshalling-4.2.0.Final.jar
deleted file mode 100644
index f63b9455..00000000
Binary files a/test/userlib/netty-codec-marshalling-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-marshalling-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-marshalling-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-protobuf-4.2.0.Final.jar b/test/userlib/netty-codec-protobuf-4.2.0.Final.jar
deleted file mode 100644
index a8309eb3..00000000
Binary files a/test/userlib/netty-codec-protobuf-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-protobuf-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-protobuf-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-codec-socks-4.2.0.Final.jar b/test/userlib/netty-codec-socks-4.2.0.Final.jar
deleted file mode 100644
index a8b182c8..00000000
Binary files a/test/userlib/netty-codec-socks-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-codec-socks-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-codec-socks-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-common-4.2.0.Final.jar b/test/userlib/netty-common-4.2.0.Final.jar
deleted file mode 100644
index cf5e7b3a..00000000
Binary files a/test/userlib/netty-common-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-common-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-common-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-handler-4.2.0.Final.jar b/test/userlib/netty-handler-4.2.0.Final.jar
deleted file mode 100644
index 5828e698..00000000
Binary files a/test/userlib/netty-handler-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-handler-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-handler-proxy-4.2.0.Final.jar b/test/userlib/netty-handler-proxy-4.2.0.Final.jar
deleted file mode 100644
index 86397620..00000000
Binary files a/test/userlib/netty-handler-proxy-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-handler-proxy-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-handler-proxy-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-resolver-4.2.0.Final.jar b/test/userlib/netty-resolver-4.2.0.Final.jar
deleted file mode 100644
index 1b6afcf4..00000000
Binary files a/test/userlib/netty-resolver-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-resolver-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-resolver-dns-4.2.0.Final.jar b/test/userlib/netty-resolver-dns-4.2.0.Final.jar
deleted file mode 100644
index 58d290a2..00000000
Binary files a/test/userlib/netty-resolver-dns-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-resolver-dns-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-resolver-dns-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-transport-4.2.0.Final.jar b/test/userlib/netty-transport-4.2.0.Final.jar
deleted file mode 100644
index a7ff016c..00000000
Binary files a/test/userlib/netty-transport-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-transport-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/netty-transport-native-unix-common-4.2.0.Final.jar b/test/userlib/netty-transport-native-unix-common-4.2.0.Final.jar
deleted file mode 100644
index 9b781d5d..00000000
Binary files a/test/userlib/netty-transport-native-unix-common-4.2.0.Final.jar and /dev/null differ
diff --git a/test/userlib/netty-transport-native-unix-common-4.2.0.Final.jar.PushNotifications.RequiredLib b/test/userlib/netty-transport-native-unix-common-4.2.0.Final.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/opencensus-api-0.31.0.jar b/test/userlib/opencensus-api-0.31.0.jar
deleted file mode 100644
index 1578191d..00000000
Binary files a/test/userlib/opencensus-api-0.31.0.jar and /dev/null differ
diff --git a/test/userlib/opencensus-api-0.31.0.jar.PushNotifications.RequiredLib b/test/userlib/opencensus-api-0.31.0.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/opencensus-contrib-http-util-0.31.0.jar b/test/userlib/opencensus-contrib-http-util-0.31.0.jar
deleted file mode 100644
index e6689165..00000000
Binary files a/test/userlib/opencensus-contrib-http-util-0.31.0.jar and /dev/null differ
diff --git a/test/userlib/opencensus-contrib-http-util-0.31.0.jar.PushNotifications.RequiredLib b/test/userlib/opencensus-contrib-http-util-0.31.0.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/pdfbox-2.0.24.jar.CommunityCommons.RequiredLib b/test/userlib/pdfbox-2.0.24.jar.CommunityCommons.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/pushy-0.13.10.jar b/test/userlib/pushy-0.13.10.jar
deleted file mode 100644
index 0babcf38..00000000
Binary files a/test/userlib/pushy-0.13.10.jar and /dev/null differ
diff --git a/test/userlib/pushy-0.13.10.jar.PushNotifications.RequiredLib b/test/userlib/pushy-0.13.10.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/userlib/slf4j-api-2.0.7.jar b/test/userlib/slf4j-api-2.0.7.jar
deleted file mode 100644
index be5447c4..00000000
Binary files a/test/userlib/slf4j-api-2.0.7.jar and /dev/null differ
diff --git a/test/userlib/slf4j-api-2.0.7.jar.PushNotifications.RequiredLib b/test/userlib/slf4j-api-2.0.7.jar.PushNotifications.RequiredLib
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/widgets/MxPushNotifications.mpk b/test/widgets/MxPushNotifications.mpk
deleted file mode 100755
index 9f06b688..00000000
Binary files a/test/widgets/MxPushNotifications.mpk and /dev/null differ
diff --git a/.csslintrc b/widget/.csslintrc
similarity index 100%
rename from .csslintrc
rename to widget/.csslintrc
diff --git a/.jshintrc b/widget/.jshintrc
similarity index 87%
rename from .jshintrc
rename to widget/.jshintrc
index f73b569f..b3bd7302 100644
--- a/.jshintrc
+++ b/widget/.jshintrc
@@ -1,5 +1,5 @@
 {
-    // Enforcing
+    "esversion": 6,
     "curly"    : false,
     "forin"    : false,
     "latedef"  : "nofunc",
@@ -12,11 +12,7 @@
         "mx"     : false,
         "logger" : false
     },
-
-    // Relaxing
     "laxbreak" : true,
-
-    // Environments
     "browser"  : true,
     "devel"    : true,
     "dojo"     : true
diff --git a/widget/.nvmrc b/widget/.nvmrc
new file mode 100644
index 00000000..6b351945
--- /dev/null
+++ b/widget/.nvmrc
@@ -0,0 +1 @@
+lts/boron
diff --git a/Gulpfile.js b/widget/Gulpfile.js
similarity index 89%
rename from Gulpfile.js
rename to widget/Gulpfile.js
index 1cbd9f8b..ebac77dc 100644
--- a/Gulpfile.js
+++ b/widget/Gulpfile.js
@@ -3,13 +3,13 @@
 "use strict";
 
 // In case you seem to have trouble starting Mendix through `gulp modeler`, you might have to set the path to the Mendix application, otherwise leave both values as they are
-var MODELER_PATH = null;
-var MODELER_ARGS = "/file:{path}";
+const MODELER_PATH = null;
+const MODELER_ARGS = "/file:{path}";
 
 /********************************************************************************
  * Do not edit anything below, unless you know what you are doing
  ********************************************************************************/
-var gulp = require("gulp"),
+const gulp = require("gulp"),
     zip = require("gulp-zip"),
     del = require("del"),
     newer = require("gulp-newer"),
@@ -22,14 +22,14 @@ var gulp = require("gulp"),
     widgetBuilderHelper = require("widgetbuilder-gulp-helper"),
     jsValidate = require("gulp-jsvalidate");
 
-var pkg = require("./package.json"),
+const pkg = require("./package.json"),
     paths = widgetBuilderHelper.generatePaths(pkg),
     xmlversion = widgetBuilderHelper.xmlversion;
 
-gulp.task("default", ['build'], function() {
+gulp.task("default", ["build"], function() {
     gulp.watch("./src/**/*", ["compress"]);
     gulp.watch("./src/**/*.js", ["copy:js"]);
-    gulp.watch("./src/**/*.html", ["copy:html"])
+    gulp.watch("./src/**/*.html", ["copy:html"]);
 });
 
 gulp.task("clean", function () {
@@ -49,7 +49,7 @@ gulp.task("compress", ["clean"], function () {
 gulp.task("copy:js", function () {
     return gulp.src(["./src/**/*.js"])
         .pipe(plumber(function (error) {
-            var msg = gutil.colors.red("Error");
+            let msg = gutil.colors.red("Error");
             if (error.fileName) {
                 msg += gutil.colors.red(" in ") + gutil.colors.cyan(error.fileName);
             }
@@ -84,7 +84,7 @@ gulp.task("version:json", function () {
 });
 
 gulp.task("icon", function (cb) {
-    var icon = (typeof argv.file !== "undefined") ? argv.file : "./icon.png";
+    const icon = (typeof argv.file !== "undefined") ? argv.file : "./icon.png";
     console.log("\nUsing this file to create a base64 string: " + gutil.colors.cyan(icon));
     gulp.src(icon)
         .pipe(intercept(function (file) {
@@ -94,7 +94,7 @@ gulp.task("icon", function (cb) {
 });
 
 gulp.task("folders", function () {
-    paths.showPaths(); return;
+    paths.showPaths();
 });
 
 gulp.task("modeler", function (cb) {
diff --git a/package-lock.json b/widget/package-lock.json
similarity index 57%
rename from package-lock.json
rename to widget/package-lock.json
index 6c479a51..c02653c8 100644
--- a/package-lock.json
+++ b/widget/package-lock.json
@@ -1,135 +1,208 @@
 {
   "name": "MxPushNotifications",
   "version": "7.4.2",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "ansi-gray": {
+  "packages": {
+    "": {
+      "name": "MxPushNotifications",
+      "version": "7.4.2",
+      "license": "Apache 2.0",
+      "devDependencies": {
+        "del": "^2.2.2",
+        "gulp": "^3.9.1",
+        "gulp-if": "^2.0.1",
+        "gulp-intercept": "^0.1.0",
+        "gulp-json-transform": "^0.4.2",
+        "gulp-jsvalidate": "^3.0.0",
+        "gulp-newer": "^1.3.0",
+        "gulp-plumber": "^1.1.0",
+        "gulp-util": "^3.0.7",
+        "gulp-zip": "^3.2.0",
+        "widgetbuilder-gulp-helper": "https://github.com/JelteMX/widgetbuilder-gulp-helper/archive/1.0.1.tar.gz",
+        "yargs": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=5"
+      }
+    },
+    "node_modules/ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
       "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "ansi-styles": {
+    "node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "ansi-wrap": {
+    "node_modules/ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "archy": {
+    "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
-    "arr-diff": {
+    "node_modules/arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arr-flatten": {
+    "node_modules/arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arr-union": {
+    "node_modules/arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-differ": {
+    "node_modules/array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
       "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-each": {
+    "node_modules/array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-slice": {
+    "node_modules/array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
       "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-union": {
+    "node_modules/array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "array-uniq": {
+    "node_modules/array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
       "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-unique": {
+    "node_modules/array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arrify": {
+    "node_modules/arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "asap": {
+    "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
       "dev": true
     },
-    "assign-symbols": {
+    "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "atob": {
+    "node_modules/atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
     },
-    "balanced-match": {
+    "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "base": {
+    "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -138,69 +211,87 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "beeper": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
       "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "brace-expansion": {
+    "node_modules/brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "braces": {
+    "node_modules/braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
         "extend-shallow": "^2.0.1",
@@ -212,36 +303,46 @@
         "split-string": "^3.0.2",
         "to-regex": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
       "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "buffer-crc32": {
+    "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "builtin-modules": {
+    "node_modules/builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "cache-base": {
+    "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -251,245 +352,295 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "camelcase": {
+    "node_modules/camelcase": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
       "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "chalk": {
+    "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "class-utils": {
+    "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cliui": {
+    "node_modules/cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
         "wrap-ansi": "^2.0.0"
       }
     },
-    "clone": {
+    "node_modules/clone": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
       "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
     },
-    "clone-stats": {
+    "node_modules/clone-stats": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
       "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
       "dev": true
     },
-    "code-point-at": {
+    "node_modules/code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "collection-visit": {
+    "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "color-support": {
+    "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
     },
-    "component-emitter": {
+    "node_modules/component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "concat-map": {
+    "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "concat-stream": {
+    "node_modules/concat-stream": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
       "dev": true,
-      "requires": {
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
-      },
+      }
+    },
+    "node_modules/concat-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
       "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "copy-descriptor": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "core-util-is": {
+    "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "dateformat": {
+    "node_modules/dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
       "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "debug": {
+    "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "decamelize": {
+    "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "decode-uri-component": {
+    "node_modules/decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "defaults": {
+    "node_modules/defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "clone": "^1.0.2"
       }
     },
-    "define-property": {
+    "node_modules/define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "del": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "globby": "^5.0.0",
         "is-path-cwd": "^1.0.0",
         "is-path-in-cwd": "^1.0.0",
@@ -497,135 +648,150 @@
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0",
         "rimraf": "^2.2.8"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "deprecated": {
+    "node_modules/deprecated": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
       "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.9"
+      }
     },
-    "detect-file": {
+    "node_modules/detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "duplexer": {
+    "node_modules/duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
-    "duplexer2": {
+    "node_modules/duplexer2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
       "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "readable-stream": "~1.1.9"
       }
     },
-    "duplexify": {
+    "node_modules/duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
       "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0",
         "stream-shift": "^1.0.0"
-      },
+      }
+    },
+    "node_modules/duplexify/node_modules/end-of-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/duplexify/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/duplexify/node_modules/readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
       "dependencies": {
-        "end-of-stream": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-          "dev": true,
-          "requires": {
-            "once": "^1.4.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "end-of-stream": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexify/node_modules/string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/end-of-stream": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
       "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "once": "~1.3.0"
-      },
+      }
+    },
+    "node_modules/end-of-stream/node_modules/once": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+      "dev": true,
       "dependencies": {
-        "once": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-          "dev": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        }
+        "wrappy": "1"
       }
     },
-    "error-ex": {
+    "node_modules/error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
-    "escape-string-regexp": {
+    "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "esprima": {
+    "node_modules/esprima": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
       "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "event-stream": {
+    "node_modules/event-stream": {
       "version": "3.0.20",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "integrity": "sha1-A4u7LqnqkDhbJvvBhU0LU58qvqM=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "duplexer": "~0.1.1",
         "from": "~0",
         "map-stream": "~0.0.3",
@@ -635,12 +801,12 @@
         "through": "~2.3.1"
       }
     },
-    "expand-brackets": {
+    "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
         "extend-shallow": "^2.0.1",
@@ -649,69 +815,83 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "expand-tilde": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extend": {
+    "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
-    "extend-shallow": {
+    "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extglob": {
+    "node_modules/extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
         "expand-brackets": "^2.1.4",
@@ -721,226 +901,285 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "fancy-log": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fancy-log": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
       "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-gray": "^0.1.1",
         "color-support": "^1.1.3",
         "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "fill-range": {
+    "node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1",
         "to-regex-range": "^2.1.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
       "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "find-index": {
+    "node_modules/find-index": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
       "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
       "dev": true
     },
-    "find-up": {
+    "node_modules/find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "path-exists": "^2.0.0",
         "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "findup-sync": {
+    "node_modules/findup-sync": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
       "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "detect-file": "^1.0.0",
         "is-glob": "^3.1.0",
         "micromatch": "^3.0.4",
         "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "fined": {
+    "node_modules/fined": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
       "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-tilde": "^2.0.2",
         "is-plain-object": "^2.0.3",
         "object.defaults": "^1.1.0",
         "object.pick": "^1.2.0",
         "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "first-chunk-stream": {
+    "node_modules/first-chunk-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
       "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "flagged-respawn": {
+    "node_modules/flagged-respawn": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
       "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "for-in": {
+    "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "for-own": {
+    "node_modules/for-own": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "fork-stream": {
+    "node_modules/fork-stream": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
       "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
       "dev": true
     },
-    "fragment-cache": {
+    "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "from": {
+    "node_modules/from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
       "dev": true
     },
-    "fs.realpath": {
+    "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "gaze": {
+    "node_modules/gaze": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
       "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "globule": "~0.1.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "get-caller-file": {
+    "node_modules/get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
       "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
       "dev": true
     },
-    "get-value": {
+    "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "glob": {
+    "node_modules/glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "^3.0.4",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "glob-stream": {
+    "node_modules/glob-stream": {
       "version": "3.1.18",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
       "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob": "^4.3.1",
         "glob2base": "^0.0.12",
         "minimatch": "^2.0.1",
@@ -948,178 +1187,221 @@
         "through2": "^0.6.1",
         "unique-stream": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+      "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^2.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-stream/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
       "dependencies": {
-        "glob": {
-          "version": "4.5.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^2.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
-    "glob-watcher": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/glob-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/glob-watcher": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
       "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "gaze": "^0.5.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
       }
     },
-    "glob2base": {
+    "node_modules/glob2base": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
       "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "find-index": "^0.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "global-modules": {
+    "node_modules/global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "global-prefix": "^1.0.1",
         "is-windows": "^1.0.1",
         "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "global-prefix": {
+    "node_modules/global-prefix": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-tilde": "^2.0.2",
         "homedir-polyfill": "^1.0.1",
         "ini": "^1.3.4",
         "is-windows": "^1.0.1",
         "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "globby": {
+    "node_modules/globby": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "array-union": "^1.0.1",
         "arrify": "^1.0.0",
         "glob": "^7.0.3",
         "object-assign": "^4.0.1",
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "globule": {
+    "node_modules/globule": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
       "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob": "~3.1.21",
         "lodash": "~1.0.1",
         "minimatch": "~0.2.11"
       },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/globule/node_modules/glob": {
+      "version": "3.1.21",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+      "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "~1.2.0",
+        "inherits": "1",
+        "minimatch": "~0.2.11"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/globule/node_modules/graceful-fs": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+      "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
+      "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/globule/node_modules/inherits": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+      "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+      "dev": true
+    },
+    "node_modules/globule/node_modules/minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
       "dependencies": {
-        "glob": {
-          "version": "3.1.21",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "~1.2.0",
-            "inherits": "1",
-            "minimatch": "~0.2.11"
-          }
-        },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-          "dev": true
-        },
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2",
-            "sigmund": "~1.0.0"
-          }
-        }
-      }
-    },
-    "glogg": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glogg": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
       "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "graceful-fs": {
+    "node_modules/graceful-fs": {
       "version": "3.0.12",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
       "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "natives": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "gulp": {
+    "node_modules/gulp": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
       "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "archy": "^1.0.0",
         "chalk": "^1.0.0",
         "deprecated": "^0.0.1",
@@ -1134,93 +1416,111 @@
         "v8flags": "^2.0.2",
         "vinyl-fs": "^0.3.0"
       },
-      "dependencies": {
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        }
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.9"
       }
     },
-    "gulp-if": {
+    "node_modules/gulp-if": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz",
       "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "gulp-match": "^1.0.3",
         "ternary-stream": "^2.0.1",
         "through2": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "gulp-intercept": {
+    "node_modules/gulp-intercept": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/gulp-intercept/-/gulp-intercept-0.1.0.tgz",
       "integrity": "sha1-neRcMAFmydnZ/cuO7/hg6XZ8Ft8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "event-stream": "~3.0.18"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "gulp-json-transform": {
+    "node_modules/gulp-json-transform": {
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/gulp-json-transform/-/gulp-json-transform-0.4.5.tgz",
       "integrity": "sha512-kaGUaAhgjxeLgIMNF3IPFFmYCF6AgvzBQwqmVowiIStNADZSoILtPNDisYA4mKfpwMTqSiWLogQt1q5U75+uwA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "gulp-util": "^3.0.8",
         "promise": "^8.0.1",
         "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=4.8.4"
       }
     },
-    "gulp-jsvalidate": {
+    "node_modules/gulp-jsvalidate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/gulp-jsvalidate/-/gulp-jsvalidate-3.0.0.tgz",
       "integrity": "sha1-X6rFJn33byi9Vz8S/1N/Z6gjvhc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "esprima": "^3.1.1",
         "gulp-util": "^3.0.0",
         "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "gulp-match": {
+    "node_modules/gulp-match": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.3.tgz",
       "integrity": "sha1-kcfA1/Kb7NZgbVfYCn+Hdqh6uo4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimatch": "^3.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "gulp-newer": {
+    "node_modules/gulp-newer": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.3.0.tgz",
       "integrity": "sha1-1Q7Ky7gi7aSStXMkpshaB/2aVcE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob": "^7.0.3",
         "gulp-util": "^3.0.7",
         "kew": "^0.7.0"
       }
     },
-    "gulp-plumber": {
+    "node_modules/gulp-plumber": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz",
       "integrity": "sha1-8SF2wtBCL2AwbCQv/2oBo5T6ugk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "gulp-util": "^3",
         "through2": "^2"
+      },
+      "engines": {
+        "node": ">=0.10",
+        "npm": ">=1.2.10"
       }
     },
-    "gulp-util": {
+    "node_modules/gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
       "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "array-differ": "^1.0.0",
         "array-uniq": "^1.0.2",
         "beeper": "^1.0.0",
@@ -1240,384 +1540,489 @@
         "through2": "^2.0.0",
         "vinyl": "^0.5.0"
       },
-      "dependencies": {
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-util/node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "gulp-zip": {
+    "node_modules/gulp-zip": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-3.2.0.tgz",
       "integrity": "sha1-69GY2ubcLV9E2BRWnI7EIRipPvk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.0.0",
         "concat-stream": "^1.4.7",
         "gulp-util": "^3.0.0",
         "through2": "^2.0.1",
         "yazl": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "gulplog": {
+    "node_modules/gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "has-ansi": {
+    "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-gulplog": {
+    "node_modules/has-gulplog": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "has-value": {
+    "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-values": {
+    "node_modules/has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "homedir-polyfill": {
+    "node_modules/homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "hosted-git-info": {
+    "node_modules/hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
       "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
       "dev": true
     },
-    "inflight": {
+    "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "inherits": {
+    "node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
-    "ini": {
+    "node_modules/ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
-    "interpret": {
+    "node_modules/interpret": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
       "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
       "dev": true
     },
-    "invert-kv": {
+    "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-absolute": {
+    "node_modules/is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
       "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-relative": "^1.0.0",
         "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-accessor-descriptor": {
+    "node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "deprecated": "Please upgrade to v0.1.7",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-arrayish": {
+    "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
-    "is-buffer": {
+    "node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-builtin-module": {
+    "node_modules/is-builtin-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "builtin-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-data-descriptor": {
+    "node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "deprecated": "Please upgrade to v0.1.5",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-descriptor": {
+    "node_modules/is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
         "kind-of": "^5.0.0"
       },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-extendable": {
+    "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-extglob": {
+    "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-fullwidth-code-point": {
+    "node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-glob": {
+    "node_modules/is-glob": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
       "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-number": {
+    "node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-path-cwd": {
+    "node_modules/is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
       "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-path-in-cwd": {
+    "node_modules/is-path-in-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-path-inside": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-path-inside": {
+    "node_modules/is-path-inside": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "path-is-inside": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-plain-object": {
+    "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-relative": {
+    "node_modules/is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
       "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-unc-path": {
+    "node_modules/is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
       "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-utf8": {
+    "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
-    "is-windows": {
+    "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "isarray": {
+    "node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
       "dev": true
     },
-    "isexe": {
+    "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "isobject": {
+    "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "kew": {
+    "node_modules/kew": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
       "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
       "dev": true
     },
-    "kind-of": {
+    "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "lcid": {
+    "node_modules/lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "liftoff": {
+    "node_modules/liftoff": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
       "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend": "^3.0.0",
         "findup-sync": "^2.0.0",
         "fined": "^1.0.1",
@@ -1626,142 +2031,157 @@
         "object.map": "^1.0.0",
         "rechoir": "^0.6.2",
         "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "load-json-file": {
+    "node_modules/load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0",
         "strip-bom": "^2.0.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
       "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        }
-      }
-    },
-    "lodash": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lodash": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
       "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
-      "dev": true
+      "dev": true,
+      "engines": [
+        "node",
+        "rhino"
+      ]
     },
-    "lodash._basecopy": {
+    "node_modules/lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
-    "lodash._basetostring": {
+    "node_modules/lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
       "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
       "dev": true
     },
-    "lodash._basevalues": {
+    "node_modules/lodash._basevalues": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "lodash._getnative": {
+    "node_modules/lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
       "dev": true
     },
-    "lodash._isiterateecall": {
+    "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._reescape": {
+    "node_modules/lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
       "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
       "dev": true
     },
-    "lodash._reevaluate": {
+    "node_modules/lodash._reevaluate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
       "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
       "dev": true
     },
-    "lodash._reinterpolate": {
+    "node_modules/lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
-    "lodash._root": {
+    "node_modules/lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash.escape": {
+    "node_modules/lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
       "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash._root": "^3.0.0"
       }
     },
-    "lodash.isarguments": {
+    "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
       "dev": true
     },
-    "lodash.isarray": {
+    "node_modules/lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
-    "lodash.keys": {
+    "node_modules/lodash.keys": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
         "lodash.isarray": "^3.0.0"
       }
     },
-    "lodash.restparam": {
+    "node_modules/lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
       "dev": true
     },
-    "lodash.template": {
+    "node_modules/lodash.template": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
       "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "deprecated": "This package is deprecated. Use https://socket.dev/npm/package/eta instead.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash._basecopy": "^3.0.0",
         "lodash._basetostring": "^3.0.0",
         "lodash._basevalues": "^3.0.0",
@@ -1773,99 +2193,106 @@
         "lodash.templatesettings": "^3.0.0"
       }
     },
-    "lodash.templatesettings": {
+    "node_modules/lodash.templatesettings": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
       "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash._reinterpolate": "^3.0.0",
         "lodash.escape": "^3.0.0"
       }
     },
-    "lru-cache": {
+    "node_modules/lru-cache": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
       "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
       "dev": true
     },
-    "make-iterator": {
+    "node_modules/make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
       "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "map-cache": {
+    "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "map-stream": {
+    "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
       "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
       "dev": true
     },
-    "map-visit": {
+    "node_modules/map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "merge-stream": {
+    "node_modules/merge-stream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
       "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "readable-stream": "^2.0.1"
-      },
+      }
+    },
+    "node_modules/merge-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/merge-stream/node_modules/readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/merge-stream/node_modules/string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
       "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "micromatch": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "braces": "^2.3.1",
@@ -1879,82 +2306,93 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "minimatch": {
+    "node_modules/minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "minimist": {
+    "node_modules/minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
-    "mixin-deep": {
+    "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mkdirp": {
+    "node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
       "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.5"
       },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        }
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "ms": {
+    "node_modules/mkdirp/node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "multipipe": {
+    "node_modules/multipipe": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
       "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "duplexer2": "0.0.2"
       }
     },
-    "nanomatch": {
+    "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -1966,523 +2404,659 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "natives": {
+    "node_modules/natives": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
       "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x.",
       "dev": true
     },
-    "node-mendix-modeler-path": {
-      "version": "https://github.com/JelteMX/node-mendix-modeler-path/archive/v1.0.0.tar.gz",
+    "node_modules/node-mendix-modeler-path": {
+      "version": "1.0.0",
+      "resolved": "https://github.com/JelteMX/node-mendix-modeler-path/archive/v1.0.0.tar.gz",
       "integrity": "sha512-63gkOuOuPn1AGMZ93cv+q3xeWpmTq+i613JFWIGKg1P59NBu4LRAzUrFLUEjNIC1D/wbyukj4UMr//WqMefQQg==",
       "dev": true,
-      "requires": {
+      "license": "Apache 2",
+      "dependencies": {
         "shelljs": "^0.5.3"
+      }
+    },
+    "node_modules/node-mendix-modeler-path/node_modules/shelljs": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+      "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=",
+      "dev": true,
+      "bin": {
+        "shjs": "bin/shjs"
       },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
-          "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "normalize-package-data": {
+    "node_modules/normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hosted-git-info": "^2.1.4",
         "is-builtin-module": "^1.0.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
       }
     },
-    "number-is-nan": {
+    "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "object-assign": {
+    "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "object-copy": {
+    "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-visit": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.defaults": {
+    "node_modules/object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
       "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "array-each": "^1.0.1",
         "array-slice": "^1.0.0",
         "for-own": "^1.0.0",
         "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.map": {
+    "node_modules/object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-own": "^1.0.0",
         "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.pick": {
+    "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "once": {
+    "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "wrappy": "1"
       }
     },
-    "orchestrator": {
+    "node_modules/orchestrator": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
       "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "end-of-stream": "~0.1.5",
         "sequencify": "~0.0.7",
         "stream-consume": "~0.1.0"
       }
     },
-    "ordered-read-streams": {
+    "node_modules/ordered-read-streams": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
       "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
       "dev": true
     },
-    "os-homedir": {
+    "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "os-locale": {
+    "node_modules/os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "parse-filepath": {
+    "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
       "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-absolute": "^1.0.0",
         "map-cache": "^0.2.0",
         "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "parse-json": {
+    "node_modules/parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "parse-passwd": {
+    "node_modules/parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pascalcase": {
+    "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-exists": {
+    "node_modules/path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "path-is-absolute": {
+    "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-is-inside": {
+    "node_modules/path-is-inside": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
       "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
       "dev": true
     },
-    "path-parse": {
+    "node_modules/path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
       "dev": true
     },
-    "path-root": {
+    "node_modules/path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "path-root-regex": {
+    "node_modules/path-root-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
       "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-type": {
+    "node_modules/path-type": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.2",
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0"
       },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type/node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "pause-stream": {
+    "node_modules/pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "through": "~2.3"
       }
     },
-    "pify": {
+    "node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pinkie": {
+    "node_modules/pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
       "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pinkie-promise": {
+    "node_modules/pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "posix-character-classes": {
+    "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pretty-hrtime": {
+    "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "process-nextick-args": {
+    "node_modules/process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
       "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
       "dev": true
     },
-    "promise": {
+    "node_modules/promise": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.1.tgz",
       "integrity": "sha1-5F1osAoXZHttpxG/he1u1HII9FA=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "asap": "~2.0.3"
       }
     },
-    "read-pkg": {
+    "node_modules/read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
         "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "read-pkg-up": {
+    "node_modules/read-pkg-up": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "readable-stream": {
+    "node_modules/readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.1",
         "isarray": "0.0.1",
         "string_decoder": "~0.10.x"
       }
     },
-    "rechoir": {
+    "node_modules/rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "regex-not": {
+    "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "repeat-element": {
+    "node_modules/repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "repeat-string": {
+    "node_modules/repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "replace-ext": {
+    "node_modules/replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
       "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "require-directory": {
+    "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "require-main-filename": {
+    "node_modules/require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
-    "resolve": {
+    "node_modules/resolve": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
       "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "path-parse": "^1.0.5"
       }
     },
-    "resolve-dir": {
+    "node_modules/resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-tilde": "^2.0.0",
         "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "resolve-url": {
+    "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "ret": {
+    "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
     },
-    "rimraf": {
+    "node_modules/rimraf": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob": "^7.0.5"
+      },
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
       "dev": true
     },
-    "safe-regex": {
+    "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ret": "~0.1.10"
       }
     },
-    "sax": {
+    "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
-    "semver": {
+    "node_modules/semver": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
       "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
     },
-    "sequencify": {
+    "node_modules/sequencify": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
       "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "set-blocking": {
+    "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
-    "set-value": {
+    "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
       "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "shelljs": {
+    "node_modules/shelljs": {
       "version": "0.7.8",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
         "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "iojs": "*",
+        "node": ">=0.11.0"
       }
     },
-    "sigmund": {
+    "node_modules/sigmund": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
       "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
       "dev": true
     },
-    "snapdragon": {
+    "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -2492,110 +3066,140 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "deprecated": "Please upgrade to v1.0.1",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.2.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "source-map": {
+    "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "source-map-resolve": {
+    "node_modules/source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -2603,394 +3207,470 @@
         "urix": "^0.1.0"
       }
     },
-    "source-map-url": {
+    "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "sparkles": {
+    "node_modules/sparkles": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
       "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "spdx-correct": {
+    "node_modules/spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "spdx-license-ids": "^1.0.2"
       }
     },
-    "spdx-expression-parse": {
+    "node_modules/spdx-expression-parse": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
       "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
       "dev": true
     },
-    "spdx-license-ids": {
+    "node_modules/spdx-license-ids": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
       "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
       "dev": true
     },
-    "split": {
+    "node_modules/split": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
       "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "through": "2"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "split-string": {
+    "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "static-extend": {
+    "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "stream-combiner": {
+    "node_modules/stream-combiner": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "duplexer": "~0.1.1"
       }
     },
-    "stream-consume": {
+    "node_modules/stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
       "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
-    "stream-shift": {
+    "node_modules/stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
-    "string-width": {
+    "node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
         "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "strip-ansi": {
+    "node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "strip-bom": {
+    "node_modules/strip-bom": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
       "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "first-chunk-stream": "^1.0.0",
         "is-utf8": "^0.2.0"
+      },
+      "bin": {
+        "strip-bom": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "supports-color": {
+    "node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "ternary-stream": {
+    "node_modules/ternary-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.0.1.tgz",
       "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "duplexify": "^3.5.0",
         "fork-stream": "^0.0.4",
         "merge-stream": "^1.0.0",
         "through2": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "through": {
+    "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "through2": {
+    "node_modules/through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "readable-stream": "^2.1.5",
         "xtend": "~4.0.1"
-      },
+      }
+    },
+    "node_modules/through2/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
       "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "tildify": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "os-homedir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "time-stamp": {
+    "node_modules/time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "to-object-path": {
+    "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex": {
+    "node_modules/to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex-range": {
+    "node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "typedarray": {
+    "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "unc-path-regex": {
+    "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "union-value": {
+    "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "unique-stream": {
+    "node_modules/unique-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
       "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
       "dev": true
     },
-    "unset-value": {
+    "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
       "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "urix": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "use": {
+    "node_modules/use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "user-home": {
+    "node_modules/user-home": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "user-home": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "util-deprecate": {
+    "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "v8flags": {
+    "node_modules/v8flags": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "user-home": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "validate-npm-package-license": {
+    "node_modules/validate-npm-package-license": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "spdx-correct": "~1.0.0",
         "spdx-expression-parse": "~1.0.0"
       }
     },
-    "vinyl": {
+    "node_modules/vinyl": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
       "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "clone": "^1.0.0",
         "clone-stats": "^0.0.1",
         "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
       }
     },
-    "vinyl-fs": {
+    "node_modules/vinyl-fs": {
       "version": "0.3.14",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
       "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "defaults": "^1.0.0",
         "glob-stream": "^3.1.5",
         "glob-watcher": "^0.0.6",
@@ -3000,67 +3680,79 @@
         "through2": "^0.6.1",
         "vinyl": "^0.4.0"
       },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/clone": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+      "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/vinyl": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+      "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+      "dev": true,
       "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "dev": true,
-          "requires": {
-            "clone": "^0.2.0",
-            "clone-stats": "^0.0.1"
-          }
-        }
-      }
-    },
-    "which": {
+        "clone": "^0.2.0",
+        "clone-stats": "^0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "which-module": {
+    "node_modules/which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
       "dev": true
     },
-    "widgetbuilder-gulp-helper": {
-      "version": "https://github.com/JelteMX/widgetbuilder-gulp-helper/archive/1.0.1.tar.gz",
+    "node_modules/widgetbuilder-gulp-helper": {
+      "version": "1.0.1",
+      "resolved": "https://github.com/JelteMX/widgetbuilder-gulp-helper/archive/1.0.1.tar.gz",
       "integrity": "sha512-Hl8M+4nC4abJOYbf3jQNEUrWNBmfLFTQYKndZ5voAQhJF+vY0NPCXqBHcFwx8Mlr6o72dP7ny5gBBMIHKYuisQ==",
       "dev": true,
-      "requires": {
+      "license": "Apache-2.0",
+      "dependencies": {
         "gulp-util": "^3.0.7",
         "node-mendix-modeler-path": "https://github.com/JelteMX/node-mendix-modeler-path/archive/v1.0.0.tar.gz",
         "semver": "^5.3.0",
@@ -3069,56 +3761,65 @@
         "xml2js": "^0.4.17"
       }
     },
-    "wrap-ansi": {
+    "node_modules/wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "wrappy": {
+    "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
-    "xml2js": {
+    "node_modules/xml2js": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
       "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~9.0.1"
       }
     },
-    "xmlbuilder": {
+    "node_modules/xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
     },
-    "xtend": {
+    "node_modules/xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
       "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
     },
-    "y18n": {
+    "node_modules/y18n": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
       "dev": true
     },
-    "yargs": {
+    "node_modules/yargs": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
       "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^3.0.0",
         "cliui": "^3.2.0",
         "decamelize": "^1.1.1",
@@ -3134,21 +3835,21 @@
         "yargs-parser": "^4.2.0"
       }
     },
-    "yargs-parser": {
+    "node_modules/yargs-parser": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
       "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^3.0.0"
       }
     },
-    "yazl": {
+    "node_modules/yazl": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
       "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "buffer-crc32": "~0.2.3"
       }
     }
diff --git a/package.json b/widget/package.json
similarity index 83%
rename from package.json
rename to widget/package.json
index bad58898..2e0b61f3 100644
--- a/package.json
+++ b/widget/package.json
@@ -21,14 +21,15 @@
     "yargs": "^6.0.0"
   },
   "engines": {
-    "node": ">=5"
+    "node": "=6"
   },
   "generatorVersion": "2.2.3",
   "paths": {
-    "testProjectFolder": "./test/",
-    "testProjectFileName": "Test.mpr"
+    "testProjectFolder": "../module/",
+    "testProjectFileName": "PushNotifications.mpr"
   },
   "scripts": {
-    "dev": "gulp"
+    "dev": "gulp",
+    "build": "gulp build"
   }
 }
diff --git a/src/package.xml b/widget/src/package.xml
similarity index 83%
rename from src/package.xml
rename to widget/src/package.xml
index f107b107..c543d064 100644
--- a/src/package.xml
+++ b/widget/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-	<clientModule name="MxPushNotifications" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+	<clientModule name="MxPushNotifications" version="7.4.2" xmlns="http://www.mendix.com/clientModule/1.0/">
 		<widgetFiles>
 			<widgetFile path="pushNotifications/pushNotifications.xml"/>
 		</widgetFiles>
diff --git a/src/pushNotifications/pushNotifications.webmodeler.js b/widget/src/pushNotifications/pushNotifications.webmodeler.js
similarity index 100%
rename from src/pushNotifications/pushNotifications.webmodeler.js
rename to widget/src/pushNotifications/pushNotifications.webmodeler.js
diff --git a/src/pushNotifications/pushNotifications.xml b/widget/src/pushNotifications/pushNotifications.xml
similarity index 100%
rename from src/pushNotifications/pushNotifications.xml
rename to widget/src/pushNotifications/pushNotifications.xml
diff --git a/src/pushNotifications/widget/pushNotifications.js b/widget/src/pushNotifications/widget/pushNotifications.js
similarity index 100%
rename from src/pushNotifications/widget/pushNotifications.js
rename to widget/src/pushNotifications/widget/pushNotifications.js
diff --git a/src/pushNotifications/widget/template/pushNotifications.html b/widget/src/pushNotifications/widget/template/pushNotifications.html
similarity index 100%
rename from src/pushNotifications/widget/template/pushNotifications.html
rename to widget/src/pushNotifications/widget/template/pushNotifications.html
diff --git a/src/pushNotifications/widget/ui/pushNotifications.css b/widget/src/pushNotifications/widget/ui/pushNotifications.css
similarity index 100%
rename from src/pushNotifications/widget/ui/pushNotifications.css
rename to widget/src/pushNotifications/widget/ui/pushNotifications.css
diff --git a/xsd/widget.xsd b/widget/xsd/widget.xsd
similarity index 100%
rename from xsd/widget.xsd
rename to widget/xsd/widget.xsd
diff --git a/widgets-whitelist.txt b/widgets-whitelist.txt
deleted file mode 100644
index b616300d..00000000
--- a/widgets-whitelist.txt
+++ /dev/null
@@ -1 +0,0 @@
-MxPushNotifications.mpk
\ No newline at end of file