diff --git a/Projects/Social-Bots/Schemas/announcement-condition.json b/Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json
similarity index 82%
rename from Projects/Social-Bots/Schemas/announcement-condition.json
rename to Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json
index 5d4a232f7..84dc7150d 100644
--- a/Projects/Social-Bots/Schemas/announcement-condition.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json
@@ -9,7 +9,8 @@
             "actionFunction": "uiObject.codeEditor.activate",
             "label": "Configure",
             "iconPathOn": "configuration",
-            "iconPathOff": "configuration"
+            "iconPathOff": "configuration",
+            "actionProject": "Foundations"
         },
         {
             "action": "Delete UI Object",
@@ -18,7 +19,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "initialValues": {
diff --git a/Projects/Social-Bots/Schemas/announcement-formula.json b/Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json
similarity index 80%
rename from Projects/Social-Bots/Schemas/announcement-formula.json
rename to Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json
index a6e1ad4dd..513014334 100644
--- a/Projects/Social-Bots/Schemas/announcement-formula.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json
@@ -7,7 +7,8 @@
             "iconPathOn": "javascript-code",
             "iconPathOff": "javascript-code",
             "dontShowAtFullscreen": true,
-            "actionFunction": "uiObject.formulaEditor.activate"
+            "actionFunction": "uiObject.formulaEditor.activate",
+            "actionProject": "Foundations"
         },
         {
             "action": "Delete UI Object",
@@ -16,7 +17,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "addLeftIcons": true,
diff --git a/Projects/Social-Bots/Schemas/announcement.json b/Projects/Social-Bots/Schemas/App-Schema/announcement.json
similarity index 78%
rename from Projects/Social-Bots/Schemas/announcement.json
rename to Projects/Social-Bots/Schemas/App-Schema/announcement.json
index aaba138aa..6f6639ae4 100644
--- a/Projects/Social-Bots/Schemas/announcement.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/announcement.json
@@ -9,7 +9,8 @@
             "actionFunction": "uiObject.configEditor.activate",
             "label": "Configure",
             "iconPathOn": "configuration",
-            "iconPathOff": "configuration"
+            "iconPathOff": "configuration",
+            "actionProject": "Foundations"
         },
         {
             "action": "Add UI Object",
@@ -17,7 +18,8 @@
             "propertyToCheckFor": "announcementFormula",
             "label": "Add Announcement Formula",
             "relatedUiObject": "Announcement Formula",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Add UI Object",
@@ -25,7 +27,8 @@
             "propertyToCheckFor": "announcementCondition",
             "label": "Add Announcement Condition",
             "relatedUiObject": "Announcement Condition",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Delete UI Object",
@@ -34,7 +37,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "initialValues": {
@@ -50,13 +54,15 @@
             "name": "announcementFormula",
             "type": "node",
             "childType": "Announcement Formula",
-            "autoAdd": true
+            "autoAdd": true,
+            "project": "Social-Bots"
         },
         {
             "name": "announcementCondition",
             "type": "node",
             "childType": "Announcement Condition",
-            "autoAdd": true
+            "autoAdd": true,
+            "project": "Social-Bots"
         }
     ],
     "propertyNameAtParent": "announcements"
diff --git a/Projects/Social-Bots/Schemas/discord-bot.json b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json
similarity index 86%
rename from Projects/Social-Bots/Schemas/discord-bot.json
rename to Projects/Social-Bots/Schemas/App-Schema/discord-bot.json
index 7209448d2..6a54c294b 100644
--- a/Projects/Social-Bots/Schemas/discord-bot.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json
@@ -9,7 +9,8 @@
             "actionFunction": "uiObject.configEditor.activate",
             "label": "Configure",
             "iconPathOn": "configuration",
-            "iconPathOff": "configuration"
+            "iconPathOff": "configuration",
+            "actionProject": "Foundations"
         },
         {
             "action": "Send Discord Test Message",
@@ -25,7 +26,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "initialValues": {
diff --git a/Projects/Social-Bots/Schemas/slack-bot.json b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json
similarity index 86%
rename from Projects/Social-Bots/Schemas/slack-bot.json
rename to Projects/Social-Bots/Schemas/App-Schema/slack-bot.json
index d672e4b2d..68aceafd9 100644
--- a/Projects/Social-Bots/Schemas/slack-bot.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json
@@ -9,7 +9,8 @@
             "actionFunction": "uiObject.configEditor.activate",
             "label": "Configure",
             "iconPathOn": "configuration",
-            "iconPathOff": "configuration"
+            "iconPathOff": "configuration",
+            "actionProject": "Foundations"
         },
         {
             "action": "Send Slack Test Message",
@@ -25,7 +26,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "initialValues": {
diff --git a/Projects/Social-Bots/Schemas/social-bot-command.json b/Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json
similarity index 78%
rename from Projects/Social-Bots/Schemas/social-bot-command.json
rename to Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json
index dd25f533a..cace9448d 100644
--- a/Projects/Social-Bots/Schemas/social-bot-command.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json
@@ -9,7 +9,8 @@
       "actionFunction": "uiObject.configEditor.activate",
       "label": "Configure",
       "iconPathOn": "configuration",
-      "iconPathOff": "configuration"
+      "iconPathOff": "configuration",
+      "actionProject": "Foundations"
     },
     {
       "action": "Add UI Object",
@@ -17,7 +18,8 @@
       "propertyToCheckFor": "formula",
       "label": "Add Formula",
       "relatedUiObject": "Formula",
-      "actionFunction": "payload.executeAction"
+      "actionFunction": "payload.executeAction",
+      "actionProject": "Foundations"
     },
     {
       "action": "Delete UI Object",
@@ -26,7 +28,8 @@
       "label": "Delete",
       "iconPathOn": "delete-entity",
       "iconPathOff": "delete-entity",
-      "actionFunction": "payload.executeAction"
+      "actionFunction": "payload.executeAction",
+      "actionProject": "Foundations"
     }
   ],
   "initialValues": {
@@ -42,7 +45,8 @@
       "name": "formula",
       "type": "node",
       "childType": "Formula",
-      "autoAdd": true
+      "autoAdd": true,
+      "project": "Foundations"
     }
   ],
   "propertyNameAtParent": "socialBotCommand"
diff --git a/Projects/Social-Bots/Schemas/social-bots.json b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json
similarity index 71%
rename from Projects/Social-Bots/Schemas/social-bots.json
rename to Projects/Social-Bots/Schemas/App-Schema/social-bots.json
index 1e08f0fc4..fb33a5a49 100644
--- a/Projects/Social-Bots/Schemas/social-bots.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json
@@ -5,19 +5,22 @@
             "action": "Add UI Object",
             "label": "Add Telegram Bot",
             "relatedUiObject": "Telegram Bot",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Add UI Object",
             "label": "Add Discord Bot",
             "relatedUiObject": "Discord Bot",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Add UI Object",
             "label": "Add Slack Bot",
             "relatedUiObject": "Slack Bot",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Delete UI Object",
@@ -26,7 +29,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "addLeftIcons": true,
@@ -39,19 +43,22 @@
             "name": "telegramBots",
             "type": "array",
             "childType": "Telegram Bot",
-            "autoAdd": true
+            "autoAdd": true,
+            "project": "Social-Bots"
         },
         {
             "name": "discordBots",
             "type": "array",
             "childType": "Discord Bot",
-            "autoAdd": true
+            "autoAdd": true,
+            "project": "Social-Bots"
         },
         {
             "name": "slackBots",
             "type": "array",
             "childType": "Slack Bot",
-            "autoAdd": true
+            "autoAdd": true,
+            "project": "Social-Bots"
         }
     ],
     "propertyNameAtParent": "socialBots"
diff --git a/Projects/Social-Bots/Schemas/telegram-bot.json b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
similarity index 81%
rename from Projects/Social-Bots/Schemas/telegram-bot.json
rename to Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
index 589ad90a7..fdd969968 100644
--- a/Projects/Social-Bots/Schemas/telegram-bot.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
@@ -9,13 +9,15 @@
             "actionFunction": "uiObject.configEditor.activate",
             "label": "Configure",
             "iconPathOn": "configuration",
-            "iconPathOff": "configuration"
+            "iconPathOff": "configuration",
+            "actionProject": "Foundations"
         },
         {
             "action": "Add UI Object",
             "label": "Add Social Bot Command",
             "relatedUiObject": "Social Bot Command",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         },
         {
             "action": "Send Telegram Test Message",
@@ -31,7 +33,8 @@
             "label": "Delete",
             "iconPathOn": "delete-entity",
             "iconPathOff": "delete-entity",
-            "actionFunction": "payload.executeAction"
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
         }
     ],
     "initialValues": {
@@ -47,7 +50,8 @@
             "name": "socialBotCommand",
             "type": "array",
             "childType": "Social Bot Command",
-            "autoAdd": false
+            "autoAdd": false,
+            "project": "Social-Bots"
         }
     ],
     "propertyNameAtParent": "telegramBots"