diff --git a/ui-v2/tests/pages/components/auth-form.js b/ui-v2/app/components/auth-form/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/auth-form.js
rename to ui-v2/app/components/auth-form/pageobject.js
diff --git a/ui-v2/tests/pages/components/consul-intention-list.js b/ui-v2/app/components/consul-intention-list/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/consul-intention-list.js
rename to ui-v2/app/components/consul-intention-list/pageobject.js
diff --git a/ui-v2/app/components/freetext-filter/pageobject.js b/ui-v2/app/components/freetext-filter/pageobject.js
new file mode 100644
index 0000000000..2dae766692
--- /dev/null
+++ b/ui-v2/app/components/freetext-filter/pageobject.js
@@ -0,0 +1,7 @@
+export default triggerable => () => {
+  return {
+    ...{
+      search: triggerable('keypress', '[name="s"]'),
+    },
+  };
+};
diff --git a/ui-v2/tests/pages/components/page.js b/ui-v2/app/components/hashicorp-consul/pageobject.js
similarity index 95%
rename from ui-v2/tests/pages/components/page.js
rename to ui-v2/app/components/hashicorp-consul/pageobject.js
index 6bac5b0b7a..187a7b3673 100644
--- a/ui-v2/tests/pages/components/page.js
+++ b/ui-v2/app/components/hashicorp-consul/pageobject.js
@@ -34,6 +34,7 @@ export default (clickable, attribute, is, authForm) => scope => {
     authdialog: {
       form: authForm(),
     },
+    // TODO: errors aren't strictly part of this component
     error: {
       status: attribute('data-test-status', '[data-test-status]'),
     },
diff --git a/ui-v2/tests/pages/components/policy-form.js b/ui-v2/app/components/policy-form/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/policy-form.js
rename to ui-v2/app/components/policy-form/pageobject.js
diff --git a/ui-v2/tests/pages/components/policy-selector.js b/ui-v2/app/components/policy-selector/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/policy-selector.js
rename to ui-v2/app/components/policy-selector/pageobject.js
diff --git a/ui-v2/tests/pages/components/popover-sort.js b/ui-v2/app/components/popover-sort/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/popover-sort.js
rename to ui-v2/app/components/popover-sort/pageobject.js
diff --git a/ui-v2/tests/lib/page-object/radiogroup.js b/ui-v2/app/components/radio-group/pageobject.js
similarity index 100%
rename from ui-v2/tests/lib/page-object/radiogroup.js
rename to ui-v2/app/components/radio-group/pageobject.js
diff --git a/ui-v2/tests/pages/components/role-form.js b/ui-v2/app/components/role-form/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/role-form.js
rename to ui-v2/app/components/role-form/pageobject.js
diff --git a/ui-v2/tests/pages/components/role-selector.js b/ui-v2/app/components/role-selector/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/role-selector.js
rename to ui-v2/app/components/role-selector/pageobject.js
diff --git a/ui-v2/app/components/search-bar/pageobject.js b/ui-v2/app/components/search-bar/pageobject.js
new file mode 100644
index 0000000000..3630864630
--- /dev/null
+++ b/ui-v2/app/components/search-bar/pageobject.js
@@ -0,0 +1,7 @@
+export default (search, secondary = () => {}) => scope => {
+  return {
+    scope: scope,
+    ...search(),
+    ...secondary(),
+  };
+};
diff --git a/ui-v2/tests/lib/page-object/tabgroup.js b/ui-v2/app/components/tab-nav/pageobject.js
similarity index 100%
rename from ui-v2/tests/lib/page-object/tabgroup.js
rename to ui-v2/app/components/tab-nav/pageobject.js
diff --git a/ui-v2/tests/pages/components/token-list.js b/ui-v2/app/components/token-list/pageobject.js
similarity index 100%
rename from ui-v2/tests/pages/components/token-list.js
rename to ui-v2/app/components/token-list/pageobject.js
diff --git a/ui-v2/tests/pages.js b/ui-v2/tests/pages.js
index 177f6ef115..58371c0875 100644
--- a/ui-v2/tests/pages.js
+++ b/ui-v2/tests/pages.js
@@ -6,36 +6,37 @@ import {
   collection,
   text,
   isPresent,
+  triggerable,
 } from 'ember-cli-page-object';
+
 import { alias } from 'ember-cli-page-object/macros';
 import { visitable } from 'consul-ui/tests/lib/page-object/visitable';
+
+// utils
 import createDeletable from 'consul-ui/tests/lib/page-object/createDeletable';
 import createSubmitable from 'consul-ui/tests/lib/page-object/createSubmitable';
 import createCreatable from 'consul-ui/tests/lib/page-object/createCreatable';
 import createCancelable from 'consul-ui/tests/lib/page-object/createCancelable';
 
-// TODO: All component-like page objects should be moved into the component folder
-// along with all of its other dependencies once we can mae ember-cli ignore them
-import radiogroup from 'consul-ui/tests/lib/page-object/radiogroup';
-import tabgroup from 'consul-ui/tests/lib/page-object/tabgroup';
-import freetextFilter from 'consul-ui/tests/pages/components/freetext-filter';
-import catalogFilter from 'consul-ui/tests/pages/components/catalog-filter';
-import catalogToolbar from 'consul-ui/tests/pages/components/catalog-toolbar';
-import popoverSort from 'consul-ui/tests/pages/components/popover-sort';
-import aclFilter from 'consul-ui/tests/pages/components/acl-filter';
-import intentionFilter from 'consul-ui/tests/pages/components/intention-filter';
-import tokenListFactory from 'consul-ui/tests/pages/components/token-list';
-import policyFormFactory from 'consul-ui/tests/pages/components/policy-form';
-import policySelectorFactory from 'consul-ui/tests/pages/components/policy-selector';
-import roleFormFactory from 'consul-ui/tests/pages/components/role-form';
-import roleSelectorFactory from 'consul-ui/tests/pages/components/role-selector';
-import pageFactory from 'consul-ui/tests/pages/components/page';
-import consulIntentionListFactory from 'consul-ui/tests/pages/components/consul-intention-list';
-import authFormFactory from 'consul-ui/tests/pages/components/auth-form';
+// components
+import pageFactory from 'consul-ui/components/hashicorp-consul/pageobject';
 
-// TODO: should this specifically be modal or form?
-// should all forms be forms?
+import radiogroup from 'consul-ui/components/radio-group/pageobject';
+import tabgroup from 'consul-ui/components/tab-nav/pageobject';
+import popoverSort from 'consul-ui/components/popover-sort/pageobject';
+import authFormFactory from 'consul-ui/components/auth-form/pageobject';
+import freetextFilterFactory from 'consul-ui/components/freetext-filter/pageobject';
 
+import searchBarFactory from 'consul-ui/components/search-bar/pageobject';
+
+import policyFormFactory from 'consul-ui/components/policy-form/pageobject';
+import policySelectorFactory from 'consul-ui/components/policy-selector/pageobject';
+import roleFormFactory from 'consul-ui/components/role-form/pageobject';
+import roleSelectorFactory from 'consul-ui/components/role-selector/pageobject';
+import tokenListFactory from 'consul-ui/components/token-list/pageobject';
+import consulIntentionListFactory from 'consul-ui/components/consul-intention-list/pageobject';
+
+// pages
 import index from 'consul-ui/tests/pages/index';
 import dcs from 'consul-ui/tests/pages/dc';
 import settings from 'consul-ui/tests/pages/settings';
@@ -59,23 +60,36 @@ import intention from 'consul-ui/tests/pages/dc/intentions/edit';
 import nspaces from 'consul-ui/tests/pages/dc/nspaces/index';
 import nspace from 'consul-ui/tests/pages/dc/nspaces/edit';
 
+// utils
 const deletable = createDeletable(clickable);
 const submitable = createSubmitable(clickable, is);
 const creatable = createCreatable(clickable, is);
 const cancelable = createCancelable(clickable, is);
 
+// components
 const tokenList = tokenListFactory(clickable, attribute, collection, deletable);
+const authForm = authFormFactory(submitable, clickable, attribute);
+const freetextFilter = freetextFilterFactory(triggerable);
+const catalogToolbar = searchBarFactory(freetextFilter);
+const catalogFilter = searchBarFactory(freetextFilter, () =>
+  radiogroup('status', ['', 'passing', 'warning', 'critical'])
+);
+const aclFilter = searchBarFactory(freetextFilter, () =>
+  radiogroup('type', ['', 'management', 'client'])
+);
+const intentionFilter = searchBarFactory(freetextFilter, () =>
+  radiogroup('currentFilter', ['', 'allow', 'deny'])
+);
 
 const policyForm = policyFormFactory(submitable, cancelable, radiogroup, text);
 const policySelector = policySelectorFactory(clickable, deletable, collection, alias, policyForm);
-
 const roleForm = roleFormFactory(submitable, cancelable, policySelector);
 const roleSelector = roleSelectorFactory(clickable, deletable, collection, alias, roleForm);
-
 const consulIntentionList = consulIntentionListFactory(collection, clickable, attribute, deletable);
-const authForm = authFormFactory(submitable, clickable, attribute);
+
 const page = pageFactory(clickable, attribute, is, authForm);
 
+// pages
 const create = function(appView) {
   appView = {
     ...page(),
diff --git a/ui-v2/tests/pages/components/acl-filter.js b/ui-v2/tests/pages/components/acl-filter.js
deleted file mode 100644
index 057c5bc1fc..0000000000
--- a/ui-v2/tests/pages/components/acl-filter.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { triggerable } from 'ember-cli-page-object';
-import radiogroup from 'consul-ui/tests/lib/page-object/radiogroup';
-export default {
-  ...radiogroup('type', ['', 'management', 'client']),
-  ...{
-    scope: '[data-test-acl-filter]',
-    search: triggerable('keypress', '[name="s"]'),
-  },
-};
diff --git a/ui-v2/tests/pages/components/catalog-filter.js b/ui-v2/tests/pages/components/catalog-filter.js
deleted file mode 100644
index 3154711861..0000000000
--- a/ui-v2/tests/pages/components/catalog-filter.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { triggerable } from 'ember-cli-page-object';
-import radiogroup from 'consul-ui/tests/lib/page-object/radiogroup';
-export default {
-  ...radiogroup('status', ['', 'passing', 'warning', 'critical']),
-  ...{
-    scope: '[data-test-catalog-filter]',
-    search: triggerable('keypress', '[name="s"]'),
-  },
-};
diff --git a/ui-v2/tests/pages/components/catalog-toolbar.js b/ui-v2/tests/pages/components/catalog-toolbar.js
deleted file mode 100644
index 76fda01024..0000000000
--- a/ui-v2/tests/pages/components/catalog-toolbar.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { triggerable } from 'ember-cli-page-object';
-export default {
-  search: triggerable('keypress', '[name="s"]'),
-};
diff --git a/ui-v2/tests/pages/components/freetext-filter.js b/ui-v2/tests/pages/components/freetext-filter.js
deleted file mode 100644
index 76fda01024..0000000000
--- a/ui-v2/tests/pages/components/freetext-filter.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { triggerable } from 'ember-cli-page-object';
-export default {
-  search: triggerable('keypress', '[name="s"]'),
-};
diff --git a/ui-v2/tests/pages/components/intention-filter.js b/ui-v2/tests/pages/components/intention-filter.js
deleted file mode 100644
index 9b9ddd4c63..0000000000
--- a/ui-v2/tests/pages/components/intention-filter.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { triggerable } from 'ember-cli-page-object';
-import radiogroup from 'consul-ui/tests/lib/page-object/radiogroup';
-export default {
-  ...radiogroup('currentFilter', ['', 'allow', 'deny']),
-  ...{
-    scope: '[data-test-intention-filter]',
-    search: triggerable('keypress', '[name="s"]'),
-  },
-};
diff --git a/ui-v2/tests/pages/dc/acls/index.js b/ui-v2/tests/pages/dc/acls/index.js
index 39d851965b..a460f81dda 100644
--- a/ui-v2/tests/pages/dc/acls/index.js
+++ b/ui-v2/tests/pages/dc/acls/index.js
@@ -11,6 +11,6 @@ export default function(visitable, deletable, creatable, clickable, attribute, c
         confirmUse: clickable('[data-test-confirm-use]'),
       })
     ),
-    filter: filter,
+    filter: filter('[data-test-acl-filter]'),
   });
 }
diff --git a/ui-v2/tests/pages/dc/acls/policies/index.js b/ui-v2/tests/pages/dc/acls/policies/index.js
index 60a303a955..3bf96bf1a4 100644
--- a/ui-v2/tests/pages/dc/acls/policies/index.js
+++ b/ui-v2/tests/pages/dc/acls/policies/index.js
@@ -19,6 +19,6 @@ export default function(
         actions: clickable('label'),
       })
     ),
-    filter: filter,
+    filter: filter(),
   });
 }
diff --git a/ui-v2/tests/pages/dc/acls/roles/index.js b/ui-v2/tests/pages/dc/acls/roles/index.js
index cae2c9a06e..35b6659929 100644
--- a/ui-v2/tests/pages/dc/acls/roles/index.js
+++ b/ui-v2/tests/pages/dc/acls/roles/index.js
@@ -20,6 +20,6 @@ export default function(
         actions: clickable('label'),
       })
     ),
-    filter: filter,
+    filter: filter(),
   });
 }
diff --git a/ui-v2/tests/pages/dc/acls/tokens/index.js b/ui-v2/tests/pages/dc/acls/tokens/index.js
index 8b02b6bbb3..f611ee1721 100644
--- a/ui-v2/tests/pages/dc/acls/tokens/index.js
+++ b/ui-v2/tests/pages/dc/acls/tokens/index.js
@@ -28,7 +28,7 @@ export default function(
           clone: clickable('[data-test-clone]'),
         })
       ),
-      filter: filter,
+      filter: filter(),
     })
   );
 }
diff --git a/ui-v2/tests/pages/dc/intentions/index.js b/ui-v2/tests/pages/dc/intentions/index.js
index 0a0ba2e50c..e925ad1fc9 100644
--- a/ui-v2/tests/pages/dc/intentions/index.js
+++ b/ui-v2/tests/pages/dc/intentions/index.js
@@ -2,6 +2,6 @@ export default function(visitable, creatable, intentions, filter) {
   return creatable({
     visit: visitable('/:dc/intentions'),
     intentions: intentions(),
-    filter: filter,
+    filter: filter('[data-test-intention-filter]'),
   });
 }
diff --git a/ui-v2/tests/pages/dc/nodes/index.js b/ui-v2/tests/pages/dc/nodes/index.js
index 25045ec388..335c87afe3 100644
--- a/ui-v2/tests/pages/dc/nodes/index.js
+++ b/ui-v2/tests/pages/dc/nodes/index.js
@@ -9,6 +9,6 @@ export default function(visitable, clickable, attribute, collection, filter) {
     nodes: collection('[data-test-node]', node),
     healthyNodes: collection('.healthy [data-test-node]', node),
     unHealthyNodes: collection('.unhealthy [data-test-node]', node),
-    filter: filter,
+    filter: filter('[data-test-catalog-filter]'),
   };
 }
diff --git a/ui-v2/tests/pages/dc/nspaces/index.js b/ui-v2/tests/pages/dc/nspaces/index.js
index 531594c77f..b09d00999f 100644
--- a/ui-v2/tests/pages/dc/nspaces/index.js
+++ b/ui-v2/tests/pages/dc/nspaces/index.js
@@ -19,6 +19,6 @@ export default function(
         actions: clickable('label'),
       })
     ),
-    filter: filter,
+    filter: filter(),
   });
 }
diff --git a/ui-v2/tests/pages/dc/services/show.js b/ui-v2/tests/pages/dc/services/show.js
index 9483168274..e9b101bab9 100644
--- a/ui-v2/tests/pages/dc/services/show.js
+++ b/ui-v2/tests/pages/dc/services/show.js
@@ -15,7 +15,7 @@ export default function(visitable, attribute, collection, text, intentions, filt
       'routing',
       'tags',
     ]),
-    filter: filter,
+    filter: filter(),
 
     // TODO: These need to somehow move to subpages
     instances: collection('.consul-service-instance-list > ul > li:not(:first-child)', {