diff --git a/client/src/components/User/DiskUsage/DiskUsageSummary.vue b/client/src/components/User/DiskUsage/DiskUsageSummary.vue
index a31d69418ac2..213225582f5e 100644
--- a/client/src/components/User/DiskUsage/DiskUsageSummary.vue
+++ b/client/src/components/User/DiskUsage/DiskUsageSummary.vue
@@ -22,7 +22,7 @@ import _l from "utils/localization";
 import { bytesToString } from "utils/utils";
 import CurrentUser from "components/providers/CurrentUser";
 import ConfigProvider from "components/providers/ConfigProvider";
-import QuotaUsageSummary from "components/User/DiskUsage/QuotaUsageSummary";
+import QuotaUsageSummary from "components/User/DiskUsage/Quota/QuotaUsageSummary";
 
 export default {
     components: {
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
index 077cd4ff8a10..305d92e0a265 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
@@ -24,7 +24,7 @@
 import _l from "utils/localization";
 import { bytesToString } from "utils/utils";
 import LoadingSpan from "components/LoadingSpan";
-import { CleanupOperation } from "../../model";
+import { CleanupOperation } from "./model";
 
 export default {
     components: {
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
index e9cfd0863072..9088377c0d2b 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
@@ -18,7 +18,7 @@
 <script>
 import _l from "utils/localization";
 import { bytesToString } from "utils/utils";
-import { CleanupResult } from "../../model";
+import { CleanupResult } from "./model";
 
 export default {
     props: {
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/ResourceCleanupManager.js b/client/src/components/User/DiskUsage/Management/Cleanup/ResourceCleanupManager.js
index 07431c32ea75..87fbdea74e09 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/ResourceCleanupManager.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/ResourceCleanupManager.js
@@ -1,5 +1,5 @@
-import { CleanupCategory } from "../../model";
 import { cleanupCategories } from "./categories";
+import { CleanupCategory } from "./model";
 
 export class ResourceCleanupManager {
     constructor() {
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
index 81c5b213dbce..f72cc361ee6e 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
@@ -73,7 +73,7 @@
 import _l from "utils/localization";
 import { bytesToString } from "utils/utils";
 import UtcDate from "components/UtcDate";
-import { CleanupOperation } from "../../model";
+import { CleanupOperation } from "./model";
 
 export default {
     components: {
diff --git a/client/src/components/User/DiskUsage/model/CleanableSummary.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.js
similarity index 100%
rename from client/src/components/User/DiskUsage/model/CleanableSummary.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.js
diff --git a/client/src/components/User/DiskUsage/model/CleanupCategory.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js
similarity index 93%
rename from client/src/components/User/DiskUsage/model/CleanupCategory.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js
index e8b49be4a6b1..281791fa3f40 100644
--- a/client/src/components/User/DiskUsage/model/CleanupCategory.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js
@@ -1,4 +1,4 @@
-import { CleanupOperation } from "../model";
+import { CleanupOperation } from ".";
 
 export class CleanupCategory {
     constructor(data) {
diff --git a/client/src/components/User/DiskUsage/model/CleanupOperation.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.js
similarity index 100%
rename from client/src/components/User/DiskUsage/model/CleanupOperation.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.js
diff --git a/client/src/components/User/DiskUsage/model/CleanupResult.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.js
similarity index 100%
rename from client/src/components/User/DiskUsage/model/CleanupResult.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.js
diff --git a/client/src/components/User/DiskUsage/model/index.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/index.js
similarity index 100%
rename from client/src/components/User/DiskUsage/model/index.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/index.js
diff --git a/client/src/components/User/DiskUsage/Management/services.js b/client/src/components/User/DiskUsage/Management/services.js
index 111de4f79de0..a667ea18b946 100644
--- a/client/src/components/User/DiskUsage/Management/services.js
+++ b/client/src/components/User/DiskUsage/Management/services.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { getAppRoot } from "onload/loadConfig";
 import { rethrowSimple } from "utils/simple-error";
-import { CleanableSummary, CleanupResult } from "../model";
+import { CleanableSummary, CleanupResult } from "./Cleanup/model";
 
 const datasetKeys = "id,name,size,update_time,hda_ldda";
 const isDataset = "q=history_content_type-eq&qv=dataset";
diff --git a/client/src/components/User/DiskUsage/QuotaUsageSummary.vue b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
similarity index 89%
rename from client/src/components/User/DiskUsage/QuotaUsageSummary.vue
rename to client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
index 6dc991be5799..638693c5ae7f 100644
--- a/client/src/components/User/DiskUsage/QuotaUsageSummary.vue
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
@@ -23,7 +23,7 @@ import { bytesToString } from "utils/utils";
 
 export default {
     props: {
-        user: {
+        quotaUsage: {
             type: Object,
             required: true,
         },
@@ -36,15 +36,15 @@ export default {
     computed: {
         /** @returns {String} */
         totalQuotaString() {
-            return this.user.quota;
+            return this.quotaUsage.quota;
         },
         /** @returns {String} */
         usedQuotaString() {
-            return bytesToString(this.user.total_disk_usage, true);
+            return bytesToString(this.quotaUsage.total_disk_usage, true);
         },
         /** @returns {float} */
         usedQuotaPercent() {
-            return this.user.quota_percent;
+            return this.quotaUsage.quota_percent;
         },
         /** @returns {String} */
         progressVariant() {