diff --git a/api/crm/spec.json b/api/crm/spec.json
index c19653426..14580a812 100644
--- a/api/crm/spec.json
+++ b/api/crm/spec.json
@@ -2,7 +2,6 @@
   {
     "title": "Pages",
     "description": "CRM module pages",
-    "package": "crm",
     "entrypoint": "page",
     "path": "/page",
     "authentication": [],
@@ -198,7 +197,6 @@
   {
     "title": "Modules",
     "description": "CRM module definitions",
-    "package": "crm",
     "entrypoint": "module",
     "path": "/module",
     "authentication": [],
@@ -609,7 +607,6 @@
   {
     "title": "Triggers",
     "description": "CRM Triggers",
-    "package": "crm",
     "entrypoint": "trigger",
     "path": "/trigger",
     "authentication": [],
@@ -755,7 +752,6 @@
   {
     "title": "Notifications",
     "description": "CRM Notifications",
-    "package": "crm",
     "entrypoint": "notification",
     "path": "/notification",
     "authentication": [],
diff --git a/api/crm/spec/chart.json b/api/crm/spec/chart.json
index 0917f3650..bf1cb21fb 100644
--- a/api/crm/spec/chart.json
+++ b/api/crm/spec/chart.json
@@ -1,6 +1,5 @@
 {
   "Title": "Charts",
-  "Package": "",
   "Interface": "Chart",
   "Struct": [
     {
diff --git a/api/crm/spec/module.json b/api/crm/spec/module.json
index 4016f9a6a..e10925d11 100644
--- a/api/crm/spec/module.json
+++ b/api/crm/spec/module.json
@@ -1,7 +1,6 @@
 {
   "Title": "Modules",
   "Description": "CRM module definitions",
-  "Package": "crm",
   "Interface": "Module",
   "Struct": [
     {
diff --git a/api/crm/spec/notification.json b/api/crm/spec/notification.json
index d25ee339b..c1eed0a98 100644
--- a/api/crm/spec/notification.json
+++ b/api/crm/spec/notification.json
@@ -1,7 +1,6 @@
 {
   "Title": "Notifications",
   "Description": "CRM Notifications",
-  "Package": "crm",
   "Interface": "Notification",
   "Struct": [
     {
diff --git a/api/crm/spec/page.json b/api/crm/spec/page.json
index 83a71b8e7..d8486a517 100644
--- a/api/crm/spec/page.json
+++ b/api/crm/spec/page.json
@@ -1,7 +1,6 @@
 {
   "Title": "Pages",
   "Description": "CRM module pages",
-  "Package": "crm",
   "Interface": "Page",
   "Struct": [
     {
diff --git a/api/crm/spec/trigger.json b/api/crm/spec/trigger.json
index 47c014dba..5d497cc60 100644
--- a/api/crm/spec/trigger.json
+++ b/api/crm/spec/trigger.json
@@ -1,7 +1,6 @@
 {
   "Title": "Triggers",
   "Description": "CRM Triggers",
-  "Package": "crm",
   "Interface": "Trigger",
   "Struct": null,
   "Parameters": null,
diff --git a/api/messaging/spec.json b/api/messaging/spec.json
index ff278b59a..eb5ef8a39 100644
--- a/api/messaging/spec.json
+++ b/api/messaging/spec.json
@@ -2,7 +2,6 @@
   {
     "title": "Channels",
     "description": "A channel is a representation of a sequence of messages. It has meta data like channel subject. Channels may be public, private or group.",
-    "package": "sam",
     "entrypoint": "channel",
     "path": "/channels",
     "authentication": [
@@ -300,7 +299,6 @@
   },
   {
     "title": "Messages",
-    "package": "sam",
     "path": "/channels/{channelID}/messages",
     "parameters": {
       "path": [
@@ -566,7 +564,6 @@
   },
   {
     "title": "Attachments",
-    "package": "sam",
     "path": "/attachment/{attachmentID}",
     "parameters": {
       "path": [
@@ -685,7 +682,6 @@
   },
   {
     "title": "Permissions",
-    "package": "sam",
     "parameters": {},
     "entrypoint": "permissions",
     "authentication": [
diff --git a/api/messaging/spec/attachment.json b/api/messaging/spec/attachment.json
index eed54b339..a20f0eca0 100644
--- a/api/messaging/spec/attachment.json
+++ b/api/messaging/spec/attachment.json
@@ -1,6 +1,5 @@
 {
   "Title": "Attachments",
-  "Package": "sam",
   "Interface": "Attachment",
   "Struct": null,
   "Parameters": {
diff --git a/api/messaging/spec/channel.json b/api/messaging/spec/channel.json
index 7bbea5aa2..66998d9bd 100644
--- a/api/messaging/spec/channel.json
+++ b/api/messaging/spec/channel.json
@@ -1,7 +1,6 @@
 {
   "Title": "Channels",
   "Description": "A channel is a representation of a sequence of messages. It has meta data like channel subject. Channels may be public, private or group.",
-  "Package": "sam",
   "Interface": "Channel",
   "Struct": null,
   "Parameters": null,
diff --git a/api/messaging/spec/message.json b/api/messaging/spec/message.json
index 2c90d4fde..84ec828b3 100644
--- a/api/messaging/spec/message.json
+++ b/api/messaging/spec/message.json
@@ -1,6 +1,5 @@
 {
   "Title": "Messages",
-  "Package": "sam",
   "Interface": "Message",
   "Struct": null,
   "Parameters": {
diff --git a/api/messaging/spec/permissions.json b/api/messaging/spec/permissions.json
index 80cd69fc4..1441524de 100644
--- a/api/messaging/spec/permissions.json
+++ b/api/messaging/spec/permissions.json
@@ -1,6 +1,5 @@
 {
   "Title": "Permissions",
-  "Package": "sam",
   "Interface": "Permissions",
   "Struct": [
     {
diff --git a/api/messaging/spec/search.json b/api/messaging/spec/search.json
index 3fc6b69a9..fa0285970 100644
--- a/api/messaging/spec/search.json
+++ b/api/messaging/spec/search.json
@@ -1,6 +1,5 @@
 {
   "Title": "Search entry point",
-  "Package": "",
   "Interface": "Search",
   "Struct": null,
   "Parameters": {
diff --git a/api/system/spec.json b/api/system/spec.json
index a73c4f4dd..cbe4a2301 100644
--- a/api/system/spec.json
+++ b/api/system/spec.json
@@ -1,7 +1,6 @@
 [
   {
     "title": "Authentication",
-    "package": "auth",
     "path": "/auth",
     "entrypoint": "auth",
     "authentication": [],
@@ -47,7 +46,6 @@
   {
     "title": "Organisations",
     "description": "Organisations represent a top-level grouping entity. There may be many organisations defined in a single deployment.",
-    "package": "sam",
     "path": "/organisations",
     "entrypoint": "organisation",
     "authentication": [
@@ -164,7 +162,6 @@
   {
     "title": "Teams",
     "description": "An organisation may have many teams. Teams may have many channels available. Access to channels may be shared between teams.",
-    "package": "sam",
     "path": "/teams",
     "entrypoint": "team",
     "authentication": [
@@ -388,7 +385,6 @@
   },
   {
     "title": "Users",
-    "package": "sam",
     "path": "/users",
     "entrypoint": "user",
     "authentication": [
diff --git a/api/system/spec/auth.json b/api/system/spec/auth.json
index 5011fcb51..af8c321a6 100644
--- a/api/system/spec/auth.json
+++ b/api/system/spec/auth.json
@@ -1,6 +1,5 @@
 {
   "Title": "Authentication",
-  "Package": "auth",
   "Interface": "Auth",
   "Struct": null,
   "Parameters": null,
diff --git a/api/system/spec/organisation.json b/api/system/spec/organisation.json
index 8fec986f0..399ee27e3 100644
--- a/api/system/spec/organisation.json
+++ b/api/system/spec/organisation.json
@@ -1,7 +1,6 @@
 {
   "Title": "Organisations",
   "Description": "Organisations represent a top-level grouping entity. There may be many organisations defined in a single deployment.",
-  "Package": "sam",
   "Interface": "Organisation",
   "Struct": null,
   "Parameters": null,
diff --git a/api/system/spec/team.json b/api/system/spec/team.json
index d8dcf05e8..5cbb4b330 100644
--- a/api/system/spec/team.json
+++ b/api/system/spec/team.json
@@ -1,7 +1,6 @@
 {
   "Title": "Teams",
   "Description": "An organisation may have many teams. Teams may have many channels available. Access to channels may be shared between teams.",
-  "Package": "sam",
   "Interface": "Team",
   "Struct": null,
   "Parameters": null,
diff --git a/api/system/spec/user.json b/api/system/spec/user.json
index 3d710e78c..196fc7e2c 100644
--- a/api/system/spec/user.json
+++ b/api/system/spec/user.json
@@ -1,6 +1,5 @@
 {
   "Title": "Users",
-  "Package": "sam",
   "Interface": "User",
   "Struct": [
     {