diff --git a/frontend/src/mock-states/index.js b/frontend/src/mock-states/index.js
index c312c19d..de789b97 100644
--- a/frontend/src/mock-states/index.js
+++ b/frontend/src/mock-states/index.js
@@ -7,76 +7,22 @@ import {
   projects,
   instances,
   services,
-  members
+  members,
+  orgs
 } from './shared/index.js';
 
 export default {
-  "account": account,
-  "datacenters": datacenters,
   "monitors": {
     "ui": {
       "page": "create"
     }
   },
-  "metrics": metrics,
-  "orgs": {
-    "ui": {
-      "invite_toggled": false,
-      "member_status_tooltip": false,
-      "member_role_tooltip": false,
-      "sections": [
-        "projects",
-        "people",
-        "settings"
-      ],
-      "members_status": [
-        "Active",
-        "Inactive",
-        "Invitation Sent"
-      ],
-      "members_roles": [
-        "Owner",
-        "Unassigned",
-        "Read Only"
-      ]
-    },
-    "data": [{
-      "hide": [
-        "people"
-      ],
-      "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
-      "id": "nicola",
-      "name": "Your dashboard",
-      "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg",
-      "members": []
-    }, {
-      "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
-      "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
-      "id": "biz-tech",
-      "name": "BizTech",
-      "members": [
-        {
-          "uuid": "fd853d8f-e1dd-49b5-b7b3-ae9adfea1e2f",
-          "role": "Owner",
-          "status": "Active"
-        },
-        {
-          "uuid": "6deddbaa-3b94-4373-8cf7-97129507a872",
-          "role": "Unassigned",
-          "status": "Sent invitation"
-        }
-      ]
-    }, {
-      "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
-      "uuid": "551f316d-e414-480f-9787-b4c408db3edd",
-      "id": "make-us-proud",
-      "name": "Make Us Proud",
-      "image": "/static/images/make-us-proud.svg",
-      "members": []
-    }]
-  },
-  "projects": projects,
-  "members": members,
-  "services": services,
-  "instances": instances
+  orgs,
+  account,
+  datacenters,
+  metrics,
+  projects,
+  members,
+  services,
+  instances
 }
diff --git a/frontend/src/mock-states/shared/index.js b/frontend/src/mock-states/shared/index.js
index 1bc96c71..e3ab9e5c 100644
--- a/frontend/src/mock-states/shared/index.js
+++ b/frontend/src/mock-states/shared/index.js
@@ -5,6 +5,7 @@ import { projects } from './projects';
 import { services } from './services';
 import { members } from './members';
 import { instances } from './instances';
+import { orgs } from './orgs';
 
 export {
   account,
@@ -13,5 +14,6 @@ export {
   projects,
   services,
   instances,
-  members
+  members,
+  orgs
 };
diff --git a/frontend/src/mock-states/shared/orgs.js b/frontend/src/mock-states/shared/orgs.js
new file mode 100644
index 00000000..c72e59da
--- /dev/null
+++ b/frontend/src/mock-states/shared/orgs.js
@@ -0,0 +1,57 @@
+/*eslint-disable */
+export const orgs = {
+  "ui": {
+    "invite_toggled": false,
+    "member_status_tooltip": false,
+    "member_role_tooltip": false,
+    "sections": [
+      "projects",
+      "people",
+      "settings"
+    ],
+    "members_status": [
+      "Active",
+      "Inactive",
+      "Invitation Sent"
+    ],
+    "members_roles": [
+      "Owner",
+      "Unassigned",
+      "Read Only"
+    ]
+  },
+  "data": [{
+    "hide": [
+      "people"
+    ],
+    "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
+    "id": "nicola",
+    "name": "Your dashboard",
+    "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg",
+    "members": []
+  }, {
+    "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
+    "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
+    "id": "biz-tech",
+    "name": "BizTech",
+    "members": [
+      {
+        "uuid": "fd853d8f-e1dd-49b5-b7b3-ae9adfea1e2f",
+        "role": "Owner",
+        "status": "Active"
+      },
+      {
+        "uuid": "6deddbaa-3b94-4373-8cf7-97129507a872",
+        "role": "Unassigned",
+        "status": "Sent invitation"
+      }
+    ]
+  }, {
+    "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
+    "uuid": "551f316d-e414-480f-9787-b4c408db3edd",
+    "id": "make-us-proud",
+    "name": "Make Us Proud",
+    "image": "/static/images/make-us-proud.svg",
+    "members": []
+  }]
+}
\ No newline at end of file
diff --git a/frontend/src/mock-states/testing.js b/frontend/src/mock-states/testing.js
index 9f7d101f..d379d692 100644
--- a/frontend/src/mock-states/testing.js
+++ b/frontend/src/mock-states/testing.js
@@ -7,40 +7,18 @@ import {
   projects,
   instances,
   services,
-  members
+  members,
+  orgs
 } from './shared/index.js';
 
 export default {
-  "account": account,
-  "datacenters": datacenters,
   "monitors": {
     "ui": {
       "page": "create"
     }
   },
-  "metrics": metrics,
   "orgs": {
-    "ui": {
-      "invite_toggled": false,
-      "member_status_tooltip": false,
-      "member_role_tooltip": false,
-      "hide_add_and_manage": true,
-      "sections": [
-        "projects",
-        "people",
-        "settings"
-      ],
-      "members_status": [
-        "Active",
-        "Inactive",
-        "Invitation Sent"
-      ],
-      "members_roles": [
-        "Owner",
-        "Unassigned",
-        "Read Only"
-      ]
-    },
+    "ui": orgs.ui,
     "data": [{
       "hide": [
         "people"
@@ -53,8 +31,11 @@ export default {
       "members": []
     }]
   },
-  "projects": projects,
-  "members": members,
-  "services": services,
-  "instances": instances
+  account,
+  datacenters,
+  metrics,
+  projects,
+  members,
+  services,
+  instances
 }