diff --git a/src/components/Container/StatsPage.stories.js b/src/components/Container/StatsPage.stories.js
index 50434e30a..0e7b692d5 100644
--- a/src/components/Container/StatsPage.stories.js
+++ b/src/components/Container/StatsPage.stories.js
@@ -1,8 +1,8 @@
 import StatsPage from './StatsPage.vue';
 import StatsEditorialPage from '@/components/Container/StatsEditorialPage.vue';
 import StatsPublicationsPage from '@/components/Container/StatsPublicationsPage.vue';
-import ArticleStatsMock from '@/components/TableNext/mocks/articleStats.js';
-import ArticleStatsColumnsMock from '@/components/TableNext/mocks/articleStatsColumns.js';
+import ArticleStatsMock from '@/components/Table/mocks/articleStats.js';
+import ArticleStatsColumnsMock from '@/components/Table/mocks/articleStatsColumns.js';
 import debounce from 'debounce';
 
 export default {
diff --git a/src/components/Container/StatsPage.vue b/src/components/Container/StatsPage.vue
index f20c15c0c..9f151cdd5 100644
--- a/src/components/Container/StatsPage.vue
+++ b/src/components/Container/StatsPage.vue
@@ -4,12 +4,12 @@ import DateRange from '@/components/DateRange/DateRange.vue';
 import PkpFilter from '@/components/Filter/Filter.vue';
 import Pagination from '@/components/Pagination/Pagination.vue';
 import PkpHeader from '@/components/Header/Header.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import ajaxError from '@/mixins/ajaxError';
 
 export default {
diff --git a/src/components/ListPanel/doi/DoiItemVersionModal.vue b/src/components/ListPanel/doi/DoiItemVersionModal.vue
index 58a29abdc..223ef7a55 100644
--- a/src/components/ListPanel/doi/DoiItemVersionModal.vue
+++ b/src/components/ListPanel/doi/DoiItemVersionModal.vue
@@ -81,12 +81,12 @@
 <script setup>
 import SideModalBody from '@/components/Modal/SideModalBody.vue';
 import SideModalLayoutBasic from '@/components/Modal/SideModalLayoutBasic.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import Spinner from '@/components/Spinner/Spinner.vue';
 import PkpButton from '@/components/Button/Button.vue';
 
diff --git a/src/components/ListPanel/doi/DoiListItem.vue b/src/components/ListPanel/doi/DoiListItem.vue
index 4ea00b61f..476156079 100644
--- a/src/components/ListPanel/doi/DoiListItem.vue
+++ b/src/components/ListPanel/doi/DoiListItem.vue
@@ -197,12 +197,12 @@ import Spinner from '@/components/Spinner/Spinner.vue';
 import PkpButton from '@/components/Button/Button.vue';
 
 import Expander from '@/components/Expander/Expander.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import DoiItemViewErrorDialogBody from './DoiItemViewErrorDialogBody.vue';
 import DoiItemViewRegisteredMessageDialogBody from './DoiItemViewRegisteredMessageDialogBody.vue';
 import DoiItemVersionModal from './DoiItemVersionModal.vue';
diff --git a/src/components/TableNext/Table.mdx b/src/components/Table/Table.mdx
similarity index 100%
rename from src/components/TableNext/Table.mdx
rename to src/components/Table/Table.mdx
diff --git a/src/components/TableNext/Table.stories.js b/src/components/Table/Table.stories.js
similarity index 98%
rename from src/components/TableNext/Table.stories.js
rename to src/components/Table/Table.stories.js
index 8c470aa16..acb3219b3 100644
--- a/src/components/TableNext/Table.stories.js
+++ b/src/components/Table/Table.stories.js
@@ -11,7 +11,7 @@ import TablePagination from './TablePagination.vue';
 import ButtonRow from '@/components/ButtonRow/ButtonRow.vue';
 import {http, HttpResponse} from 'msw';
 
-import articleStats from '@/components/TableNext/mocks/articleStats.js';
+import articleStats from '@/components/Table/mocks/articleStats.js';
 import {useSorting} from '@/composables/useSorting';
 
 import {useFetchPaginated} from '@/composables/useFetchPaginated';
diff --git a/src/components/TableNext/Table.vue b/src/components/Table/Table.vue
similarity index 100%
rename from src/components/TableNext/Table.vue
rename to src/components/Table/Table.vue
diff --git a/src/components/TableNext/TableBody.vue b/src/components/Table/TableBody.vue
similarity index 100%
rename from src/components/TableNext/TableBody.vue
rename to src/components/Table/TableBody.vue
diff --git a/src/components/TableNext/TableCell.vue b/src/components/Table/TableCell.vue
similarity index 100%
rename from src/components/TableNext/TableCell.vue
rename to src/components/Table/TableCell.vue
diff --git a/src/components/TableNext/TableColumn.vue b/src/components/Table/TableColumn.vue
similarity index 100%
rename from src/components/TableNext/TableColumn.vue
rename to src/components/Table/TableColumn.vue
diff --git a/src/components/TableNext/TableHeader.vue b/src/components/Table/TableHeader.vue
similarity index 100%
rename from src/components/TableNext/TableHeader.vue
rename to src/components/Table/TableHeader.vue
diff --git a/src/components/TableNext/TablePagination.vue b/src/components/Table/TablePagination.vue
similarity index 100%
rename from src/components/TableNext/TablePagination.vue
rename to src/components/Table/TablePagination.vue
diff --git a/src/components/TableNext/TableRow.vue b/src/components/Table/TableRow.vue
similarity index 100%
rename from src/components/TableNext/TableRow.vue
rename to src/components/Table/TableRow.vue
diff --git a/src/components/TableNext/mocks/articleStats.js b/src/components/Table/mocks/articleStats.js
similarity index 100%
rename from src/components/TableNext/mocks/articleStats.js
rename to src/components/Table/mocks/articleStats.js
diff --git a/src/components/TableNext/mocks/articleStatsColumns.js b/src/components/Table/mocks/articleStatsColumns.js
similarity index 100%
rename from src/components/TableNext/mocks/articleStatsColumns.js
rename to src/components/Table/mocks/articleStatsColumns.js
diff --git a/src/managers/FileManager/FileManager.vue b/src/managers/FileManager/FileManager.vue
index 090ddce12..2b5766190 100644
--- a/src/managers/FileManager/FileManager.vue
+++ b/src/managers/FileManager/FileManager.vue
@@ -59,10 +59,10 @@ import {inject} from 'vue';
 import {useFileManagerStore} from './fileManagerStore.js';
 import {FileManagerConfigurations} from './useFileManagerConfig.js';
 import PkpButton from '@/components/Button/Button.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
 import FileManagerTableRow from './FileManagerTableRow.vue';
 
 const props = defineProps({
diff --git a/src/managers/FileManager/FileManagerTableRow.vue b/src/managers/FileManager/FileManagerTableRow.vue
index eda9e44de..36be25c35 100644
--- a/src/managers/FileManager/FileManagerTableRow.vue
+++ b/src/managers/FileManager/FileManagerTableRow.vue
@@ -48,8 +48,8 @@
 <script setup>
 import {computed} from 'vue';
 import DropdownActions from '@/components/DropdownActions/DropdownActions.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import Icon from '@/components/Icon/Icon.vue';
 import Badge from '@/components/Badge/Badge.vue';
 
diff --git a/src/managers/ReviewerManager/ReviewerCellActions.vue b/src/managers/ReviewerManager/ReviewerCellActions.vue
index 5ee3a6f4c..b79726075 100644
--- a/src/managers/ReviewerManager/ReviewerCellActions.vue
+++ b/src/managers/ReviewerManager/ReviewerCellActions.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script setup>
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import DropdownActions from '@/components/DropdownActions/DropdownActions.vue';
 import {useReviewerManagerActions} from './useReviewerManagerActions';
 import {computed} from 'vue';
diff --git a/src/managers/ReviewerManager/ReviewerManager.vue b/src/managers/ReviewerManager/ReviewerManager.vue
index 38cfdb2a8..9cb35327f 100644
--- a/src/managers/ReviewerManager/ReviewerManager.vue
+++ b/src/managers/ReviewerManager/ReviewerManager.vue
@@ -55,12 +55,12 @@
 </template>
 
 <script setup>
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import ReviewerCellActions from './ReviewerCellActions.vue';
 import Icon from '@/components/Icon/Icon.vue';
 
diff --git a/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue b/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue
index 498a33f02..b1c6a59be 100644
--- a/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue
+++ b/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue
@@ -29,12 +29,12 @@
 
 <script setup>
 import {useTranslation} from '@/composables/useTranslation';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import {defineProps} from 'vue';
 
 defineProps({
diff --git a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActions.vue b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActions.vue
index 68328cc82..63d0b5036 100644
--- a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActions.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActions.vue
@@ -13,7 +13,7 @@
 <script setup>
 import {defineProps} from 'vue';
 import PkpButton from '@/components/Button/Button.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore.js';
 import {useLocalize} from '@/composables/useLocalize';
 
diff --git a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity.vue b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity.vue
index eeea313e8..8e1b4000e 100644
--- a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentActivity.vue
@@ -20,7 +20,7 @@
 
 <script setup>
 import {defineProps, computed} from 'vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import CellReviewAssignmentActivityAlert from './CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue';
 import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore';
 
diff --git a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentId.vue b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentId.vue
index b5c2bfda2..108347e22 100644
--- a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentId.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentId.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import {defineProps} from 'vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 
 defineProps({
 	item: {type: Object, required: true},
diff --git a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentTitle.vue b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentTitle.vue
index bab2b9890..d5f2de65e 100644
--- a/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentTitle.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellReviewAssignmentTitle.vue
@@ -12,7 +12,7 @@
 import {defineProps, computed} from 'vue';
 import {useLocalize} from '@/composables/useLocalize';
 
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 const {localizeSubmission} = useLocalize();
 
 const props = defineProps({item: {type: Object, required: true}});
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionActions.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionActions.vue
index e748db3ed..443bef1f5 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionActions.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionActions.vue
@@ -13,7 +13,7 @@
 <script setup>
 import {defineProps} from 'vue';
 import PkpButton from '@/components/Button/Button.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore.js';
 
 defineProps({
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivity.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivity.vue
index 9678282e5..95fc52c6a 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivity.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionActivity/CellSubmissionActivity.vue
@@ -25,7 +25,7 @@ import CellSubmissionActivityReviewsUpdate from './CellSubmissionActivityReviews
 import CellSubmissionActivityReviewsOpen from './CellSubmissionActivityReviewsOpen.vue';
 
 import {defineProps, computed} from 'vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 
 import {
 	useDashboardPageStore,
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionDays.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionDays.vue
index 5d303ea96..8537943a1 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionDays.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionDays.vue
@@ -3,7 +3,7 @@
 </template>
 <script setup>
 import {defineProps} from 'vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 
 defineProps({
 	item: {type: Object, required: true},
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionId.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionId.vue
index 9f8f0669a..310cbb9de 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionId.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionId.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import {defineProps} from 'vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 
 defineProps({
 	item: {type: Object, required: true},
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionStage.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionStage.vue
index 6b6449809..3356d18dd 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionStage.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionStage.vue
@@ -11,7 +11,7 @@
 <script setup>
 import {defineProps, computed} from 'vue';
 
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import StageBubble from '@/components/StageBubble/StageBubble.vue';
 import {useSubmission} from '@/composables/useSubmission';
 
diff --git a/src/pages/dashboard/components/DashboardTable/CellSubmissionTitle.vue b/src/pages/dashboard/components/DashboardTable/CellSubmissionTitle.vue
index 5aa0ecd52..6ac0c4be3 100644
--- a/src/pages/dashboard/components/DashboardTable/CellSubmissionTitle.vue
+++ b/src/pages/dashboard/components/DashboardTable/CellSubmissionTitle.vue
@@ -22,7 +22,7 @@
 <script setup>
 import {defineProps, computed} from 'vue';
 import {useSubmission} from '@/composables/useSubmission';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import {useLocalize} from '@/composables/useLocalize';
 const props = defineProps({item: {type: Object, required: true}});
 
diff --git a/src/pages/dashboard/components/DashboardTable/DashboardTable.vue b/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
index fe8ab4e14..c46dee716 100644
--- a/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
+++ b/src/pages/dashboard/components/DashboardTable/DashboardTable.vue
@@ -32,12 +32,12 @@
 
 <script setup>
 import {defineProps} from 'vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
-import TablePagination from '@/components/TableNext/TablePagination.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
+import TablePagination from '@/components/Table/TablePagination.vue';
 
 import CellSubmissionActions from './CellSubmissionActions.vue';
 import CellSubmissionActivity from './CellSubmissionActivity/CellSubmissionActivity.vue';
diff --git a/src/pages/jobs/FailedJobDetailsPage.vue b/src/pages/jobs/FailedJobDetailsPage.vue
index 4936225f7..0bed1ba98 100644
--- a/src/pages/jobs/FailedJobDetailsPage.vue
+++ b/src/pages/jobs/FailedJobDetailsPage.vue
@@ -26,12 +26,12 @@
 </template>
 
 <script>
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 
 export default {
 	name: 'FailedJobDetailsPage',
diff --git a/src/pages/jobs/FailedJobsPage.vue b/src/pages/jobs/FailedJobsPage.vue
index 8dc06805b..a7c10393a 100644
--- a/src/pages/jobs/FailedJobsPage.vue
+++ b/src/pages/jobs/FailedJobsPage.vue
@@ -55,12 +55,12 @@
 </template>
 <script>
 import JobsPageBase from './JobsPageBase.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import Pagination from '@/components/Pagination/Pagination.vue';
 import ButtonRow from '@/components/ButtonRow/ButtonRow.vue';
 import Spinner from '@/components/Spinner/Spinner.vue';
diff --git a/src/pages/jobs/JobsPage.vue b/src/pages/jobs/JobsPage.vue
index 442006a50..3f8cb0231 100644
--- a/src/pages/jobs/JobsPage.vue
+++ b/src/pages/jobs/JobsPage.vue
@@ -37,12 +37,12 @@
 
 <script>
 import JobsPageBase from './JobsPageBase.vue';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
+import TableCell from '@/components/Table/TableCell.vue';
 import Pagination from '@/components/Pagination/Pagination.vue';
 
 export default {
diff --git a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
index d2a028304..6c6cd5456 100644
--- a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
+++ b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
@@ -100,12 +100,12 @@
 <script setup>
 import {computed} from 'vue';
 import {useTranslation} from '@/composables/useTranslation';
-import PkpTable from '@/components/TableNext/Table.vue';
-import TableCell from '@/components/TableNext/TableCell.vue';
-import TableHeader from '@/components/TableNext/TableHeader.vue';
-import TableColumn from '@/components/TableNext/TableColumn.vue';
-import TableBody from '@/components/TableNext/TableBody.vue';
-import TableRow from '@/components/TableNext/TableRow.vue';
+import PkpTable from '@/components/Table/Table.vue';
+import TableCell from '@/components/Table/TableCell.vue';
+import TableHeader from '@/components/Table/TableHeader.vue';
+import TableColumn from '@/components/Table/TableColumn.vue';
+import TableBody from '@/components/Table/TableBody.vue';
+import TableRow from '@/components/Table/TableRow.vue';
 import FieldSelect from '@/components/Form/fields/FieldSelect.vue';
 import PkpButton from '@/components/Button/Button.vue';
 import FieldText from '@/components/Form/fields/FieldText.vue';