diff --git a/.gitignore b/.gitignore
index e378e78..7bf5324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-Data/*
-userPreferences.*
-Project/DerivedData/*
-Resources/4d-class-compiler/*
-Libraries/lib4d-arm64.dylib
-Settings/buildApp.4DSettings
+buildapp/Data/*
+buildapp/userPreferences.*
+buildapp/Project/DerivedData/*
+buildapp/Resources/4d-class-compiler/*
+buildapp/Libraries/lib4d-arm64.dylib
+buildapp/Settings/buildApp.4DSettings
diff --git a/Documentation/Classes/BuildApp.md b/buildapp/Documentation/Classes/BuildApp.md
similarity index 100%
rename from Documentation/Classes/BuildApp.md
rename to buildapp/Documentation/Classes/BuildApp.md
diff --git a/Documentation/images/colors.png b/buildapp/Documentation/images/colors.png
similarity index 100%
rename from Documentation/images/colors.png
rename to buildapp/Documentation/images/colors.png
diff --git a/Documentation/images/hello.png b/buildapp/Documentation/images/hello.png
similarity index 100%
rename from Documentation/images/hello.png
rename to buildapp/Documentation/images/hello.png
diff --git a/Project/BuildApp.4DProject b/buildapp/Project/BuildApp.4DProject
similarity index 100%
rename from Project/BuildApp.4DProject
rename to buildapp/Project/BuildApp.4DProject
diff --git a/Project/Sources/Classes/BuildApp.4dm b/buildapp/Project/Sources/Classes/BuildApp.4dm
similarity index 100%
rename from Project/Sources/Classes/BuildApp.4dm
rename to buildapp/Project/Sources/Classes/BuildApp.4dm
diff --git a/Project/Sources/Classes/_BuildAppUI.4dm b/buildapp/Project/Sources/Classes/_BuildAppUI.4dm
similarity index 100%
rename from Project/Sources/Classes/_BuildAppUI.4dm
rename to buildapp/Project/Sources/Classes/_BuildAppUI.4dm
diff --git a/Project/Sources/Classes/_Terminal.4dm b/buildapp/Project/Sources/Classes/_Terminal.4dm
similarity index 100%
rename from Project/Sources/Classes/_Terminal.4dm
rename to buildapp/Project/Sources/Classes/_Terminal.4dm
diff --git "a/Project/Sources/Forms/BuildApp/ObjectMethods/Build CLI\342\200\246.4dm" "b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Build CLI\342\200\246.4dm"
similarity index 100%
rename from "Project/Sources/Forms/BuildApp/ObjectMethods/Build CLI\342\200\246.4dm"
rename to "buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Build CLI\342\200\246.4dm"
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Build.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Build.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Build.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Build.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.BuildApplicationSerialized.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.BuildApplicationSerialized.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.BuildApplicationSerialized.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.BuildApplicationSerialized.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.CS.LastDataPathLookup.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.CS.LastDataPathLookup.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.CS.LastDataPathLookup.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.CS.LastDataPathLookup.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.PackProject.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.PackProject.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.PackProject.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.PackProject.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.RuntimeVL.LastDataPathLookup.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.RuntimeVL.LastDataPathLookup.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.RuntimeVL.LastDataPathLookup.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.RuntimeVL.LastDataPathLookup.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.AdHocSign.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.AdHocSign.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.AdHocSign.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.AdHocSign.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.MacSignature.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.MacSignature.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.MacSignature.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SignApplication.MacSignature.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SourcesFiles.RuntimeVL.RuntimeVLIncludeIt.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SourcesFiles.RuntimeVL.RuntimeVLIncludeIt.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SourcesFiles.RuntimeVL.RuntimeVLIncludeIt.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildApp.SourcesFiles.RuntimeVL.RuntimeVLIncludeIt.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDest.BuildDestFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDest.BuildDestFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildDest.BuildDestFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDest.BuildDestFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDestIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDestIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/BuildDestIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/BuildDestIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMac.ClientMacIconPath.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMac.ClientMacIconPath.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ClientMac.ClientMacIconPath.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMac.ClientMacIconPath.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMacIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMacIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ClientMacIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientMacIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWin.ClientWinIconPath.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWin.ClientWinIconPath.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ClientWin.ClientWinIconPath.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWin.ClientWinIconPath.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWinIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWinIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ClientWinIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ClientWinIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMac.DatabaseToEmbedInClientMacFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMac.DatabaseToEmbedInClientMacFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMac.DatabaseToEmbedInClientMacFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMac.DatabaseToEmbedInClientMacFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMacApplicationIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMacApplicationIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMacApplicationIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientMacApplicationIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWin.DatabaseToEmbedInClientWinFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWin.DatabaseToEmbedInClientWinFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWin.DatabaseToEmbedInClientWinFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWin.DatabaseToEmbedInClientWinFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWinApplicationIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWinApplicationIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWinApplicationIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/DatabaseToEmbedInClientWinApplicationIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Down.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Down.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Down.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Down.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWin.MacCompiledDatabaseToWinFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWin.MacCompiledDatabaseToWinFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWin.MacCompiledDatabaseToWinFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWin.MacCompiledDatabaseToWinFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWinApplicationIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWinApplicationIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWinApplicationIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/MacCompiledDatabaseToWinApplicationIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Plugins.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Plugins.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Plugins.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Plugins.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder1.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder1.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder1.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLFolder1.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLIconPath.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLIconPath.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLIconPath.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVL.RuntimeVLIconPath.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon1.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon1.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon1.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLApplicationIcon1.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/RuntimeVLIcon.4dm
diff --git "a/Project/Sources/Forms/BuildApp/ObjectMethods/Save as\342\200\246.4dm" "b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Save as\342\200\246.4dm"
similarity index 100%
rename from "Project/Sources/Forms/BuildApp/ObjectMethods/Save as\342\200\246.4dm"
rename to "buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Save as\342\200\246.4dm"
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerFolder.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerFolder.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerFolder.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerFolder.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerIconPath.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerIconPath.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerIconPath.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Server.ServerIconPath.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ServerApplicationIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ServerApplicationIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ServerApplicationIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ServerApplicationIcon.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/ServerIcon.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ServerIcon.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/ServerIcon.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/ServerIcon.4dm
diff --git "a/Project/Sources/Forms/BuildApp/ObjectMethods/Show JSON\342\200\246.4dm" "b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Show JSON\342\200\246.4dm"
similarity index 100%
rename from "Project/Sources/Forms/BuildApp/ObjectMethods/Show JSON\342\200\246.4dm"
rename to "buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Show JSON\342\200\246.4dm"
diff --git "a/Project/Sources/Forms/BuildApp/ObjectMethods/Show XML\342\200\246.4dm" "b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Show XML\342\200\246.4dm"
similarity index 100%
rename from "Project/Sources/Forms/BuildApp/ObjectMethods/Show XML\342\200\246.4dm"
rename to "buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Show XML\342\200\246.4dm"
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/Up.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Up.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/Up.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/Up.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/components.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/components.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/components.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/components.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/lb.pages.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/lb.pages.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/lb.pages.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/lb.pages.4dm
diff --git a/Project/Sources/Forms/BuildApp/ObjectMethods/modules.4dm b/buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/modules.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/ObjectMethods/modules.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/ObjectMethods/modules.4dm
diff --git a/Project/Sources/Forms/BuildApp/form.4DForm b/buildapp/Project/Sources/Forms/BuildApp/form.4DForm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/form.4DForm
rename to buildapp/Project/Sources/Forms/BuildApp/form.4DForm
diff --git a/Project/Sources/Forms/BuildApp/method.4dm b/buildapp/Project/Sources/Forms/BuildApp/method.4dm
similarity index 100%
rename from Project/Sources/Forms/BuildApp/method.4dm
rename to buildapp/Project/Sources/Forms/BuildApp/method.4dm
diff --git a/Project/Sources/Methods/test.4dm b/buildapp/Project/Sources/Methods/test.4dm
similarity index 100%
rename from Project/Sources/Methods/test.4dm
rename to buildapp/Project/Sources/Methods/test.4dm
diff --git a/Project/Sources/catalog.4DCatalog b/buildapp/Project/Sources/catalog.4DCatalog
similarity index 100%
rename from Project/Sources/catalog.4DCatalog
rename to buildapp/Project/Sources/catalog.4DCatalog
diff --git a/Project/Sources/folders.json b/buildapp/Project/Sources/folders.json
similarity index 100%
rename from Project/Sources/folders.json
rename to buildapp/Project/Sources/folders.json
diff --git a/Project/Sources/menus.json b/buildapp/Project/Sources/menus.json
similarity index 100%
rename from Project/Sources/menus.json
rename to buildapp/Project/Sources/menus.json
diff --git a/Project/Sources/settings.4DSettings b/buildapp/Project/Sources/settings.4DSettings
similarity index 100%
rename from Project/Sources/settings.4DSettings
rename to buildapp/Project/Sources/settings.4DSettings
diff --git a/Resources/BuildApp-Template.4DSettings b/buildapp/Resources/BuildApp-Template.4DSettings
similarity index 100%
rename from Resources/BuildApp-Template.4DSettings
rename to buildapp/Resources/BuildApp-Template.4DSettings
diff --git a/Resources/en.lproj/syntaxEN.json b/buildapp/Resources/en.lproj/syntaxEN.json
similarity index 100%
rename from Resources/en.lproj/syntaxEN.json
rename to buildapp/Resources/en.lproj/syntaxEN.json