diff --git a/dist/default-build-script/Assets/Editor/UnityBuilderAction.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction.meta
new file mode 100644
index 00000000..d1fc52e4
--- /dev/null
+++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e9babefb99ee74048a824da81c20cbcd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/dist/default-build-script/Assets/Editor/Builder.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs
similarity index 86%
rename from dist/default-build-script/Assets/Editor/Builder.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs
index dfb1341b..90af7145 100644
--- a/dist/default-build-script/Assets/Editor/Builder.cs
+++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs
@@ -7,6 +7,10 @@ using UnityBuilderAction.Versioning;
 using UnityEditor;
 using UnityEditor.Build.Reporting;
 
+#if USE_ADDRESSABLES
+using UnityEditor.AddressableAssets.Settings;
+#endif
+
 namespace UnityBuilderAction
 {
   static class Builder
@@ -44,6 +48,12 @@ namespace UnityBuilderAction
       if (buildPlayerOptions.target == BuildTarget.Android)
         AndroidSettings.Apply(options);
 
+      // Execute default AddressableAsset content build, if the package is installed
+#if USE_ADDRESSABLES
+      AddressableAssetSettings.CleanPlayerContent();
+      AddressableAssetSettings.BuildPlayerContent();
+#endif
+
       // Perform build
       BuildReport buildReport = BuildPipeline.BuildPlayer(buildPlayerOptions);
 
diff --git a/dist/default-build-script/Assets/Editor/Builder.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Builder.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Input.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Input.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Input.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Input.meta
diff --git a/dist/default-build-script/Assets/Editor/Input/AndroidSettings.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Input/AndroidSettings.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs
diff --git a/dist/default-build-script/Assets/Editor/Input/AndroidSettings.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Input/AndroidSettings.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Input/ArgumentsParser.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Input/ArgumentsParser.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs
diff --git a/dist/default-build-script/Assets/Editor/Input/ArgumentsParser.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Input/ArgumentsParser.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Reporting.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Reporting.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting.meta
diff --git a/dist/default-build-script/Assets/Editor/Reporting/StdOutReporter.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Reporting/StdOutReporter.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs
diff --git a/dist/default-build-script/Assets/Editor/Reporting/StdOutReporter.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Reporting/StdOutReporter.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/StdOutReporter.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/System.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/System.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/System.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/System.meta
diff --git a/dist/default-build-script/Assets/Editor/System/ProcessExtensions.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/System/ProcessExtensions.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/System/ProcessExtensions.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/System/ProcessExtensions.cs
diff --git a/dist/default-build-script/Assets/Editor/System/ProcessExtensions.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/System/ProcessExtensions.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/System/ProcessExtensions.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/System/ProcessExtensions.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef b/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef
new file mode 100644
index 00000000..dccf592f
--- /dev/null
+++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef
@@ -0,0 +1,23 @@
+{
+    "name": "UnityBuilderAction",
+    "references": [
+        "Unity.Addressables.Editor"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.addressables",
+            "expression": "1.0.0",
+            "define": "USE_ADDRESSABLES"
+        }
+    ],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef.meta
new file mode 100644
index 00000000..fcab7fff
--- /dev/null
+++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction/UnityBuilderAction.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1ab437d31f4f4c9084097e2b4b5fcae
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/dist/default-build-script/Assets/Editor/Versioning.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning.meta
diff --git a/dist/default-build-script/Assets/Editor/Versioning/Git.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/Git.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs
diff --git a/dist/default-build-script/Assets/Editor/Versioning/Git.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/Git.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Versioning/GitException.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/GitException.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/GitException.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/GitException.cs
diff --git a/dist/default-build-script/Assets/Editor/Versioning/GitException.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/GitException.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/GitException.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/GitException.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Versioning/VersionApplicator.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/VersionApplicator.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs
diff --git a/dist/default-build-script/Assets/Editor/Versioning/VersionApplicator.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/VersionApplicator.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionApplicator.cs.meta
diff --git a/dist/default-build-script/Assets/Editor/Versioning/VersionGenerator.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionGenerator.cs
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/VersionGenerator.cs
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionGenerator.cs
diff --git a/dist/default-build-script/Assets/Editor/Versioning/VersionGenerator.cs.meta b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionGenerator.cs.meta
similarity index 100%
rename from dist/default-build-script/Assets/Editor/Versioning/VersionGenerator.cs.meta
rename to dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/VersionGenerator.cs.meta