diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index a85649223..3aaea25d1 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index d436c6471..0df534c3d 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index cc81df960..1aa99dc9e 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index a644951c3..59772936e 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index b705bb410..e602898ac 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 7de8cde6e..421519913 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index 6ab0248cd..e9bf72f06 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 3663461f5..722189f69 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 9b6b68e18..3b46f4c6d 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index 979eaa30b..2c2f0202f 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 774c57779..b30b09bcc 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 5acd45c76..17146fc22 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index a3d67024c..8c7b3c33f 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index 064ebace2..ebe68ece7 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 4a731e12a..fe4069d69 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index fd32830a1..d7f49b21d 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 0de8a8e38..270fb1afd 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index 47a69db26..44d13ee41 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
index f50e6a505..979e55ec4 100644
--- a/src/views/tickets/TicketsList.vue
+++ b/src/views/tickets/TicketsList.vue
@@ -11,7 +11,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {