diff --git a/dashboard/index.html b/dashboard/index.html index a95bde5..fb90f09 100644 --- a/dashboard/index.html +++ b/dashboard/index.html @@ -29,6 +29,6 @@ {% endfor %} - + diff --git a/dashboard/jsconfig.json b/dashboard/jsconfig.json index 64c293b..c28a1c8 100644 --- a/dashboard/jsconfig.json +++ b/dashboard/jsconfig.json @@ -1,9 +1,9 @@ { - "include": ["./src2/**/*"], + "include": ["./src/**/*"], "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": ["src2/*"] + "@/*": ["src/*"] } } } diff --git a/dashboard/package.json b/dashboard/package.json index df0803d..c18f144 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -10,7 +10,7 @@ "generate-theme-config": "node ./generateThemeConfig.cjs", "test": "vitest", "coverage": "vitest run --coverage", - "lint": "eslint src2" + "lint": "eslint src" }, "dependencies": { "@codemirror/autocomplete": "^6.18.1", diff --git a/dashboard/src2/App.vue b/dashboard/src/App.vue similarity index 100% rename from dashboard/src2/App.vue rename to dashboard/src/App.vue diff --git a/dashboard/src2/assets/404.png b/dashboard/src/assets/404.png similarity index 100% rename from dashboard/src2/assets/404.png rename to dashboard/src/assets/404.png diff --git a/dashboard/src2/assets/Inter/Inter-Black.woff b/dashboard/src/assets/Inter/Inter-Black.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Black.woff rename to dashboard/src/assets/Inter/Inter-Black.woff diff --git a/dashboard/src2/assets/Inter/Inter-Black.woff2 b/dashboard/src/assets/Inter/Inter-Black.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Black.woff2 rename to dashboard/src/assets/Inter/Inter-Black.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-BlackItalic.woff b/dashboard/src/assets/Inter/Inter-BlackItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-BlackItalic.woff rename to dashboard/src/assets/Inter/Inter-BlackItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-BlackItalic.woff2 b/dashboard/src/assets/Inter/Inter-BlackItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-BlackItalic.woff2 rename to dashboard/src/assets/Inter/Inter-BlackItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Bold.woff b/dashboard/src/assets/Inter/Inter-Bold.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Bold.woff rename to dashboard/src/assets/Inter/Inter-Bold.woff diff --git a/dashboard/src2/assets/Inter/Inter-Bold.woff2 b/dashboard/src/assets/Inter/Inter-Bold.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Bold.woff2 rename to dashboard/src/assets/Inter/Inter-Bold.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-BoldItalic.woff b/dashboard/src/assets/Inter/Inter-BoldItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-BoldItalic.woff rename to dashboard/src/assets/Inter/Inter-BoldItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-BoldItalic.woff2 b/dashboard/src/assets/Inter/Inter-BoldItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-BoldItalic.woff2 rename to dashboard/src/assets/Inter/Inter-BoldItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-ExtraBold.woff b/dashboard/src/assets/Inter/Inter-ExtraBold.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraBold.woff rename to dashboard/src/assets/Inter/Inter-ExtraBold.woff diff --git a/dashboard/src2/assets/Inter/Inter-ExtraBold.woff2 b/dashboard/src/assets/Inter/Inter-ExtraBold.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraBold.woff2 rename to dashboard/src/assets/Inter/Inter-ExtraBold.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-ExtraBoldItalic.woff b/dashboard/src/assets/Inter/Inter-ExtraBoldItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraBoldItalic.woff rename to dashboard/src/assets/Inter/Inter-ExtraBoldItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-ExtraBoldItalic.woff2 b/dashboard/src/assets/Inter/Inter-ExtraBoldItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraBoldItalic.woff2 rename to dashboard/src/assets/Inter/Inter-ExtraBoldItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-ExtraLight.woff b/dashboard/src/assets/Inter/Inter-ExtraLight.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraLight.woff rename to dashboard/src/assets/Inter/Inter-ExtraLight.woff diff --git a/dashboard/src2/assets/Inter/Inter-ExtraLight.woff2 b/dashboard/src/assets/Inter/Inter-ExtraLight.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraLight.woff2 rename to dashboard/src/assets/Inter/Inter-ExtraLight.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-ExtraLightItalic.woff b/dashboard/src/assets/Inter/Inter-ExtraLightItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraLightItalic.woff rename to dashboard/src/assets/Inter/Inter-ExtraLightItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-ExtraLightItalic.woff2 b/dashboard/src/assets/Inter/Inter-ExtraLightItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ExtraLightItalic.woff2 rename to dashboard/src/assets/Inter/Inter-ExtraLightItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Italic.woff b/dashboard/src/assets/Inter/Inter-Italic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Italic.woff rename to dashboard/src/assets/Inter/Inter-Italic.woff diff --git a/dashboard/src2/assets/Inter/Inter-Italic.woff2 b/dashboard/src/assets/Inter/Inter-Italic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Italic.woff2 rename to dashboard/src/assets/Inter/Inter-Italic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Light.woff b/dashboard/src/assets/Inter/Inter-Light.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Light.woff rename to dashboard/src/assets/Inter/Inter-Light.woff diff --git a/dashboard/src2/assets/Inter/Inter-Light.woff2 b/dashboard/src/assets/Inter/Inter-Light.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Light.woff2 rename to dashboard/src/assets/Inter/Inter-Light.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-LightItalic.woff b/dashboard/src/assets/Inter/Inter-LightItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-LightItalic.woff rename to dashboard/src/assets/Inter/Inter-LightItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-LightItalic.woff2 b/dashboard/src/assets/Inter/Inter-LightItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-LightItalic.woff2 rename to dashboard/src/assets/Inter/Inter-LightItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Medium.woff b/dashboard/src/assets/Inter/Inter-Medium.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Medium.woff rename to dashboard/src/assets/Inter/Inter-Medium.woff diff --git a/dashboard/src2/assets/Inter/Inter-Medium.woff2 b/dashboard/src/assets/Inter/Inter-Medium.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Medium.woff2 rename to dashboard/src/assets/Inter/Inter-Medium.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-MediumItalic.woff b/dashboard/src/assets/Inter/Inter-MediumItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-MediumItalic.woff rename to dashboard/src/assets/Inter/Inter-MediumItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-MediumItalic.woff2 b/dashboard/src/assets/Inter/Inter-MediumItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-MediumItalic.woff2 rename to dashboard/src/assets/Inter/Inter-MediumItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Regular.woff b/dashboard/src/assets/Inter/Inter-Regular.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Regular.woff rename to dashboard/src/assets/Inter/Inter-Regular.woff diff --git a/dashboard/src2/assets/Inter/Inter-Regular.woff2 b/dashboard/src/assets/Inter/Inter-Regular.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Regular.woff2 rename to dashboard/src/assets/Inter/Inter-Regular.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-SemiBold.woff b/dashboard/src/assets/Inter/Inter-SemiBold.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-SemiBold.woff rename to dashboard/src/assets/Inter/Inter-SemiBold.woff diff --git a/dashboard/src2/assets/Inter/Inter-SemiBold.woff2 b/dashboard/src/assets/Inter/Inter-SemiBold.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-SemiBold.woff2 rename to dashboard/src/assets/Inter/Inter-SemiBold.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-SemiBoldItalic.woff b/dashboard/src/assets/Inter/Inter-SemiBoldItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-SemiBoldItalic.woff rename to dashboard/src/assets/Inter/Inter-SemiBoldItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-SemiBoldItalic.woff2 b/dashboard/src/assets/Inter/Inter-SemiBoldItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-SemiBoldItalic.woff2 rename to dashboard/src/assets/Inter/Inter-SemiBoldItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-Thin.woff b/dashboard/src/assets/Inter/Inter-Thin.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Thin.woff rename to dashboard/src/assets/Inter/Inter-Thin.woff diff --git a/dashboard/src2/assets/Inter/Inter-Thin.woff2 b/dashboard/src/assets/Inter/Inter-Thin.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-Thin.woff2 rename to dashboard/src/assets/Inter/Inter-Thin.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-ThinItalic.woff b/dashboard/src/assets/Inter/Inter-ThinItalic.woff similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ThinItalic.woff rename to dashboard/src/assets/Inter/Inter-ThinItalic.woff diff --git a/dashboard/src2/assets/Inter/Inter-ThinItalic.woff2 b/dashboard/src/assets/Inter/Inter-ThinItalic.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-ThinItalic.woff2 rename to dashboard/src/assets/Inter/Inter-ThinItalic.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-italic.var.woff2 b/dashboard/src/assets/Inter/Inter-italic.var.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-italic.var.woff2 rename to dashboard/src/assets/Inter/Inter-italic.var.woff2 diff --git a/dashboard/src2/assets/Inter/Inter-roman.var.woff2 b/dashboard/src/assets/Inter/Inter-roman.var.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter-roman.var.woff2 rename to dashboard/src/assets/Inter/Inter-roman.var.woff2 diff --git a/dashboard/src2/assets/Inter/Inter.var.woff2 b/dashboard/src/assets/Inter/Inter.var.woff2 similarity index 100% rename from dashboard/src2/assets/Inter/Inter.var.woff2 rename to dashboard/src/assets/Inter/Inter.var.woff2 diff --git a/dashboard/src2/assets/Inter/inter.css b/dashboard/src/assets/Inter/inter.css similarity index 100% rename from dashboard/src2/assets/Inter/inter.css rename to dashboard/src/assets/Inter/inter.css diff --git a/dashboard/src2/assets/jerp-logo.svg b/dashboard/src/assets/jerp-logo.svg similarity index 100% rename from dashboard/src2/assets/jerp-logo.svg rename to dashboard/src/assets/jerp-logo.svg diff --git a/dashboard/src2/assets/jingrow-cloud.svg b/dashboard/src/assets/jingrow-cloud.svg similarity index 100% rename from dashboard/src2/assets/jingrow-cloud.svg rename to dashboard/src/assets/jingrow-cloud.svg diff --git a/dashboard/src2/assets/jingrow-framework-logo.png b/dashboard/src/assets/jingrow-framework-logo.png similarity index 100% rename from dashboard/src2/assets/jingrow-framework-logo.png rename to dashboard/src/assets/jingrow-framework-logo.png diff --git a/dashboard/src2/assets/razorpay.svg b/dashboard/src/assets/razorpay.svg similarity index 100% rename from dashboard/src2/assets/razorpay.svg rename to dashboard/src/assets/razorpay.svg diff --git a/dashboard/src2/assets/stripe.svg b/dashboard/src/assets/stripe.svg similarity index 100% rename from dashboard/src2/assets/stripe.svg rename to dashboard/src/assets/stripe.svg diff --git a/dashboard/src2/assets/style.css b/dashboard/src/assets/style.css similarity index 100% rename from dashboard/src2/assets/style.css rename to dashboard/src/assets/style.css diff --git a/dashboard/src2/components/ActionButton.vue b/dashboard/src/components/ActionButton.vue similarity index 100% rename from dashboard/src2/components/ActionButton.vue rename to dashboard/src/components/ActionButton.vue diff --git a/dashboard/src2/components/ActiveServersDialog.vue b/dashboard/src/components/ActiveServersDialog.vue similarity index 100% rename from dashboard/src2/components/ActiveServersDialog.vue rename to dashboard/src/components/ActiveServersDialog.vue diff --git a/dashboard/src2/components/AddDomainDialog.vue b/dashboard/src/components/AddDomainDialog.vue similarity index 100% rename from dashboard/src2/components/AddDomainDialog.vue rename to dashboard/src/components/AddDomainDialog.vue diff --git a/dashboard/src2/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue similarity index 100% rename from dashboard/src2/components/AddTagDialog.vue rename to dashboard/src/components/AddTagDialog.vue diff --git a/dashboard/src2/components/AddressForm.vue b/dashboard/src/components/AddressForm.vue similarity index 100% rename from dashboard/src2/components/AddressForm.vue rename to dashboard/src/components/AddressForm.vue diff --git a/dashboard/src2/components/AddressableErrorDialog.vue b/dashboard/src/components/AddressableErrorDialog.vue similarity index 100% rename from dashboard/src2/components/AddressableErrorDialog.vue rename to dashboard/src/components/AddressableErrorDialog.vue diff --git a/dashboard/src2/components/AlertAddPaymentMode.vue b/dashboard/src/components/AlertAddPaymentMode.vue similarity index 100% rename from dashboard/src2/components/AlertAddPaymentMode.vue rename to dashboard/src/components/AlertAddPaymentMode.vue diff --git a/dashboard/src2/components/AlertAddressDetails.vue b/dashboard/src/components/AlertAddressDetails.vue similarity index 100% rename from dashboard/src2/components/AlertAddressDetails.vue rename to dashboard/src/components/AlertAddressDetails.vue diff --git a/dashboard/src2/components/AlertAddressableError.vue b/dashboard/src/components/AlertAddressableError.vue similarity index 100% rename from dashboard/src2/components/AlertAddressableError.vue rename to dashboard/src/components/AlertAddressableError.vue diff --git a/dashboard/src2/components/AlertBanner.vue b/dashboard/src/components/AlertBanner.vue similarity index 100% rename from dashboard/src2/components/AlertBanner.vue rename to dashboard/src/components/AlertBanner.vue diff --git a/dashboard/src2/components/AlertBenchUpdate.vue b/dashboard/src/components/AlertBenchUpdate.vue similarity index 100% rename from dashboard/src2/components/AlertBenchUpdate.vue rename to dashboard/src/components/AlertBenchUpdate.vue diff --git a/dashboard/src2/components/AlertBillingInformation.vue b/dashboard/src/components/AlertBillingInformation.vue similarity index 100% rename from dashboard/src2/components/AlertBillingInformation.vue rename to dashboard/src/components/AlertBillingInformation.vue diff --git a/dashboard/src2/components/AlertCardExpired.vue b/dashboard/src/components/AlertCardExpired.vue similarity index 100% rename from dashboard/src2/components/AlertCardExpired.vue rename to dashboard/src/components/AlertCardExpired.vue diff --git a/dashboard/src2/components/AlertMandateInfo.vue b/dashboard/src/components/AlertMandateInfo.vue similarity index 100% rename from dashboard/src2/components/AlertMandateInfo.vue rename to dashboard/src/components/AlertMandateInfo.vue diff --git a/dashboard/src2/components/AlertSiteActivation.vue b/dashboard/src/components/AlertSiteActivation.vue similarity index 100% rename from dashboard/src2/components/AlertSiteActivation.vue rename to dashboard/src/components/AlertSiteActivation.vue diff --git a/dashboard/src2/components/AlertSiteUpdate.vue b/dashboard/src/components/AlertSiteUpdate.vue similarity index 100% rename from dashboard/src2/components/AlertSiteUpdate.vue rename to dashboard/src/components/AlertSiteUpdate.vue diff --git a/dashboard/src2/components/AlertUnpaidInvoices.vue b/dashboard/src/components/AlertUnpaidInvoices.vue similarity index 100% rename from dashboard/src2/components/AlertUnpaidInvoices.vue rename to dashboard/src/components/AlertUnpaidInvoices.vue diff --git a/dashboard/src2/components/AlertUpdate.vue b/dashboard/src/components/AlertUpdate.vue similarity index 100% rename from dashboard/src2/components/AlertUpdate.vue rename to dashboard/src/components/AlertUpdate.vue diff --git a/dashboard/src2/components/AppPlanCard.vue b/dashboard/src/components/AppPlanCard.vue similarity index 100% rename from dashboard/src2/components/AppPlanCard.vue rename to dashboard/src/components/AppPlanCard.vue diff --git a/dashboard/src2/components/AppSidebar.vue b/dashboard/src/components/AppSidebar.vue similarity index 100% rename from dashboard/src2/components/AppSidebar.vue rename to dashboard/src/components/AppSidebar.vue diff --git a/dashboard/src2/components/AppSidebarItem.vue b/dashboard/src/components/AppSidebarItem.vue similarity index 100% rename from dashboard/src2/components/AppSidebarItem.vue rename to dashboard/src/components/AppSidebarItem.vue diff --git a/dashboard/src2/components/AppSidebarItemGroup.vue b/dashboard/src/components/AppSidebarItemGroup.vue similarity index 100% rename from dashboard/src2/components/AppSidebarItemGroup.vue rename to dashboard/src/components/AppSidebarItemGroup.vue diff --git a/dashboard/src2/components/AppSourceSelector.vue b/dashboard/src/components/AppSourceSelector.vue similarity index 100% rename from dashboard/src2/components/AppSourceSelector.vue rename to dashboard/src/components/AppSourceSelector.vue diff --git a/dashboard/src2/components/AppSubscriptionSummary.vue b/dashboard/src/components/AppSubscriptionSummary.vue similarity index 100% rename from dashboard/src2/components/AppSubscriptionSummary.vue rename to dashboard/src/components/AppSubscriptionSummary.vue diff --git a/dashboard/src2/components/AppTrialSubscriptionDialog.vue b/dashboard/src/components/AppTrialSubscriptionDialog.vue similarity index 100% rename from dashboard/src2/components/AppTrialSubscriptionDialog.vue rename to dashboard/src/components/AppTrialSubscriptionDialog.vue diff --git a/dashboard/src2/components/AppUpdateCard.vue b/dashboard/src/components/AppUpdateCard.vue similarity index 100% rename from dashboard/src2/components/AppUpdateCard.vue rename to dashboard/src/components/AppUpdateCard.vue diff --git a/dashboard/src2/components/Autocomplete.vue b/dashboard/src/components/Autocomplete.vue similarity index 100% rename from dashboard/src2/components/Autocomplete.vue rename to dashboard/src/components/Autocomplete.vue diff --git a/dashboard/src2/components/AvatarGroup.vue b/dashboard/src/components/AvatarGroup.vue similarity index 100% rename from dashboard/src2/components/AvatarGroup.vue rename to dashboard/src/components/AvatarGroup.vue diff --git a/dashboard/src2/components/AvatarUploader.vue b/dashboard/src/components/AvatarUploader.vue similarity index 100% rename from dashboard/src2/components/AvatarUploader.vue rename to dashboard/src/components/AvatarUploader.vue diff --git a/dashboard/src2/components/BackupFilesUploader.vue b/dashboard/src/components/BackupFilesUploader.vue similarity index 100% rename from dashboard/src2/components/BackupFilesUploader.vue rename to dashboard/src/components/BackupFilesUploader.vue diff --git a/dashboard/src2/components/BenchAppUpdates.vue b/dashboard/src/components/BenchAppUpdates.vue similarity index 100% rename from dashboard/src2/components/BenchAppUpdates.vue rename to dashboard/src/components/BenchAppUpdates.vue diff --git a/dashboard/src2/components/BenchSiteUpdates.vue b/dashboard/src/components/BenchSiteUpdates.vue similarity index 100% rename from dashboard/src2/components/BenchSiteUpdates.vue rename to dashboard/src/components/BenchSiteUpdates.vue diff --git a/dashboard/src2/components/BillingInformationDialog.vue b/dashboard/src/components/BillingInformationDialog.vue similarity index 100% rename from dashboard/src2/components/BillingInformationDialog.vue rename to dashboard/src/components/BillingInformationDialog.vue diff --git a/dashboard/src2/components/BuyPrepaidCredits.vue b/dashboard/src/components/BuyPrepaidCredits.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCredits.vue rename to dashboard/src/components/BuyPrepaidCredits.vue diff --git a/dashboard/src2/components/BuyPrepaidCreditsAlipay.vue b/dashboard/src/components/BuyPrepaidCreditsAlipay.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCreditsAlipay.vue rename to dashboard/src/components/BuyPrepaidCreditsAlipay.vue diff --git a/dashboard/src2/components/BuyPrepaidCreditsForm.vue b/dashboard/src/components/BuyPrepaidCreditsForm.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCreditsForm.vue rename to dashboard/src/components/BuyPrepaidCreditsForm.vue diff --git a/dashboard/src2/components/BuyPrepaidCreditsRazorpay.vue b/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCreditsRazorpay.vue rename to dashboard/src/components/BuyPrepaidCreditsRazorpay.vue diff --git a/dashboard/src2/components/BuyPrepaidCreditsStripe.vue b/dashboard/src/components/BuyPrepaidCreditsStripe.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCreditsStripe.vue rename to dashboard/src/components/BuyPrepaidCreditsStripe.vue diff --git a/dashboard/src2/components/BuyPrepaidCreditsWeChatPay.vue b/dashboard/src/components/BuyPrepaidCreditsWeChatPay.vue similarity index 100% rename from dashboard/src2/components/BuyPrepaidCreditsWeChatPay.vue rename to dashboard/src/components/BuyPrepaidCreditsWeChatPay.vue diff --git a/dashboard/src2/components/CardDetails.vue b/dashboard/src/components/CardDetails.vue similarity index 100% rename from dashboard/src2/components/CardDetails.vue rename to dashboard/src/components/CardDetails.vue diff --git a/dashboard/src2/components/CardWithDetails.vue b/dashboard/src/components/CardWithDetails.vue similarity index 100% rename from dashboard/src2/components/CardWithDetails.vue rename to dashboard/src/components/CardWithDetails.vue diff --git a/dashboard/src2/components/ChangeAppBranchDialog.vue b/dashboard/src/components/ChangeAppBranchDialog.vue similarity index 100% rename from dashboard/src2/components/ChangeAppBranchDialog.vue rename to dashboard/src/components/ChangeAppBranchDialog.vue diff --git a/dashboard/src2/components/ChangeAppPlanSelector.vue b/dashboard/src/components/ChangeAppPlanSelector.vue similarity index 100% rename from dashboard/src2/components/ChangeAppPlanSelector.vue rename to dashboard/src/components/ChangeAppPlanSelector.vue diff --git a/dashboard/src2/components/ChangePaymentModeDialog.vue b/dashboard/src/components/ChangePaymentModeDialog.vue similarity index 100% rename from dashboard/src2/components/ChangePaymentModeDialog.vue rename to dashboard/src/components/ChangePaymentModeDialog.vue diff --git a/dashboard/src2/components/ChurnFeedbackDialog.vue b/dashboard/src/components/ChurnFeedbackDialog.vue similarity index 100% rename from dashboard/src2/components/ChurnFeedbackDialog.vue rename to dashboard/src/components/ChurnFeedbackDialog.vue diff --git a/dashboard/src2/components/ClickToCopyField.vue b/dashboard/src/components/ClickToCopyField.vue similarity index 100% rename from dashboard/src2/components/ClickToCopyField.vue rename to dashboard/src/components/ClickToCopyField.vue diff --git a/dashboard/src2/components/CommandPalette.vue b/dashboard/src/components/CommandPalette.vue similarity index 100% rename from dashboard/src2/components/CommandPalette.vue rename to dashboard/src/components/CommandPalette.vue diff --git a/dashboard/src2/components/ConfigEditor.vue b/dashboard/src/components/ConfigEditor.vue similarity index 100% rename from dashboard/src2/components/ConfigEditor.vue rename to dashboard/src/components/ConfigEditor.vue diff --git a/dashboard/src2/components/ConfigEditorDialog.vue b/dashboard/src/components/ConfigEditorDialog.vue similarity index 100% rename from dashboard/src2/components/ConfigEditorDialog.vue rename to dashboard/src/components/ConfigEditorDialog.vue diff --git a/dashboard/src2/components/ConfigPreviewDialog.vue b/dashboard/src/components/ConfigPreviewDialog.vue similarity index 100% rename from dashboard/src2/components/ConfigPreviewDialog.vue rename to dashboard/src/components/ConfigPreviewDialog.vue diff --git a/dashboard/src2/components/ConfirmDialogs.vue b/dashboard/src/components/ConfirmDialogs.vue similarity index 100% rename from dashboard/src2/components/ConfirmDialogs.vue rename to dashboard/src/components/ConfirmDialogs.vue diff --git a/dashboard/src2/components/DateTimeControl.vue b/dashboard/src/components/DateTimeControl.vue similarity index 100% rename from dashboard/src2/components/DateTimeControl.vue rename to dashboard/src/components/DateTimeControl.vue diff --git a/dashboard/src2/components/DescriptionList.vue b/dashboard/src/components/DescriptionList.vue similarity index 100% rename from dashboard/src2/components/DescriptionList.vue rename to dashboard/src/components/DescriptionList.vue diff --git a/dashboard/src2/components/DialogWrapper.vue b/dashboard/src/components/DialogWrapper.vue similarity index 100% rename from dashboard/src2/components/DialogWrapper.vue rename to dashboard/src/components/DialogWrapper.vue diff --git a/dashboard/src2/components/DismissableBanner.vue b/dashboard/src/components/DismissableBanner.vue similarity index 100% rename from dashboard/src2/components/DismissableBanner.vue rename to dashboard/src/components/DismissableBanner.vue diff --git a/dashboard/src2/components/DomainOwner.vue b/dashboard/src/components/DomainOwner.vue similarity index 100% rename from dashboard/src2/components/DomainOwner.vue rename to dashboard/src/components/DomainOwner.vue diff --git a/dashboard/src2/components/DomainOwnerDialog.vue b/dashboard/src/components/DomainOwnerDialog.vue similarity index 100% rename from dashboard/src2/components/DomainOwnerDialog.vue rename to dashboard/src/components/DomainOwnerDialog.vue diff --git a/dashboard/src2/components/EnvironmentVariableEditorDialog.vue b/dashboard/src/components/EnvironmentVariableEditorDialog.vue similarity index 100% rename from dashboard/src2/components/EnvironmentVariableEditorDialog.vue rename to dashboard/src/components/EnvironmentVariableEditorDialog.vue diff --git a/dashboard/src2/components/FeatureList.vue b/dashboard/src/components/FeatureList.vue similarity index 100% rename from dashboard/src2/components/FeatureList.vue rename to dashboard/src/components/FeatureList.vue diff --git a/dashboard/src2/components/FileUploader.vue b/dashboard/src/components/FileUploader.vue similarity index 100% rename from dashboard/src2/components/FileUploader.vue rename to dashboard/src/components/FileUploader.vue diff --git a/dashboard/src2/components/FilterControl.vue b/dashboard/src/components/FilterControl.vue similarity index 100% rename from dashboard/src2/components/FilterControl.vue rename to dashboard/src/components/FilterControl.vue diff --git a/dashboard/src2/components/FoldStep.vue b/dashboard/src/components/FoldStep.vue similarity index 100% rename from dashboard/src2/components/FoldStep.vue rename to dashboard/src/components/FoldStep.vue diff --git a/dashboard/src2/components/Form.vue b/dashboard/src/components/Form.vue similarity index 100% rename from dashboard/src2/components/Form.vue rename to dashboard/src/components/Form.vue diff --git a/dashboard/src2/components/FrappeCloudLogo.vue b/dashboard/src/components/FrappeCloudLogo.vue similarity index 100% rename from dashboard/src2/components/FrappeCloudLogo.vue rename to dashboard/src/components/FrappeCloudLogo.vue diff --git a/dashboard/src2/components/GenericDialog.vue b/dashboard/src/components/GenericDialog.vue similarity index 100% rename from dashboard/src2/components/GenericDialog.vue rename to dashboard/src/components/GenericDialog.vue diff --git a/dashboard/src2/components/GenericDialogField.vue b/dashboard/src/components/GenericDialogField.vue similarity index 100% rename from dashboard/src2/components/GenericDialogField.vue rename to dashboard/src/components/GenericDialogField.vue diff --git a/dashboard/src2/components/GenericList.vue b/dashboard/src/components/GenericList.vue similarity index 100% rename from dashboard/src2/components/GenericList.vue rename to dashboard/src/components/GenericList.vue diff --git a/dashboard/src2/components/GitHubAppSelector.vue b/dashboard/src/components/GitHubAppSelector.vue similarity index 100% rename from dashboard/src2/components/GitHubAppSelector.vue rename to dashboard/src/components/GitHubAppSelector.vue diff --git a/dashboard/src2/components/Header.vue b/dashboard/src/components/Header.vue similarity index 100% rename from dashboard/src2/components/Header.vue rename to dashboard/src/components/Header.vue diff --git a/dashboard/src2/components/HomeSummary.vue b/dashboard/src/components/HomeSummary.vue similarity index 100% rename from dashboard/src2/components/HomeSummary.vue rename to dashboard/src/components/HomeSummary.vue diff --git a/dashboard/src2/components/ImpersonateTeam.vue b/dashboard/src/components/ImpersonateTeam.vue similarity index 100% rename from dashboard/src2/components/ImpersonateTeam.vue rename to dashboard/src/components/ImpersonateTeam.vue diff --git a/dashboard/src2/components/InvoiceTable.vue b/dashboard/src/components/InvoiceTable.vue similarity index 100% rename from dashboard/src2/components/InvoiceTable.vue rename to dashboard/src/components/InvoiceTable.vue diff --git a/dashboard/src2/components/InvoiceUsageCard.vue b/dashboard/src/components/InvoiceUsageCard.vue similarity index 100% rename from dashboard/src2/components/InvoiceUsageCard.vue rename to dashboard/src/components/InvoiceUsageCard.vue diff --git a/dashboard/src2/components/InvoiceUsageTable.vue b/dashboard/src/components/InvoiceUsageTable.vue similarity index 100% rename from dashboard/src2/components/InvoiceUsageTable.vue rename to dashboard/src/components/InvoiceUsageTable.vue diff --git a/dashboard/src2/components/JobStep.vue b/dashboard/src/components/JobStep.vue similarity index 100% rename from dashboard/src2/components/JobStep.vue rename to dashboard/src/components/JobStep.vue diff --git a/dashboard/src2/components/JsiteDomainAddDNSRecordDialog.vue b/dashboard/src/components/JsiteDomainAddDNSRecordDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainAddDNSRecordDialog.vue rename to dashboard/src/components/JsiteDomainAddDNSRecordDialog.vue diff --git a/dashboard/src2/components/JsiteDomainDNSRecords.vue b/dashboard/src/components/JsiteDomainDNSRecords.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainDNSRecords.vue rename to dashboard/src/components/JsiteDomainDNSRecords.vue diff --git a/dashboard/src2/components/JsiteDomainEditDNSRecordDialog.vue b/dashboard/src/components/JsiteDomainEditDNSRecordDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainEditDNSRecordDialog.vue rename to dashboard/src/components/JsiteDomainEditDNSRecordDialog.vue diff --git a/dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue b/dashboard/src/components/JsiteDomainModifyDNSServerDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue rename to dashboard/src/components/JsiteDomainModifyDNSServerDialog.vue diff --git a/dashboard/src2/components/JsiteDomainOverview.vue b/dashboard/src/components/JsiteDomainOverview.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainOverview.vue rename to dashboard/src/components/JsiteDomainOverview.vue diff --git a/dashboard/src2/components/JsiteDomainRealNameInfoDialog.vue b/dashboard/src/components/JsiteDomainRealNameInfoDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainRealNameInfoDialog.vue rename to dashboard/src/components/JsiteDomainRealNameInfoDialog.vue diff --git a/dashboard/src2/components/JsiteDomainRenewalDialog.vue b/dashboard/src/components/JsiteDomainRenewalDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainRenewalDialog.vue rename to dashboard/src/components/JsiteDomainRenewalDialog.vue diff --git a/dashboard/src2/components/JsiteDomainTransferDialog.vue b/dashboard/src/components/JsiteDomainTransferDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainTransferDialog.vue rename to dashboard/src/components/JsiteDomainTransferDialog.vue diff --git a/dashboard/src2/components/JsiteDomainUploadRealNameDialog.vue b/dashboard/src/components/JsiteDomainUploadRealNameDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteDomainUploadRealNameDialog.vue rename to dashboard/src/components/JsiteDomainUploadRealNameDialog.vue diff --git a/dashboard/src2/components/JsiteServerFirewallRules.vue b/dashboard/src/components/JsiteServerFirewallRules.vue similarity index 100% rename from dashboard/src2/components/JsiteServerFirewallRules.vue rename to dashboard/src/components/JsiteServerFirewallRules.vue diff --git a/dashboard/src2/components/JsiteServerOverview.vue b/dashboard/src/components/JsiteServerOverview.vue similarity index 100% rename from dashboard/src2/components/JsiteServerOverview.vue rename to dashboard/src/components/JsiteServerOverview.vue diff --git a/dashboard/src2/components/JsiteServerRenewalDialog.vue b/dashboard/src/components/JsiteServerRenewalDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteServerRenewalDialog.vue rename to dashboard/src/components/JsiteServerRenewalDialog.vue diff --git a/dashboard/src2/components/JsiteServerUpgradeDialog.vue b/dashboard/src/components/JsiteServerUpgradeDialog.vue similarity index 100% rename from dashboard/src2/components/JsiteServerUpgradeDialog.vue rename to dashboard/src/components/JsiteServerUpgradeDialog.vue diff --git a/dashboard/src2/components/Link.vue b/dashboard/src/components/Link.vue similarity index 100% rename from dashboard/src2/components/Link.vue rename to dashboard/src/components/Link.vue diff --git a/dashboard/src2/components/LinkControl.vue b/dashboard/src/components/LinkControl.vue similarity index 100% rename from dashboard/src2/components/LinkControl.vue rename to dashboard/src/components/LinkControl.vue diff --git a/dashboard/src2/components/ListSelection.vue b/dashboard/src/components/ListSelection.vue similarity index 100% rename from dashboard/src2/components/ListSelection.vue rename to dashboard/src/components/ListSelection.vue diff --git a/dashboard/src2/components/LoadingIndicator.vue b/dashboard/src/components/LoadingIndicator.vue similarity index 100% rename from dashboard/src2/components/LoadingIndicator.vue rename to dashboard/src/components/LoadingIndicator.vue diff --git a/dashboard/src2/components/ManageSitePlansDialog.vue b/dashboard/src/components/ManageSitePlansDialog.vue similarity index 100% rename from dashboard/src2/components/ManageSitePlansDialog.vue rename to dashboard/src/components/ManageSitePlansDialog.vue diff --git a/dashboard/src2/components/MarketplaceAppCard.vue b/dashboard/src/components/MarketplaceAppCard.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppCard.vue rename to dashboard/src/components/MarketplaceAppCard.vue diff --git a/dashboard/src2/components/MarketplaceAppDescriptions.vue b/dashboard/src/components/MarketplaceAppDescriptions.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppDescriptions.vue rename to dashboard/src/components/MarketplaceAppDescriptions.vue diff --git a/dashboard/src2/components/MarketplaceAppLinks.vue b/dashboard/src/components/MarketplaceAppLinks.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppLinks.vue rename to dashboard/src/components/MarketplaceAppLinks.vue diff --git a/dashboard/src2/components/MarketplaceAppListing.vue b/dashboard/src/components/MarketplaceAppListing.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppListing.vue rename to dashboard/src/components/MarketplaceAppListing.vue diff --git a/dashboard/src2/components/MarketplaceAppProfile.vue b/dashboard/src/components/MarketplaceAppProfile.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppProfile.vue rename to dashboard/src/components/MarketplaceAppProfile.vue diff --git a/dashboard/src2/components/MarketplaceAppReleaseList.vue b/dashboard/src/components/MarketplaceAppReleaseList.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppReleaseList.vue rename to dashboard/src/components/MarketplaceAppReleaseList.vue diff --git a/dashboard/src2/components/MarketplaceAppScreenshots.vue b/dashboard/src/components/MarketplaceAppScreenshots.vue similarity index 100% rename from dashboard/src2/components/MarketplaceAppScreenshots.vue rename to dashboard/src/components/MarketplaceAppScreenshots.vue diff --git a/dashboard/src2/components/MobileNav.vue b/dashboard/src/components/MobileNav.vue similarity index 100% rename from dashboard/src2/components/MobileNav.vue rename to dashboard/src/components/MobileNav.vue diff --git a/dashboard/src2/components/MobileNavItem.vue b/dashboard/src/components/MobileNavItem.vue similarity index 100% rename from dashboard/src2/components/MobileNavItem.vue rename to dashboard/src/components/MobileNavItem.vue diff --git a/dashboard/src2/components/MobileNavItemGroup.vue b/dashboard/src/components/MobileNavItemGroup.vue similarity index 100% rename from dashboard/src2/components/MobileNavItemGroup.vue rename to dashboard/src/components/MobileNavItemGroup.vue diff --git a/dashboard/src2/components/Modal.vue b/dashboard/src/components/Modal.vue similarity index 100% rename from dashboard/src2/components/Modal.vue rename to dashboard/src/components/Modal.vue diff --git a/dashboard/src2/components/Navbar.vue b/dashboard/src/components/Navbar.vue similarity index 100% rename from dashboard/src2/components/Navbar.vue rename to dashboard/src/components/Navbar.vue diff --git a/dashboard/src2/components/NavigationItems.vue b/dashboard/src/components/NavigationItems.vue similarity index 100% rename from dashboard/src2/components/NavigationItems.vue rename to dashboard/src/components/NavigationItems.vue diff --git a/dashboard/src2/components/NewAppDialog.vue b/dashboard/src/components/NewAppDialog.vue similarity index 100% rename from dashboard/src2/components/NewAppDialog.vue rename to dashboard/src/components/NewAppDialog.vue diff --git a/dashboard/src2/components/NewAppRepositories.vue b/dashboard/src/components/NewAppRepositories.vue similarity index 100% rename from dashboard/src2/components/NewAppRepositories.vue rename to dashboard/src/components/NewAppRepositories.vue diff --git a/dashboard/src2/components/Notification.vue b/dashboard/src/components/Notification.vue similarity index 100% rename from dashboard/src2/components/Notification.vue rename to dashboard/src/components/Notification.vue diff --git a/dashboard/src2/components/NotificationToasts.vue b/dashboard/src/components/NotificationToasts.vue similarity index 100% rename from dashboard/src2/components/NotificationToasts.vue rename to dashboard/src/components/NotificationToasts.vue diff --git a/dashboard/src2/components/ObjectList.vue b/dashboard/src/components/ObjectList.vue similarity index 100% rename from dashboard/src2/components/ObjectList.vue rename to dashboard/src/components/ObjectList.vue diff --git a/dashboard/src2/components/ObjectListCell.vue b/dashboard/src/components/ObjectListCell.vue similarity index 100% rename from dashboard/src2/components/ObjectListCell.vue rename to dashboard/src/components/ObjectListCell.vue diff --git a/dashboard/src2/components/ObjectListFilters.vue b/dashboard/src/components/ObjectListFilters.vue similarity index 100% rename from dashboard/src2/components/ObjectListFilters.vue rename to dashboard/src/components/ObjectListFilters.vue diff --git a/dashboard/src2/components/Onboarding.vue b/dashboard/src/components/Onboarding.vue similarity index 100% rename from dashboard/src2/components/Onboarding.vue rename to dashboard/src/components/Onboarding.vue diff --git a/dashboard/src2/components/OnboardingAppSelector.vue b/dashboard/src/components/OnboardingAppSelector.vue similarity index 100% rename from dashboard/src2/components/OnboardingAppSelector.vue rename to dashboard/src/components/OnboardingAppSelector.vue diff --git a/dashboard/src2/components/OnboardingWithoutPayment.vue b/dashboard/src/components/OnboardingWithoutPayment.vue similarity index 100% rename from dashboard/src2/components/OnboardingWithoutPayment.vue rename to dashboard/src/components/OnboardingWithoutPayment.vue diff --git a/dashboard/src2/components/OrderCheckout.vue b/dashboard/src/components/OrderCheckout.vue similarity index 100% rename from dashboard/src2/components/OrderCheckout.vue rename to dashboard/src/components/OrderCheckout.vue diff --git a/dashboard/src2/components/PageHeader.vue b/dashboard/src/components/PageHeader.vue similarity index 100% rename from dashboard/src2/components/PageHeader.vue rename to dashboard/src/components/PageHeader.vue diff --git a/dashboard/src2/components/PayoutTable.vue b/dashboard/src/components/PayoutTable.vue similarity index 100% rename from dashboard/src2/components/PayoutTable.vue rename to dashboard/src/components/PayoutTable.vue diff --git a/dashboard/src2/components/PlanIcon.vue b/dashboard/src/components/PlanIcon.vue similarity index 100% rename from dashboard/src2/components/PlanIcon.vue rename to dashboard/src/components/PlanIcon.vue diff --git a/dashboard/src2/components/PlansCards.vue b/dashboard/src/components/PlansCards.vue similarity index 100% rename from dashboard/src2/components/PlansCards.vue rename to dashboard/src/components/PlansCards.vue diff --git a/dashboard/src2/components/Popover.vue b/dashboard/src/components/Popover.vue similarity index 100% rename from dashboard/src2/components/Popover.vue rename to dashboard/src/components/Popover.vue diff --git a/dashboard/src2/components/PrepaidCreditsDialog.vue b/dashboard/src/components/PrepaidCreditsDialog.vue similarity index 100% rename from dashboard/src2/components/PrepaidCreditsDialog.vue rename to dashboard/src/components/PrepaidCreditsDialog.vue diff --git a/dashboard/src2/components/PrinterIcon.vue b/dashboard/src/components/PrinterIcon.vue similarity index 100% rename from dashboard/src2/components/PrinterIcon.vue rename to dashboard/src/components/PrinterIcon.vue diff --git a/dashboard/src2/components/ProgressArc.vue b/dashboard/src/components/ProgressArc.vue similarity index 100% rename from dashboard/src2/components/ProgressArc.vue rename to dashboard/src/components/ProgressArc.vue diff --git a/dashboard/src2/components/Report.vue b/dashboard/src/components/Report.vue similarity index 100% rename from dashboard/src2/components/Report.vue rename to dashboard/src/components/Report.vue diff --git a/dashboard/src2/components/RichSelect.vue b/dashboard/src/components/RichSelect.vue similarity index 100% rename from dashboard/src2/components/RichSelect.vue rename to dashboard/src/components/RichSelect.vue diff --git a/dashboard/src2/components/SaaSSignupFields.vue b/dashboard/src/components/SaaSSignupFields.vue similarity index 100% rename from dashboard/src2/components/SaaSSignupFields.vue rename to dashboard/src/components/SaaSSignupFields.vue diff --git a/dashboard/src2/components/SelectAppFromGithub.vue b/dashboard/src/components/SelectAppFromGithub.vue similarity index 100% rename from dashboard/src2/components/SelectAppFromGithub.vue rename to dashboard/src/components/SelectAppFromGithub.vue diff --git a/dashboard/src2/components/SelectableCard.vue b/dashboard/src/components/SelectableCard.vue similarity index 100% rename from dashboard/src2/components/SelectableCard.vue rename to dashboard/src/components/SelectableCard.vue diff --git a/dashboard/src2/components/ServerPlansTable.vue b/dashboard/src/components/ServerPlansTable.vue similarity index 100% rename from dashboard/src2/components/ServerPlansTable.vue rename to dashboard/src/components/ServerPlansTable.vue diff --git a/dashboard/src2/components/Sidebar.vue b/dashboard/src/components/Sidebar.vue similarity index 100% rename from dashboard/src2/components/Sidebar.vue rename to dashboard/src/components/Sidebar.vue diff --git a/dashboard/src2/components/SiteActionCell.vue b/dashboard/src/components/SiteActionCell.vue similarity index 100% rename from dashboard/src2/components/SiteActionCell.vue rename to dashboard/src/components/SiteActionCell.vue diff --git a/dashboard/src2/components/SiteActions.vue b/dashboard/src/components/SiteActions.vue similarity index 100% rename from dashboard/src2/components/SiteActions.vue rename to dashboard/src/components/SiteActions.vue diff --git a/dashboard/src2/components/SiteAppUpdateCard.vue b/dashboard/src/components/SiteAppUpdateCard.vue similarity index 100% rename from dashboard/src2/components/SiteAppUpdateCard.vue rename to dashboard/src/components/SiteAppUpdateCard.vue diff --git a/dashboard/src2/components/SiteAppUpdates.vue b/dashboard/src/components/SiteAppUpdates.vue similarity index 100% rename from dashboard/src2/components/SiteAppUpdates.vue rename to dashboard/src/components/SiteAppUpdates.vue diff --git a/dashboard/src2/components/SiteDailyUsage.vue b/dashboard/src/components/SiteDailyUsage.vue similarity index 100% rename from dashboard/src2/components/SiteDailyUsage.vue rename to dashboard/src/components/SiteDailyUsage.vue diff --git a/dashboard/src2/components/SiteDatabaseAccessDialog.vue b/dashboard/src/components/SiteDatabaseAccessDialog.vue similarity index 100% rename from dashboard/src2/components/SiteDatabaseAccessDialog.vue rename to dashboard/src/components/SiteDatabaseAccessDialog.vue diff --git a/dashboard/src2/components/SiteDatabaseRestoreDialog.vue b/dashboard/src/components/SiteDatabaseRestoreDialog.vue similarity index 100% rename from dashboard/src2/components/SiteDatabaseRestoreDialog.vue rename to dashboard/src/components/SiteDatabaseRestoreDialog.vue diff --git a/dashboard/src2/components/SiteOverview.vue b/dashboard/src/components/SiteOverview.vue similarity index 100% rename from dashboard/src2/components/SiteOverview.vue rename to dashboard/src/components/SiteOverview.vue diff --git a/dashboard/src2/components/SitePlansCards.vue b/dashboard/src/components/SitePlansCards.vue similarity index 100% rename from dashboard/src2/components/SitePlansCards.vue rename to dashboard/src/components/SitePlansCards.vue diff --git a/dashboard/src2/components/SitePlansTable.vue b/dashboard/src/components/SitePlansTable.vue similarity index 100% rename from dashboard/src2/components/SitePlansTable.vue rename to dashboard/src/components/SitePlansTable.vue diff --git a/dashboard/src2/components/SiteRenewalDialog.vue b/dashboard/src/components/SiteRenewalDialog.vue similarity index 100% rename from dashboard/src2/components/SiteRenewalDialog.vue rename to dashboard/src/components/SiteRenewalDialog.vue diff --git a/dashboard/src2/components/SiteRestoreSelector.vue b/dashboard/src/components/SiteRestoreSelector.vue similarity index 100% rename from dashboard/src2/components/SiteRestoreSelector.vue rename to dashboard/src/components/SiteRestoreSelector.vue diff --git a/dashboard/src2/components/SiteUpdateCard.vue b/dashboard/src/components/SiteUpdateCard.vue similarity index 100% rename from dashboard/src2/components/SiteUpdateCard.vue rename to dashboard/src/components/SiteUpdateCard.vue diff --git a/dashboard/src2/components/SiteUpdateDialog.vue b/dashboard/src/components/SiteUpdateDialog.vue similarity index 100% rename from dashboard/src2/components/SiteUpdateDialog.vue rename to dashboard/src/components/SiteUpdateDialog.vue diff --git a/dashboard/src2/components/StarRatingInput.vue b/dashboard/src/components/StarRatingInput.vue similarity index 100% rename from dashboard/src2/components/StarRatingInput.vue rename to dashboard/src/components/StarRatingInput.vue diff --git a/dashboard/src2/components/StatusIndicator.vue b/dashboard/src/components/StatusIndicator.vue similarity index 100% rename from dashboard/src2/components/StatusIndicator.vue rename to dashboard/src/components/StatusIndicator.vue diff --git a/dashboard/src2/components/Steps.vue b/dashboard/src/components/Steps.vue similarity index 100% rename from dashboard/src2/components/Steps.vue rename to dashboard/src/components/Steps.vue diff --git a/dashboard/src2/components/StripeCard.vue b/dashboard/src/components/StripeCard.vue similarity index 100% rename from dashboard/src2/components/StripeCard.vue rename to dashboard/src/components/StripeCard.vue diff --git a/dashboard/src2/components/StripeCardDialog.vue b/dashboard/src/components/StripeCardDialog.vue similarity index 100% rename from dashboard/src2/components/StripeCardDialog.vue rename to dashboard/src/components/StripeCardDialog.vue diff --git a/dashboard/src2/components/StripeLogo.vue b/dashboard/src/components/StripeLogo.vue similarity index 100% rename from dashboard/src2/components/StripeLogo.vue rename to dashboard/src/components/StripeLogo.vue diff --git a/dashboard/src2/components/Summary.vue b/dashboard/src/components/Summary.vue similarity index 100% rename from dashboard/src2/components/Summary.vue rename to dashboard/src/components/Summary.vue diff --git a/dashboard/src2/components/SwitchTeamDialog.vue b/dashboard/src/components/SwitchTeamDialog.vue similarity index 100% rename from dashboard/src2/components/SwitchTeamDialog.vue rename to dashboard/src/components/SwitchTeamDialog.vue diff --git a/dashboard/src2/components/Table/Table.vue b/dashboard/src/components/Table/Table.vue similarity index 100% rename from dashboard/src2/components/Table/Table.vue rename to dashboard/src/components/Table/Table.vue diff --git a/dashboard/src2/components/Table/TableCell.vue b/dashboard/src/components/Table/TableCell.vue similarity index 100% rename from dashboard/src2/components/Table/TableCell.vue rename to dashboard/src/components/Table/TableCell.vue diff --git a/dashboard/src2/components/Table/TableHeader.vue b/dashboard/src/components/Table/TableHeader.vue similarity index 100% rename from dashboard/src2/components/Table/TableHeader.vue rename to dashboard/src/components/Table/TableHeader.vue diff --git a/dashboard/src2/components/Table/TableRow.vue b/dashboard/src/components/Table/TableRow.vue similarity index 100% rename from dashboard/src2/components/Table/TableRow.vue rename to dashboard/src/components/Table/TableRow.vue diff --git a/dashboard/src2/components/Tabs.vue b/dashboard/src/components/Tabs.vue similarity index 100% rename from dashboard/src2/components/Tabs.vue rename to dashboard/src/components/Tabs.vue diff --git a/dashboard/src2/components/TabsWithRouter.vue b/dashboard/src/components/TabsWithRouter.vue similarity index 100% rename from dashboard/src2/components/TabsWithRouter.vue rename to dashboard/src/components/TabsWithRouter.vue diff --git a/dashboard/src2/components/Tags.vue b/dashboard/src/components/Tags.vue similarity index 100% rename from dashboard/src2/components/Tags.vue rename to dashboard/src/components/Tags.vue diff --git a/dashboard/src2/components/TextInsideCircle.vue b/dashboard/src/components/TextInsideCircle.vue similarity index 100% rename from dashboard/src2/components/TextInsideCircle.vue rename to dashboard/src/components/TextInsideCircle.vue diff --git a/dashboard/src2/components/ToggleContent.vue b/dashboard/src/components/ToggleContent.vue similarity index 100% rename from dashboard/src2/components/ToggleContent.vue rename to dashboard/src/components/ToggleContent.vue diff --git a/dashboard/src2/components/UpdateBillingDetails.vue b/dashboard/src/components/UpdateBillingDetails.vue similarity index 100% rename from dashboard/src2/components/UpdateBillingDetails.vue rename to dashboard/src/components/UpdateBillingDetails.vue diff --git a/dashboard/src2/components/UpdateBillingDetailsForm.vue b/dashboard/src/components/UpdateBillingDetailsForm.vue similarity index 100% rename from dashboard/src2/components/UpdateBillingDetailsForm.vue rename to dashboard/src/components/UpdateBillingDetailsForm.vue diff --git a/dashboard/src2/components/UserWithAvatarCell.vue b/dashboard/src/components/UserWithAvatarCell.vue similarity index 100% rename from dashboard/src2/components/UserWithAvatarCell.vue rename to dashboard/src/components/UserWithAvatarCell.vue diff --git a/dashboard/src2/components/WizardCard.vue b/dashboard/src/components/WizardCard.vue similarity index 100% rename from dashboard/src2/components/WizardCard.vue rename to dashboard/src/components/WizardCard.vue diff --git a/dashboard/src2/components/auth/Configure2FA.vue b/dashboard/src/components/auth/Configure2FA.vue similarity index 100% rename from dashboard/src2/components/auth/Configure2FA.vue rename to dashboard/src/components/auth/Configure2FA.vue diff --git a/dashboard/src2/components/auth/LoginBox.vue b/dashboard/src/components/auth/LoginBox.vue similarity index 100% rename from dashboard/src2/components/auth/LoginBox.vue rename to dashboard/src/components/auth/LoginBox.vue diff --git a/dashboard/src2/components/auth/SaaSLoginBox.vue b/dashboard/src/components/auth/SaaSLoginBox.vue similarity index 100% rename from dashboard/src2/components/auth/SaaSLoginBox.vue rename to dashboard/src/components/auth/SaaSLoginBox.vue diff --git a/dashboard/src2/components/billing/AddCardDialog.vue b/dashboard/src/components/billing/AddCardDialog.vue similarity index 100% rename from dashboard/src2/components/billing/AddCardDialog.vue rename to dashboard/src/components/billing/AddCardDialog.vue diff --git a/dashboard/src2/components/billing/AddExchangeRate.vue b/dashboard/src/components/billing/AddExchangeRate.vue similarity index 100% rename from dashboard/src2/components/billing/AddExchangeRate.vue rename to dashboard/src/components/billing/AddExchangeRate.vue diff --git a/dashboard/src2/components/billing/AddPrepaidCreditsDialog.vue b/dashboard/src/components/billing/AddPrepaidCreditsDialog.vue similarity index 100% rename from dashboard/src2/components/billing/AddPrepaidCreditsDialog.vue rename to dashboard/src/components/billing/AddPrepaidCreditsDialog.vue diff --git a/dashboard/src2/components/billing/BillingDetails.vue b/dashboard/src/components/billing/BillingDetails.vue similarity index 100% rename from dashboard/src2/components/billing/BillingDetails.vue rename to dashboard/src/components/billing/BillingDetails.vue diff --git a/dashboard/src2/components/billing/BillingDetailsDialog.vue b/dashboard/src/components/billing/BillingDetailsDialog.vue similarity index 100% rename from dashboard/src2/components/billing/BillingDetailsDialog.vue rename to dashboard/src/components/billing/BillingDetailsDialog.vue diff --git a/dashboard/src2/components/billing/BillingSummary.vue b/dashboard/src/components/billing/BillingSummary.vue similarity index 100% rename from dashboard/src2/components/billing/BillingSummary.vue rename to dashboard/src/components/billing/BillingSummary.vue diff --git a/dashboard/src2/components/billing/BuyCreditsRazorpay.vue b/dashboard/src/components/billing/BuyCreditsRazorpay.vue similarity index 100% rename from dashboard/src2/components/billing/BuyCreditsRazorpay.vue rename to dashboard/src/components/billing/BuyCreditsRazorpay.vue diff --git a/dashboard/src2/components/billing/BuyCreditsStripe.vue b/dashboard/src/components/billing/BuyCreditsStripe.vue similarity index 100% rename from dashboard/src2/components/billing/BuyCreditsStripe.vue rename to dashboard/src/components/billing/BuyCreditsStripe.vue diff --git a/dashboard/src2/components/billing/CardForm.vue b/dashboard/src/components/billing/CardForm.vue similarity index 100% rename from dashboard/src2/components/billing/CardForm.vue rename to dashboard/src/components/billing/CardForm.vue diff --git a/dashboard/src2/components/billing/ChangeCardDialog.vue b/dashboard/src/components/billing/ChangeCardDialog.vue similarity index 100% rename from dashboard/src2/components/billing/ChangeCardDialog.vue rename to dashboard/src/components/billing/ChangeCardDialog.vue diff --git a/dashboard/src2/components/billing/DropdownItem.vue b/dashboard/src/components/billing/DropdownItem.vue similarity index 100% rename from dashboard/src2/components/billing/DropdownItem.vue rename to dashboard/src/components/billing/DropdownItem.vue diff --git a/dashboard/src2/components/billing/FinalizeInvoicesDialog.vue b/dashboard/src/components/billing/FinalizeInvoicesDialog.vue similarity index 100% rename from dashboard/src2/components/billing/FinalizeInvoicesDialog.vue rename to dashboard/src/components/billing/FinalizeInvoicesDialog.vue diff --git a/dashboard/src2/components/billing/NewAddressForm.vue b/dashboard/src/components/billing/NewAddressForm.vue similarity index 100% rename from dashboard/src2/components/billing/NewAddressForm.vue rename to dashboard/src/components/billing/NewAddressForm.vue diff --git a/dashboard/src2/components/billing/PaymentDetails.vue b/dashboard/src/components/billing/PaymentDetails.vue similarity index 100% rename from dashboard/src2/components/billing/PaymentDetails.vue rename to dashboard/src/components/billing/PaymentDetails.vue diff --git a/dashboard/src2/components/billing/PrepaidCreditsForm.vue b/dashboard/src/components/billing/PrepaidCreditsForm.vue similarity index 100% rename from dashboard/src2/components/billing/PrepaidCreditsForm.vue rename to dashboard/src/components/billing/PrepaidCreditsForm.vue diff --git a/dashboard/src2/components/billing/UpcomingInvoiceDialog.vue b/dashboard/src/components/billing/UpcomingInvoiceDialog.vue similarity index 100% rename from dashboard/src2/components/billing/UpcomingInvoiceDialog.vue rename to dashboard/src/components/billing/UpcomingInvoiceDialog.vue diff --git a/dashboard/src2/components/billing/mpesa/AddMpesaCredentials.vue b/dashboard/src/components/billing/mpesa/AddMpesaCredentials.vue similarity index 100% rename from dashboard/src2/components/billing/mpesa/AddMpesaCredentials.vue rename to dashboard/src/components/billing/mpesa/AddMpesaCredentials.vue diff --git a/dashboard/src2/components/billing/mpesa/AddPaymentGateway.vue b/dashboard/src/components/billing/mpesa/AddPaymentGateway.vue similarity index 100% rename from dashboard/src2/components/billing/mpesa/AddPaymentGateway.vue rename to dashboard/src/components/billing/mpesa/AddPaymentGateway.vue diff --git a/dashboard/src2/components/billing/mpesa/BuyPrepaidCreditsMpesa.vue b/dashboard/src/components/billing/mpesa/BuyPrepaidCreditsMpesa.vue similarity index 100% rename from dashboard/src2/components/billing/mpesa/BuyPrepaidCreditsMpesa.vue rename to dashboard/src/components/billing/mpesa/BuyPrepaidCreditsMpesa.vue diff --git a/dashboard/src2/components/billing/mpesa/PartnerPaymentPayout.vue b/dashboard/src/components/billing/mpesa/PartnerPaymentPayout.vue similarity index 100% rename from dashboard/src2/components/billing/mpesa/PartnerPaymentPayout.vue rename to dashboard/src/components/billing/mpesa/PartnerPaymentPayout.vue diff --git a/dashboard/src2/components/charts/BarChart.vue b/dashboard/src/components/charts/BarChart.vue similarity index 100% rename from dashboard/src2/components/charts/BarChart.vue rename to dashboard/src/components/charts/BarChart.vue diff --git a/dashboard/src2/components/charts/LineChart.vue b/dashboard/src/components/charts/LineChart.vue similarity index 100% rename from dashboard/src2/components/charts/LineChart.vue rename to dashboard/src/components/charts/LineChart.vue diff --git a/dashboard/src2/components/charts/utils.js b/dashboard/src/components/charts/utils.js similarity index 100% rename from dashboard/src2/components/charts/utils.js rename to dashboard/src/components/charts/utils.js diff --git a/dashboard/src2/components/devtools/database/DatabaseAddIndexButton.vue b/dashboard/src/components/devtools/database/DatabaseAddIndexButton.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseAddIndexButton.vue rename to dashboard/src/components/devtools/database/DatabaseAddIndexButton.vue diff --git a/dashboard/src2/components/devtools/database/DatabasePerformanceSchemaDisabledNotice.vue b/dashboard/src/components/devtools/database/DatabasePerformanceSchemaDisabledNotice.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabasePerformanceSchemaDisabledNotice.vue rename to dashboard/src/components/devtools/database/DatabasePerformanceSchemaDisabledNotice.vue diff --git a/dashboard/src2/components/devtools/database/DatabaseProcessKillButton.vue b/dashboard/src/components/devtools/database/DatabaseProcessKillButton.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseProcessKillButton.vue rename to dashboard/src/components/devtools/database/DatabaseProcessKillButton.vue diff --git a/dashboard/src2/components/devtools/database/DatabaseSQLPlaygroundLog.vue b/dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseSQLPlaygroundLog.vue rename to dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue diff --git a/dashboard/src2/components/devtools/database/DatabaseTableSchemaDialog.vue b/dashboard/src/components/devtools/database/DatabaseTableSchemaDialog.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseTableSchemaDialog.vue rename to dashboard/src/components/devtools/database/DatabaseTableSchemaDialog.vue diff --git a/dashboard/src2/components/devtools/database/DatabaseTableSchemaInfoDialog.vue b/dashboard/src/components/devtools/database/DatabaseTableSchemaInfoDialog.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseTableSchemaInfoDialog.vue rename to dashboard/src/components/devtools/database/DatabaseTableSchemaInfoDialog.vue diff --git a/dashboard/src2/components/devtools/database/DatabaseTableSchemaSizeDetailsDialog.vue b/dashboard/src/components/devtools/database/DatabaseTableSchemaSizeDetailsDialog.vue similarity index 100% rename from dashboard/src2/components/devtools/database/DatabaseTableSchemaSizeDetailsDialog.vue rename to dashboard/src/components/devtools/database/DatabaseTableSchemaSizeDetailsDialog.vue diff --git a/dashboard/src2/components/devtools/database/ResultTable.vue b/dashboard/src/components/devtools/database/ResultTable.vue similarity index 100% rename from dashboard/src2/components/devtools/database/ResultTable.vue rename to dashboard/src/components/devtools/database/ResultTable.vue diff --git a/dashboard/src2/components/devtools/database/SQLCodeEditor.vue b/dashboard/src/components/devtools/database/SQLCodeEditor.vue similarity index 100% rename from dashboard/src2/components/devtools/database/SQLCodeEditor.vue rename to dashboard/src/components/devtools/database/SQLCodeEditor.vue diff --git a/dashboard/src2/components/devtools/database/SQLResult.vue b/dashboard/src/components/devtools/database/SQLResult.vue similarity index 100% rename from dashboard/src2/components/devtools/database/SQLResult.vue rename to dashboard/src/components/devtools/database/SQLResult.vue diff --git a/dashboard/src2/components/global/Alert.vue b/dashboard/src/components/global/Alert.vue similarity index 100% rename from dashboard/src2/components/global/Alert.vue rename to dashboard/src/components/global/Alert.vue diff --git a/dashboard/src2/components/global/Badge.vue b/dashboard/src/components/global/Badge.vue similarity index 100% rename from dashboard/src2/components/global/Badge.vue rename to dashboard/src/components/global/Badge.vue diff --git a/dashboard/src2/components/global/Breadcrumbs.vue b/dashboard/src/components/global/Breadcrumbs.vue similarity index 100% rename from dashboard/src2/components/global/Breadcrumbs.vue rename to dashboard/src/components/global/Breadcrumbs.vue diff --git a/dashboard/src2/components/global/Card.vue b/dashboard/src/components/global/Card.vue similarity index 100% rename from dashboard/src2/components/global/Card.vue rename to dashboard/src/components/global/Card.vue diff --git a/dashboard/src2/components/global/CircularCheckIcon.vue b/dashboard/src/components/global/CircularCheckIcon.vue similarity index 100% rename from dashboard/src2/components/global/CircularCheckIcon.vue rename to dashboard/src/components/global/CircularCheckIcon.vue diff --git a/dashboard/src2/components/global/FormatDate.vue b/dashboard/src/components/global/FormatDate.vue similarity index 100% rename from dashboard/src2/components/global/FormatDate.vue rename to dashboard/src/components/global/FormatDate.vue diff --git a/dashboard/src2/components/global/GrayCheckIcon.vue b/dashboard/src/components/global/GrayCheckIcon.vue similarity index 100% rename from dashboard/src2/components/global/GrayCheckIcon.vue rename to dashboard/src/components/global/GrayCheckIcon.vue diff --git a/dashboard/src2/components/global/ListItem.vue b/dashboard/src/components/global/ListItem.vue similarity index 100% rename from dashboard/src2/components/global/ListItem.vue rename to dashboard/src/components/global/ListItem.vue diff --git a/dashboard/src2/components/global/OldDropdown.vue b/dashboard/src/components/global/OldDropdown.vue similarity index 100% rename from dashboard/src2/components/global/OldDropdown.vue rename to dashboard/src/components/global/OldDropdown.vue diff --git a/dashboard/src2/components/global/Section.vue b/dashboard/src/components/global/Section.vue similarity index 100% rename from dashboard/src2/components/global/Section.vue rename to dashboard/src/components/global/Section.vue diff --git a/dashboard/src2/components/global/SectionCard.vue b/dashboard/src/components/global/SectionCard.vue similarity index 100% rename from dashboard/src2/components/global/SectionCard.vue rename to dashboard/src/components/global/SectionCard.vue diff --git a/dashboard/src2/components/global/SectionHeader.vue b/dashboard/src/components/global/SectionHeader.vue similarity index 100% rename from dashboard/src2/components/global/SectionHeader.vue rename to dashboard/src/components/global/SectionHeader.vue diff --git a/dashboard/src2/components/global/Select.vue b/dashboard/src/components/global/Select.vue similarity index 100% rename from dashboard/src2/components/global/Select.vue rename to dashboard/src/components/global/Select.vue diff --git a/dashboard/src2/components/global/Spinner.vue b/dashboard/src/components/global/Spinner.vue similarity index 100% rename from dashboard/src2/components/global/Spinner.vue rename to dashboard/src/components/global/Spinner.vue diff --git a/dashboard/src2/components/global/SuccessCard.vue b/dashboard/src/components/global/SuccessCard.vue similarity index 100% rename from dashboard/src2/components/global/SuccessCard.vue rename to dashboard/src/components/global/SuccessCard.vue diff --git a/dashboard/src2/components/global/outsideClickDirective.js b/dashboard/src/components/global/outsideClickDirective.js similarity index 100% rename from dashboard/src2/components/global/outsideClickDirective.js rename to dashboard/src/components/global/outsideClickDirective.js diff --git a/dashboard/src2/components/global/register.js b/dashboard/src/components/global/register.js similarity index 100% rename from dashboard/src2/components/global/register.js rename to dashboard/src/components/global/register.js diff --git a/dashboard/src2/components/group/AddAppDialog.vue b/dashboard/src/components/group/AddAppDialog.vue similarity index 100% rename from dashboard/src2/components/group/AddAppDialog.vue rename to dashboard/src/components/group/AddAppDialog.vue diff --git a/dashboard/src2/components/group/AddRegionDialog.vue b/dashboard/src/components/group/AddRegionDialog.vue similarity index 100% rename from dashboard/src2/components/group/AddRegionDialog.vue rename to dashboard/src/components/group/AddRegionDialog.vue diff --git a/dashboard/src2/components/group/BenchLogsDialog.vue b/dashboard/src/components/group/BenchLogsDialog.vue similarity index 100% rename from dashboard/src2/components/group/BenchLogsDialog.vue rename to dashboard/src/components/group/BenchLogsDialog.vue diff --git a/dashboard/src2/components/group/ChangeAppBranchDialog.vue b/dashboard/src/components/group/ChangeAppBranchDialog.vue similarity index 100% rename from dashboard/src2/components/group/ChangeAppBranchDialog.vue rename to dashboard/src/components/group/ChangeAppBranchDialog.vue diff --git a/dashboard/src2/components/group/DependencyEditorDialog.vue b/dashboard/src/components/group/DependencyEditorDialog.vue similarity index 100% rename from dashboard/src2/components/group/DependencyEditorDialog.vue rename to dashboard/src/components/group/DependencyEditorDialog.vue diff --git a/dashboard/src2/components/group/PatchAppDialog.vue b/dashboard/src/components/group/PatchAppDialog.vue similarity index 100% rename from dashboard/src2/components/group/PatchAppDialog.vue rename to dashboard/src/components/group/PatchAppDialog.vue diff --git a/dashboard/src2/components/group/ReleaseGroupActionCell.vue b/dashboard/src/components/group/ReleaseGroupActionCell.vue similarity index 100% rename from dashboard/src2/components/group/ReleaseGroupActionCell.vue rename to dashboard/src/components/group/ReleaseGroupActionCell.vue diff --git a/dashboard/src2/components/group/ReleaseGroupActions.vue b/dashboard/src/components/group/ReleaseGroupActions.vue similarity index 100% rename from dashboard/src2/components/group/ReleaseGroupActions.vue rename to dashboard/src/components/group/ReleaseGroupActions.vue diff --git a/dashboard/src2/components/group/SSHCertificateDialog.vue b/dashboard/src/components/group/SSHCertificateDialog.vue similarity index 100% rename from dashboard/src2/components/group/SSHCertificateDialog.vue rename to dashboard/src/components/group/SSHCertificateDialog.vue diff --git a/dashboard/src2/components/group/SupervisorProcessesDialog.vue b/dashboard/src/components/group/SupervisorProcessesDialog.vue similarity index 100% rename from dashboard/src2/components/group/SupervisorProcessesDialog.vue rename to dashboard/src/components/group/SupervisorProcessesDialog.vue diff --git a/dashboard/src2/components/group/UpdateReleaseGroupDialog.vue b/dashboard/src/components/group/UpdateReleaseGroupDialog.vue similarity index 100% rename from dashboard/src2/components/group/UpdateReleaseGroupDialog.vue rename to dashboard/src/components/group/UpdateReleaseGroupDialog.vue diff --git a/dashboard/src2/components/icons/AppsIcon.vue b/dashboard/src/components/icons/AppsIcon.vue similarity index 100% rename from dashboard/src2/components/icons/AppsIcon.vue rename to dashboard/src/components/icons/AppsIcon.vue diff --git a/dashboard/src2/components/icons/BenchIcon.vue b/dashboard/src/components/icons/BenchIcon.vue similarity index 100% rename from dashboard/src2/components/icons/BenchIcon.vue rename to dashboard/src/components/icons/BenchIcon.vue diff --git a/dashboard/src2/components/icons/BillingIcon.vue b/dashboard/src/components/icons/BillingIcon.vue similarity index 100% rename from dashboard/src2/components/icons/BillingIcon.vue rename to dashboard/src/components/icons/BillingIcon.vue diff --git a/dashboard/src2/components/icons/CheckCircleIcon.vue b/dashboard/src/components/icons/CheckCircleIcon.vue similarity index 100% rename from dashboard/src2/components/icons/CheckCircleIcon.vue rename to dashboard/src/components/icons/CheckCircleIcon.vue diff --git a/dashboard/src2/components/icons/GoogleIcon.vue b/dashboard/src/components/icons/GoogleIcon.vue similarity index 100% rename from dashboard/src2/components/icons/GoogleIcon.vue rename to dashboard/src/components/icons/GoogleIcon.vue diff --git a/dashboard/src2/components/icons/GoogleIconSolid.vue b/dashboard/src/components/icons/GoogleIconSolid.vue similarity index 100% rename from dashboard/src2/components/icons/GoogleIconSolid.vue rename to dashboard/src/components/icons/GoogleIconSolid.vue diff --git a/dashboard/src2/components/icons/JLogo.vue b/dashboard/src/components/icons/JLogo.vue similarity index 100% rename from dashboard/src2/components/icons/JLogo.vue rename to dashboard/src/components/icons/JLogo.vue diff --git a/dashboard/src2/components/icons/JcloudLogo.vue b/dashboard/src/components/icons/JcloudLogo.vue similarity index 100% rename from dashboard/src2/components/icons/JcloudLogo.vue rename to dashboard/src/components/icons/JcloudLogo.vue diff --git a/dashboard/src2/components/icons/JingrowLogo.vue b/dashboard/src/components/icons/JingrowLogo.vue similarity index 100% rename from dashboard/src2/components/icons/JingrowLogo.vue rename to dashboard/src/components/icons/JingrowLogo.vue diff --git a/dashboard/src2/components/icons/SecurityIcon.vue b/dashboard/src/components/icons/SecurityIcon.vue similarity index 100% rename from dashboard/src2/components/icons/SecurityIcon.vue rename to dashboard/src/components/icons/SecurityIcon.vue diff --git a/dashboard/src2/components/icons/ServerIcon.vue b/dashboard/src/components/icons/ServerIcon.vue similarity index 100% rename from dashboard/src2/components/icons/ServerIcon.vue rename to dashboard/src/components/icons/ServerIcon.vue diff --git a/dashboard/src2/components/icons/SettingsIcon.vue b/dashboard/src/components/icons/SettingsIcon.vue similarity index 100% rename from dashboard/src2/components/icons/SettingsIcon.vue rename to dashboard/src/components/icons/SettingsIcon.vue diff --git a/dashboard/src2/components/icons/SiteIcon.vue b/dashboard/src/components/icons/SiteIcon.vue similarity index 100% rename from dashboard/src2/components/icons/SiteIcon.vue rename to dashboard/src/components/icons/SiteIcon.vue diff --git a/dashboard/src2/components/icons/SpacesIcon.vue b/dashboard/src/components/icons/SpacesIcon.vue similarity index 100% rename from dashboard/src2/components/icons/SpacesIcon.vue rename to dashboard/src/components/icons/SpacesIcon.vue diff --git a/dashboard/src2/components/icons/cards/Amex.vue b/dashboard/src/components/icons/cards/Amex.vue similarity index 100% rename from dashboard/src2/components/icons/cards/Amex.vue rename to dashboard/src/components/icons/cards/Amex.vue diff --git a/dashboard/src2/components/icons/cards/Generic.vue b/dashboard/src/components/icons/cards/Generic.vue similarity index 100% rename from dashboard/src2/components/icons/cards/Generic.vue rename to dashboard/src/components/icons/cards/Generic.vue diff --git a/dashboard/src2/components/icons/cards/JCB.vue b/dashboard/src/components/icons/cards/JCB.vue similarity index 100% rename from dashboard/src2/components/icons/cards/JCB.vue rename to dashboard/src/components/icons/cards/JCB.vue diff --git a/dashboard/src2/components/icons/cards/MasterCard.vue b/dashboard/src/components/icons/cards/MasterCard.vue similarity index 100% rename from dashboard/src2/components/icons/cards/MasterCard.vue rename to dashboard/src/components/icons/cards/MasterCard.vue diff --git a/dashboard/src2/components/icons/cards/UnionPay.vue b/dashboard/src/components/icons/cards/UnionPay.vue similarity index 100% rename from dashboard/src2/components/icons/cards/UnionPay.vue rename to dashboard/src/components/icons/cards/UnionPay.vue diff --git a/dashboard/src2/components/icons/cards/Visa.vue b/dashboard/src/components/icons/cards/Visa.vue similarity index 100% rename from dashboard/src2/components/icons/cards/Visa.vue rename to dashboard/src/components/icons/cards/Visa.vue diff --git a/dashboard/src2/components/icons/index.js b/dashboard/src/components/icons/index.js similarity index 100% rename from dashboard/src2/components/icons/index.js rename to dashboard/src/components/icons/index.js diff --git a/dashboard/src2/components/marketplace/AppListingStepsDialog.vue b/dashboard/src/components/marketplace/AppListingStepsDialog.vue similarity index 100% rename from dashboard/src2/components/marketplace/AppListingStepsDialog.vue rename to dashboard/src/components/marketplace/AppListingStepsDialog.vue diff --git a/dashboard/src2/components/marketplace/ChangeAppBranchDialog.vue b/dashboard/src/components/marketplace/ChangeAppBranchDialog.vue similarity index 100% rename from dashboard/src2/components/marketplace/ChangeAppBranchDialog.vue rename to dashboard/src/components/marketplace/ChangeAppBranchDialog.vue diff --git a/dashboard/src2/components/marketplace/CodeReview.vue b/dashboard/src/components/marketplace/CodeReview.vue similarity index 100% rename from dashboard/src2/components/marketplace/CodeReview.vue rename to dashboard/src/components/marketplace/CodeReview.vue diff --git a/dashboard/src2/components/marketplace/CreateAppVersionDialog.vue b/dashboard/src/components/marketplace/CreateAppVersionDialog.vue similarity index 100% rename from dashboard/src2/components/marketplace/CreateAppVersionDialog.vue rename to dashboard/src/components/marketplace/CreateAppVersionDialog.vue diff --git a/dashboard/src2/components/marketplace/MarketplaceAppAnalytics.vue b/dashboard/src/components/marketplace/MarketplaceAppAnalytics.vue similarity index 100% rename from dashboard/src2/components/marketplace/MarketplaceAppAnalytics.vue rename to dashboard/src/components/marketplace/MarketplaceAppAnalytics.vue diff --git a/dashboard/src2/components/marketplace/MarketplaceAppReviewStages.vue b/dashboard/src/components/marketplace/MarketplaceAppReviewStages.vue similarity index 100% rename from dashboard/src2/components/marketplace/MarketplaceAppReviewStages.vue rename to dashboard/src/components/marketplace/MarketplaceAppReviewStages.vue diff --git a/dashboard/src2/components/marketplace/NewComment.vue b/dashboard/src/components/marketplace/NewComment.vue similarity index 100% rename from dashboard/src2/components/marketplace/NewComment.vue rename to dashboard/src/components/marketplace/NewComment.vue diff --git a/dashboard/src2/components/marketplace/NewMarketplaceAppDialog.vue b/dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue similarity index 100% rename from dashboard/src2/components/marketplace/NewMarketplaceAppDialog.vue rename to dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue diff --git a/dashboard/src2/components/marketplace/PlansDialog.vue b/dashboard/src/components/marketplace/PlansDialog.vue similarity index 100% rename from dashboard/src2/components/marketplace/PlansDialog.vue rename to dashboard/src/components/marketplace/PlansDialog.vue diff --git a/dashboard/src2/components/marketplace/PublisherPayoutInfoCard.vue b/dashboard/src/components/marketplace/PublisherPayoutInfoCard.vue similarity index 100% rename from dashboard/src2/components/marketplace/PublisherPayoutInfoCard.vue rename to dashboard/src/components/marketplace/PublisherPayoutInfoCard.vue diff --git a/dashboard/src2/components/marketplace/PublisherProfileCard.vue b/dashboard/src/components/marketplace/PublisherProfileCard.vue similarity index 100% rename from dashboard/src2/components/marketplace/PublisherProfileCard.vue rename to dashboard/src/components/marketplace/PublisherProfileCard.vue diff --git a/dashboard/src2/components/marketplace/ReplyMarketplaceApp.vue b/dashboard/src/components/marketplace/ReplyMarketplaceApp.vue similarity index 100% rename from dashboard/src2/components/marketplace/ReplyMarketplaceApp.vue rename to dashboard/src/components/marketplace/ReplyMarketplaceApp.vue diff --git a/dashboard/src2/components/partners/BuyPartnerCreditsRazorpay.vue b/dashboard/src/components/partners/BuyPartnerCreditsRazorpay.vue similarity index 100% rename from dashboard/src2/components/partners/BuyPartnerCreditsRazorpay.vue rename to dashboard/src/components/partners/BuyPartnerCreditsRazorpay.vue diff --git a/dashboard/src2/components/partners/BuyPartnerCreditsStripe.vue b/dashboard/src/components/partners/BuyPartnerCreditsStripe.vue similarity index 100% rename from dashboard/src2/components/partners/BuyPartnerCreditsStripe.vue rename to dashboard/src/components/partners/BuyPartnerCreditsStripe.vue diff --git a/dashboard/src2/components/partners/PartnerApprovalRequests.vue b/dashboard/src/components/partners/PartnerApprovalRequests.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerApprovalRequests.vue rename to dashboard/src/components/partners/PartnerApprovalRequests.vue diff --git a/dashboard/src2/components/partners/PartnerContribution.vue b/dashboard/src/components/partners/PartnerContribution.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerContribution.vue rename to dashboard/src/components/partners/PartnerContribution.vue diff --git a/dashboard/src2/components/partners/PartnerCreditsForm.vue b/dashboard/src/components/partners/PartnerCreditsForm.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerCreditsForm.vue rename to dashboard/src/components/partners/PartnerCreditsForm.vue diff --git a/dashboard/src2/components/partners/PartnerCustomerInvoices.vue b/dashboard/src/components/partners/PartnerCustomerInvoices.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerCustomerInvoices.vue rename to dashboard/src/components/partners/PartnerCustomerInvoices.vue diff --git a/dashboard/src2/components/partners/PartnerCustomers.vue b/dashboard/src/components/partners/PartnerCustomers.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerCustomers.vue rename to dashboard/src/components/partners/PartnerCustomers.vue diff --git a/dashboard/src2/components/partners/PartnerLocalPaymentSetup.vue b/dashboard/src/components/partners/PartnerLocalPaymentSetup.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerLocalPaymentSetup.vue rename to dashboard/src/components/partners/PartnerLocalPaymentSetup.vue diff --git a/dashboard/src2/components/partners/PartnerMembers.vue b/dashboard/src/components/partners/PartnerMembers.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerMembers.vue rename to dashboard/src/components/partners/PartnerMembers.vue diff --git a/dashboard/src2/components/partners/PartnerOverview.vue b/dashboard/src/components/partners/PartnerOverview.vue similarity index 100% rename from dashboard/src2/components/partners/PartnerOverview.vue rename to dashboard/src/components/partners/PartnerOverview.vue diff --git a/dashboard/src2/components/server/ServerActionCell.vue b/dashboard/src/components/server/ServerActionCell.vue similarity index 100% rename from dashboard/src2/components/server/ServerActionCell.vue rename to dashboard/src/components/server/ServerActionCell.vue diff --git a/dashboard/src2/components/server/ServerActions.vue b/dashboard/src/components/server/ServerActions.vue similarity index 100% rename from dashboard/src2/components/server/ServerActions.vue rename to dashboard/src/components/server/ServerActions.vue diff --git a/dashboard/src2/components/server/ServerCharts.vue b/dashboard/src/components/server/ServerCharts.vue similarity index 100% rename from dashboard/src2/components/server/ServerCharts.vue rename to dashboard/src/components/server/ServerCharts.vue diff --git a/dashboard/src2/components/server/ServerLoadAverage.vue b/dashboard/src/components/server/ServerLoadAverage.vue similarity index 100% rename from dashboard/src2/components/server/ServerLoadAverage.vue rename to dashboard/src/components/server/ServerLoadAverage.vue diff --git a/dashboard/src2/components/server/ServerOverview.vue b/dashboard/src/components/server/ServerOverview.vue similarity index 100% rename from dashboard/src2/components/server/ServerOverview.vue rename to dashboard/src/components/server/ServerOverview.vue diff --git a/dashboard/src2/components/server/ServerPlansCards.vue b/dashboard/src/components/server/ServerPlansCards.vue similarity index 100% rename from dashboard/src2/components/server/ServerPlansCards.vue rename to dashboard/src/components/server/ServerPlansCards.vue diff --git a/dashboard/src2/components/server/ServerPlansDialog.vue b/dashboard/src/components/server/ServerPlansDialog.vue similarity index 100% rename from dashboard/src2/components/server/ServerPlansDialog.vue rename to dashboard/src/components/server/ServerPlansDialog.vue diff --git a/dashboard/src2/components/settings/ActivateWebhookDialog.vue b/dashboard/src/components/settings/ActivateWebhookDialog.vue similarity index 100% rename from dashboard/src2/components/settings/ActivateWebhookDialog.vue rename to dashboard/src/components/settings/ActivateWebhookDialog.vue diff --git a/dashboard/src2/components/settings/AddNewWebhookDialog.vue b/dashboard/src/components/settings/AddNewWebhookDialog.vue similarity index 100% rename from dashboard/src2/components/settings/AddNewWebhookDialog.vue rename to dashboard/src/components/settings/AddNewWebhookDialog.vue diff --git a/dashboard/src2/components/settings/DeveloperSettings.vue b/dashboard/src/components/settings/DeveloperSettings.vue similarity index 100% rename from dashboard/src2/components/settings/DeveloperSettings.vue rename to dashboard/src/components/settings/DeveloperSettings.vue diff --git a/dashboard/src2/components/settings/EditWebhookDialog.vue b/dashboard/src/components/settings/EditWebhookDialog.vue similarity index 100% rename from dashboard/src2/components/settings/EditWebhookDialog.vue rename to dashboard/src/components/settings/EditWebhookDialog.vue diff --git a/dashboard/src2/components/settings/InviteTeamMemberDialog.vue b/dashboard/src/components/settings/InviteTeamMemberDialog.vue similarity index 100% rename from dashboard/src2/components/settings/InviteTeamMemberDialog.vue rename to dashboard/src/components/settings/InviteTeamMemberDialog.vue diff --git a/dashboard/src2/components/settings/RoleConfigureDialog.vue b/dashboard/src/components/settings/RoleConfigureDialog.vue similarity index 100% rename from dashboard/src2/components/settings/RoleConfigureDialog.vue rename to dashboard/src/components/settings/RoleConfigureDialog.vue diff --git a/dashboard/src2/components/settings/RoleList.vue b/dashboard/src/components/settings/RoleList.vue similarity index 100% rename from dashboard/src2/components/settings/RoleList.vue rename to dashboard/src/components/settings/RoleList.vue diff --git a/dashboard/src2/components/settings/RolePermissions.vue b/dashboard/src/components/settings/RolePermissions.vue similarity index 100% rename from dashboard/src2/components/settings/RolePermissions.vue rename to dashboard/src/components/settings/RolePermissions.vue diff --git a/dashboard/src2/components/settings/SettingsPermissions.vue b/dashboard/src/components/settings/SettingsPermissions.vue similarity index 100% rename from dashboard/src2/components/settings/SettingsPermissions.vue rename to dashboard/src/components/settings/SettingsPermissions.vue diff --git a/dashboard/src2/components/settings/TeamSettings.vue b/dashboard/src/components/settings/TeamSettings.vue similarity index 100% rename from dashboard/src2/components/settings/TeamSettings.vue rename to dashboard/src/components/settings/TeamSettings.vue diff --git a/dashboard/src2/components/settings/TeamSettingsDialog.vue b/dashboard/src/components/settings/TeamSettingsDialog.vue similarity index 100% rename from dashboard/src2/components/settings/TeamSettingsDialog.vue rename to dashboard/src/components/settings/TeamSettingsDialog.vue diff --git a/dashboard/src2/components/settings/WebhookAttemptDetails.vue b/dashboard/src/components/settings/WebhookAttemptDetails.vue similarity index 100% rename from dashboard/src2/components/settings/WebhookAttemptDetails.vue rename to dashboard/src/components/settings/WebhookAttemptDetails.vue diff --git a/dashboard/src2/components/settings/WebhookAttemptsDialog.vue b/dashboard/src/components/settings/WebhookAttemptsDialog.vue similarity index 100% rename from dashboard/src2/components/settings/WebhookAttemptsDialog.vue rename to dashboard/src/components/settings/WebhookAttemptsDialog.vue diff --git a/dashboard/src2/components/settings/profile/AccountEmails.vue b/dashboard/src/components/settings/profile/AccountEmails.vue similarity index 100% rename from dashboard/src2/components/settings/profile/AccountEmails.vue rename to dashboard/src/components/settings/profile/AccountEmails.vue diff --git a/dashboard/src2/components/settings/profile/AccountPartner.vue b/dashboard/src/components/settings/profile/AccountPartner.vue similarity index 100% rename from dashboard/src2/components/settings/profile/AccountPartner.vue rename to dashboard/src/components/settings/profile/AccountPartner.vue diff --git a/dashboard/src2/components/settings/profile/AccountProfile.vue b/dashboard/src/components/settings/profile/AccountProfile.vue similarity index 100% rename from dashboard/src2/components/settings/profile/AccountProfile.vue rename to dashboard/src/components/settings/profile/AccountProfile.vue diff --git a/dashboard/src2/components/settings/profile/AccountReferral.vue b/dashboard/src/components/settings/profile/AccountReferral.vue similarity index 100% rename from dashboard/src2/components/settings/profile/AccountReferral.vue rename to dashboard/src/components/settings/profile/AccountReferral.vue diff --git a/dashboard/src2/components/settings/profile/ProfileSettings.vue b/dashboard/src/components/settings/profile/ProfileSettings.vue similarity index 100% rename from dashboard/src2/components/settings/profile/ProfileSettings.vue rename to dashboard/src/components/settings/profile/ProfileSettings.vue diff --git a/dashboard/src2/components/settings/profile/ResetPasswordDialog.vue b/dashboard/src/components/settings/profile/ResetPasswordDialog.vue similarity index 100% rename from dashboard/src2/components/settings/profile/ResetPasswordDialog.vue rename to dashboard/src/components/settings/profile/ResetPasswordDialog.vue diff --git a/dashboard/src2/components/settings/profile/TFADialog.vue b/dashboard/src/components/settings/profile/TFADialog.vue similarity index 100% rename from dashboard/src2/components/settings/profile/TFADialog.vue rename to dashboard/src/components/settings/profile/TFADialog.vue diff --git a/dashboard/src2/components/site/AnalyticsCard.vue b/dashboard/src/components/site/AnalyticsCard.vue similarity index 100% rename from dashboard/src2/components/site/AnalyticsCard.vue rename to dashboard/src/components/site/AnalyticsCard.vue diff --git a/dashboard/src2/components/site/ConfigureAutoUpdateDialog.vue b/dashboard/src/components/site/ConfigureAutoUpdateDialog.vue similarity index 100% rename from dashboard/src2/components/site/ConfigureAutoUpdateDialog.vue rename to dashboard/src/components/site/ConfigureAutoUpdateDialog.vue diff --git a/dashboard/src2/components/site/InstallAppDialog.vue b/dashboard/src/components/site/InstallAppDialog.vue similarity index 100% rename from dashboard/src2/components/site/InstallAppDialog.vue rename to dashboard/src/components/site/InstallAppDialog.vue diff --git a/dashboard/src2/components/site/NewSiteAppSelector.vue b/dashboard/src/components/site/NewSiteAppSelector.vue similarity index 100% rename from dashboard/src2/components/site/NewSiteAppSelector.vue rename to dashboard/src/components/site/NewSiteAppSelector.vue diff --git a/dashboard/src2/components/site/SelectSiteForRestore.vue b/dashboard/src/components/site/SelectSiteForRestore.vue similarity index 100% rename from dashboard/src2/components/site/SelectSiteForRestore.vue rename to dashboard/src/components/site/SelectSiteForRestore.vue diff --git a/dashboard/src2/components/site/SiteAnalytics.vue b/dashboard/src/components/site/SiteAnalytics.vue similarity index 100% rename from dashboard/src2/components/site/SiteAnalytics.vue rename to dashboard/src/components/site/SiteAnalytics.vue diff --git a/dashboard/src2/components/site/SiteAppPlanSelectDialog.vue b/dashboard/src/components/site/SiteAppPlanSelectDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteAppPlanSelectDialog.vue rename to dashboard/src/components/site/SiteAppPlanSelectDialog.vue diff --git a/dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue b/dashboard/src/components/site/SiteAppPlanSelectorDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue rename to dashboard/src/components/site/SiteAppPlanSelectorDialog.vue diff --git a/dashboard/src2/components/site/SiteChangeGroupDialog.vue b/dashboard/src/components/site/SiteChangeGroupDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteChangeGroupDialog.vue rename to dashboard/src/components/site/SiteChangeGroupDialog.vue diff --git a/dashboard/src2/components/site/SiteChangeRegionDialog.vue b/dashboard/src/components/site/SiteChangeRegionDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteChangeRegionDialog.vue rename to dashboard/src/components/site/SiteChangeRegionDialog.vue diff --git a/dashboard/src2/components/site/SiteChangeServerDialog.vue b/dashboard/src/components/site/SiteChangeServerDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteChangeServerDialog.vue rename to dashboard/src/components/site/SiteChangeServerDialog.vue diff --git a/dashboard/src2/components/site/SiteDatabaseRestoreFromURLDialog.vue b/dashboard/src/components/site/SiteDatabaseRestoreFromURLDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteDatabaseRestoreFromURLDialog.vue rename to dashboard/src/components/site/SiteDatabaseRestoreFromURLDialog.vue diff --git a/dashboard/src2/components/site/SiteInsights.vue b/dashboard/src/components/site/SiteInsights.vue similarity index 100% rename from dashboard/src2/components/site/SiteInsights.vue rename to dashboard/src/components/site/SiteInsights.vue diff --git a/dashboard/src2/components/site/SiteJobs.vue b/dashboard/src/components/site/SiteJobs.vue similarity index 100% rename from dashboard/src2/components/site/SiteJobs.vue rename to dashboard/src/components/site/SiteJobs.vue diff --git a/dashboard/src2/components/site/SiteLogs.vue b/dashboard/src/components/site/SiteLogs.vue similarity index 100% rename from dashboard/src2/components/site/SiteLogs.vue rename to dashboard/src/components/site/SiteLogs.vue diff --git a/dashboard/src2/components/site/SiteUptime.vue b/dashboard/src/components/site/SiteUptime.vue similarity index 100% rename from dashboard/src2/components/site/SiteUptime.vue rename to dashboard/src/components/site/SiteUptime.vue diff --git a/dashboard/src2/components/site/SiteVersionUpgradeDialog.vue b/dashboard/src/components/site/SiteVersionUpgradeDialog.vue similarity index 100% rename from dashboard/src2/components/site/SiteVersionUpgradeDialog.vue rename to dashboard/src/components/site/SiteVersionUpgradeDialog.vue diff --git a/dashboard/src2/components/site/performance/PerformanceReport.vue b/dashboard/src/components/site/performance/PerformanceReport.vue similarity index 100% rename from dashboard/src2/components/site/performance/PerformanceReport.vue rename to dashboard/src/components/site/performance/PerformanceReport.vue diff --git a/dashboard/src2/components/site/performance/SiteBinaryLogs.vue b/dashboard/src/components/site/performance/SiteBinaryLogs.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteBinaryLogs.vue rename to dashboard/src/components/site/performance/SiteBinaryLogs.vue diff --git a/dashboard/src2/components/site/performance/SiteDatabaseProcess.vue b/dashboard/src/components/site/performance/SiteDatabaseProcess.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteDatabaseProcess.vue rename to dashboard/src/components/site/performance/SiteDatabaseProcess.vue diff --git a/dashboard/src2/components/site/performance/SiteDeadlockReport.vue b/dashboard/src/components/site/performance/SiteDeadlockReport.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteDeadlockReport.vue rename to dashboard/src/components/site/performance/SiteDeadlockReport.vue diff --git a/dashboard/src2/components/site/performance/SitePerformance.vue b/dashboard/src/components/site/performance/SitePerformance.vue similarity index 100% rename from dashboard/src2/components/site/performance/SitePerformance.vue rename to dashboard/src/components/site/performance/SitePerformance.vue diff --git a/dashboard/src2/components/site/performance/SiteProcessList.vue b/dashboard/src/components/site/performance/SiteProcessList.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteProcessList.vue rename to dashboard/src/components/site/performance/SiteProcessList.vue diff --git a/dashboard/src2/components/site/performance/SiteRequestLogs.vue b/dashboard/src/components/site/performance/SiteRequestLogs.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteRequestLogs.vue rename to dashboard/src/components/site/performance/SiteRequestLogs.vue diff --git a/dashboard/src2/components/site/performance/SiteSlowQueries.vue b/dashboard/src/components/site/performance/SiteSlowQueries.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteSlowQueries.vue rename to dashboard/src/components/site/performance/SiteSlowQueries.vue diff --git a/dashboard/src2/components/site/performance/SiteSlowQueryDialog.vue b/dashboard/src/components/site/performance/SiteSlowQueryDialog.vue similarity index 100% rename from dashboard/src2/components/site/performance/SiteSlowQueryDialog.vue rename to dashboard/src/components/site/performance/SiteSlowQueryDialog.vue diff --git a/dashboard/src2/components/site_database_user/SiteDatabaseAddEditUserDialog.vue b/dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue similarity index 100% rename from dashboard/src2/components/site_database_user/SiteDatabaseAddEditUserDialog.vue rename to dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue diff --git a/dashboard/src2/components/site_database_user/SiteDatabaseColumnsSelector.vue b/dashboard/src/components/site_database_user/SiteDatabaseColumnsSelector.vue similarity index 100% rename from dashboard/src2/components/site_database_user/SiteDatabaseColumnsSelector.vue rename to dashboard/src/components/site_database_user/SiteDatabaseColumnsSelector.vue diff --git a/dashboard/src2/components/site_database_user/SiteDatabaseUserCredentialDialog.vue b/dashboard/src/components/site_database_user/SiteDatabaseUserCredentialDialog.vue similarity index 100% rename from dashboard/src2/components/site_database_user/SiteDatabaseUserCredentialDialog.vue rename to dashboard/src/components/site_database_user/SiteDatabaseUserCredentialDialog.vue diff --git a/dashboard/src2/components/utils/CommitChooser.vue b/dashboard/src/components/utils/CommitChooser.vue similarity index 100% rename from dashboard/src2/components/utils/CommitChooser.vue rename to dashboard/src/components/utils/CommitChooser.vue diff --git a/dashboard/src2/components/utils/CommitTag.vue b/dashboard/src/components/utils/CommitTag.vue similarity index 100% rename from dashboard/src2/components/utils/CommitTag.vue rename to dashboard/src/components/utils/CommitTag.vue diff --git a/dashboard/src2/composables/resource.js b/dashboard/src/composables/resource.js similarity index 100% rename from dashboard/src2/composables/resource.js rename to dashboard/src/composables/resource.js diff --git a/dashboard/src2/controllers/account.js b/dashboard/src/controllers/account.js similarity index 100% rename from dashboard/src2/controllers/account.js rename to dashboard/src/controllers/account.js diff --git a/dashboard/src2/controllers/auth.js b/dashboard/src/controllers/auth.js similarity index 100% rename from dashboard/src2/controllers/auth.js rename to dashboard/src/controllers/auth.js diff --git a/dashboard/src2/controllers/call.js b/dashboard/src/controllers/call.js similarity index 100% rename from dashboard/src2/controllers/call.js rename to dashboard/src/controllers/call.js diff --git a/dashboard/src2/controllers/fileUploader.js b/dashboard/src/controllers/fileUploader.js similarity index 100% rename from dashboard/src2/controllers/fileUploader.js rename to dashboard/src/controllers/fileUploader.js diff --git a/dashboard/src2/controllers/loginAsAdmin.js b/dashboard/src/controllers/loginAsAdmin.js similarity index 100% rename from dashboard/src2/controllers/loginAsAdmin.js rename to dashboard/src/controllers/loginAsAdmin.js diff --git a/dashboard/src2/controllers/register.js b/dashboard/src/controllers/register.js similarity index 100% rename from dashboard/src2/controllers/register.js rename to dashboard/src/controllers/register.js diff --git a/dashboard/src2/controllers/s3FileUploader.js b/dashboard/src/controllers/s3FileUploader.js similarity index 100% rename from dashboard/src2/controllers/s3FileUploader.js rename to dashboard/src/controllers/s3FileUploader.js diff --git a/dashboard/src2/controllers/socket.js b/dashboard/src/controllers/socket.js similarity index 100% rename from dashboard/src2/controllers/socket.js rename to dashboard/src/controllers/socket.js diff --git a/dashboard/src2/data/notifications.js b/dashboard/src/data/notifications.js similarity index 100% rename from dashboard/src2/data/notifications.js rename to dashboard/src/data/notifications.js diff --git a/dashboard/src2/data/plans.js b/dashboard/src/data/plans.js similarity index 100% rename from dashboard/src2/data/plans.js rename to dashboard/src/data/plans.js diff --git a/dashboard/src2/data/session.js b/dashboard/src/data/session.js similarity index 100% rename from dashboard/src2/data/session.js rename to dashboard/src/data/session.js diff --git a/dashboard/src2/data/team.js b/dashboard/src/data/team.js similarity index 100% rename from dashboard/src2/data/team.js rename to dashboard/src/data/team.js diff --git a/dashboard/src2/dialogs/ConfirmDialog.vue b/dashboard/src/dialogs/ConfirmDialog.vue similarity index 100% rename from dashboard/src2/dialogs/ConfirmDialog.vue rename to dashboard/src/dialogs/ConfirmDialog.vue diff --git a/dashboard/src2/dialogs/PasswordDialog.vue b/dashboard/src/dialogs/PasswordDialog.vue similarity index 100% rename from dashboard/src2/dialogs/PasswordDialog.vue rename to dashboard/src/dialogs/PasswordDialog.vue diff --git a/dashboard/src2/dialogs/TagsDialog.vue b/dashboard/src/dialogs/TagsDialog.vue similarity index 100% rename from dashboard/src2/dialogs/TagsDialog.vue rename to dashboard/src/dialogs/TagsDialog.vue diff --git a/dashboard/src2/globals.ts b/dashboard/src/globals.ts similarity index 100% rename from dashboard/src2/globals.ts rename to dashboard/src/globals.ts diff --git a/dashboard/src2/logo/AlipayLogo.vue b/dashboard/src/logo/AlipayLogo.vue similarity index 100% rename from dashboard/src2/logo/AlipayLogo.vue rename to dashboard/src/logo/AlipayLogo.vue diff --git a/dashboard/src2/logo/PoweredByStripeLogo.vue b/dashboard/src/logo/PoweredByStripeLogo.vue similarity index 100% rename from dashboard/src2/logo/PoweredByStripeLogo.vue rename to dashboard/src/logo/PoweredByStripeLogo.vue diff --git a/dashboard/src2/logo/RazorpayLogo.vue b/dashboard/src/logo/RazorpayLogo.vue similarity index 100% rename from dashboard/src2/logo/RazorpayLogo.vue rename to dashboard/src/logo/RazorpayLogo.vue diff --git a/dashboard/src2/logo/StripeLogo.vue b/dashboard/src/logo/StripeLogo.vue similarity index 100% rename from dashboard/src2/logo/StripeLogo.vue rename to dashboard/src/logo/StripeLogo.vue diff --git a/dashboard/src2/logo/WeChatPayLogo.vue b/dashboard/src/logo/WeChatPayLogo.vue similarity index 100% rename from dashboard/src2/logo/WeChatPayLogo.vue rename to dashboard/src/logo/WeChatPayLogo.vue diff --git a/dashboard/src2/main.js b/dashboard/src/main.js similarity index 100% rename from dashboard/src2/main.js rename to dashboard/src/main.js diff --git a/dashboard/src2/objects/bench.ts b/dashboard/src/objects/bench.ts similarity index 100% rename from dashboard/src2/objects/bench.ts rename to dashboard/src/objects/bench.ts diff --git a/dashboard/src2/objects/common/apps.ts b/dashboard/src/objects/common/apps.ts similarity index 100% rename from dashboard/src2/objects/common/apps.ts rename to dashboard/src/objects/common/apps.ts diff --git a/dashboard/src2/objects/common/index.ts b/dashboard/src/objects/common/index.ts similarity index 100% rename from dashboard/src2/objects/common/index.ts rename to dashboard/src/objects/common/index.ts diff --git a/dashboard/src2/objects/common/jobs.ts b/dashboard/src/objects/common/jobs.ts similarity index 100% rename from dashboard/src2/objects/common/jobs.ts rename to dashboard/src/objects/common/jobs.ts diff --git a/dashboard/src2/objects/common/patches.ts b/dashboard/src/objects/common/patches.ts similarity index 100% rename from dashboard/src2/objects/common/patches.ts rename to dashboard/src/objects/common/patches.ts diff --git a/dashboard/src2/objects/common/tags.js b/dashboard/src/objects/common/tags.js similarity index 100% rename from dashboard/src2/objects/common/tags.js rename to dashboard/src/objects/common/tags.js diff --git a/dashboard/src2/objects/common/types.ts b/dashboard/src/objects/common/types.ts similarity index 100% rename from dashboard/src2/objects/common/types.ts rename to dashboard/src/objects/common/types.ts diff --git a/dashboard/src2/objects/domain.js b/dashboard/src/objects/domain.js similarity index 100% rename from dashboard/src2/objects/domain.js rename to dashboard/src/objects/domain.js diff --git a/dashboard/src2/objects/generateRoutes.js b/dashboard/src/objects/generateRoutes.js similarity index 100% rename from dashboard/src2/objects/generateRoutes.js rename to dashboard/src/objects/generateRoutes.js diff --git a/dashboard/src2/objects/group.js b/dashboard/src/objects/group.js similarity index 100% rename from dashboard/src2/objects/group.js rename to dashboard/src/objects/group.js diff --git a/dashboard/src2/objects/index.js b/dashboard/src/objects/index.js similarity index 100% rename from dashboard/src2/objects/index.js rename to dashboard/src/objects/index.js diff --git a/dashboard/src2/objects/jsite_server.js b/dashboard/src/objects/jsite_server.js similarity index 100% rename from dashboard/src2/objects/jsite_server.js rename to dashboard/src/objects/jsite_server.js diff --git a/dashboard/src2/objects/marketplace.js b/dashboard/src/objects/marketplace.js similarity index 100% rename from dashboard/src2/objects/marketplace.js rename to dashboard/src/objects/marketplace.js diff --git a/dashboard/src2/objects/notification.js b/dashboard/src/objects/notification.js similarity index 100% rename from dashboard/src2/objects/notification.js rename to dashboard/src/objects/notification.js diff --git a/dashboard/src2/objects/server.js b/dashboard/src/objects/server.js similarity index 100% rename from dashboard/src2/objects/server.js rename to dashboard/src/objects/server.js diff --git a/dashboard/src2/objects/site.js b/dashboard/src/objects/site.js similarity index 100% rename from dashboard/src2/objects/site.js rename to dashboard/src/objects/site.js diff --git a/dashboard/src2/objects/tabs/site/logs.ts b/dashboard/src/objects/tabs/site/logs.ts similarity index 100% rename from dashboard/src2/objects/tabs/site/logs.ts rename to dashboard/src/objects/tabs/site/logs.ts diff --git a/dashboard/src2/pages/Billing.vue b/dashboard/src/pages/Billing.vue similarity index 100% rename from dashboard/src2/pages/Billing.vue rename to dashboard/src/pages/Billing.vue diff --git a/dashboard/src2/pages/BillingBalances.vue b/dashboard/src/pages/BillingBalances.vue similarity index 100% rename from dashboard/src2/pages/BillingBalances.vue rename to dashboard/src/pages/BillingBalances.vue diff --git a/dashboard/src2/pages/BillingInvoices.vue b/dashboard/src/pages/BillingInvoices.vue similarity index 100% rename from dashboard/src2/pages/BillingInvoices.vue rename to dashboard/src/pages/BillingInvoices.vue diff --git a/dashboard/src2/pages/BillingMarketplacePayouts.vue b/dashboard/src/pages/BillingMarketplacePayouts.vue similarity index 100% rename from dashboard/src2/pages/BillingMarketplacePayouts.vue rename to dashboard/src/pages/BillingMarketplacePayouts.vue diff --git a/dashboard/src2/pages/BillingMpesaInvoices.vue b/dashboard/src/pages/BillingMpesaInvoices.vue similarity index 100% rename from dashboard/src2/pages/BillingMpesaInvoices.vue rename to dashboard/src/pages/BillingMpesaInvoices.vue diff --git a/dashboard/src2/pages/BillingOrders.vue b/dashboard/src/pages/BillingOrders.vue similarity index 100% rename from dashboard/src2/pages/BillingOrders.vue rename to dashboard/src/pages/BillingOrders.vue diff --git a/dashboard/src2/pages/BillingOverview.vue b/dashboard/src/pages/BillingOverview.vue similarity index 100% rename from dashboard/src2/pages/BillingOverview.vue rename to dashboard/src/pages/BillingOverview.vue diff --git a/dashboard/src2/pages/BillingPaymentMethods.vue b/dashboard/src/pages/BillingPaymentMethods.vue similarity index 100% rename from dashboard/src2/pages/BillingPaymentMethods.vue rename to dashboard/src/pages/BillingPaymentMethods.vue diff --git a/dashboard/src2/pages/CreateSiteForMarketplaceApp.vue b/dashboard/src/pages/CreateSiteForMarketplaceApp.vue similarity index 100% rename from dashboard/src2/pages/CreateSiteForMarketplaceApp.vue rename to dashboard/src/pages/CreateSiteForMarketplaceApp.vue diff --git a/dashboard/src2/pages/DeployCandidate.vue b/dashboard/src/pages/DeployCandidate.vue similarity index 100% rename from dashboard/src2/pages/DeployCandidate.vue rename to dashboard/src/pages/DeployCandidate.vue diff --git a/dashboard/src2/pages/DetailPage.vue b/dashboard/src/pages/DetailPage.vue similarity index 100% rename from dashboard/src2/pages/DetailPage.vue rename to dashboard/src/pages/DetailPage.vue diff --git a/dashboard/src2/pages/DetailTab.vue b/dashboard/src/pages/DetailTab.vue similarity index 100% rename from dashboard/src2/pages/DetailTab.vue rename to dashboard/src/pages/DetailTab.vue diff --git a/dashboard/src2/pages/Enable2FA.vue b/dashboard/src/pages/Enable2FA.vue similarity index 100% rename from dashboard/src2/pages/Enable2FA.vue rename to dashboard/src/pages/Enable2FA.vue diff --git a/dashboard/src2/pages/Home.vue b/dashboard/src/pages/Home.vue similarity index 100% rename from dashboard/src2/pages/Home.vue rename to dashboard/src/pages/Home.vue diff --git a/dashboard/src2/pages/Impersonate.vue b/dashboard/src/pages/Impersonate.vue similarity index 100% rename from dashboard/src2/pages/Impersonate.vue rename to dashboard/src/pages/Impersonate.vue diff --git a/dashboard/src2/pages/InstallApp.vue b/dashboard/src/pages/InstallApp.vue similarity index 100% rename from dashboard/src2/pages/InstallApp.vue rename to dashboard/src/pages/InstallApp.vue diff --git a/dashboard/src2/pages/JobPage.vue b/dashboard/src/pages/JobPage.vue similarity index 100% rename from dashboard/src2/pages/JobPage.vue rename to dashboard/src/pages/JobPage.vue diff --git a/dashboard/src2/pages/ListPage.vue b/dashboard/src/pages/ListPage.vue similarity index 100% rename from dashboard/src2/pages/ListPage.vue rename to dashboard/src/pages/ListPage.vue diff --git a/dashboard/src2/pages/LogPage.vue b/dashboard/src/pages/LogPage.vue similarity index 100% rename from dashboard/src2/pages/LogPage.vue rename to dashboard/src/pages/LogPage.vue diff --git a/dashboard/src2/pages/LoginSignup.vue b/dashboard/src/pages/LoginSignup.vue similarity index 100% rename from dashboard/src2/pages/LoginSignup.vue rename to dashboard/src/pages/LoginSignup.vue diff --git a/dashboard/src2/pages/NewJsiteDomain.vue b/dashboard/src/pages/NewJsiteDomain.vue similarity index 100% rename from dashboard/src2/pages/NewJsiteDomain.vue rename to dashboard/src/pages/NewJsiteDomain.vue diff --git a/dashboard/src2/pages/NewJsiteServer.vue b/dashboard/src/pages/NewJsiteServer.vue similarity index 100% rename from dashboard/src2/pages/NewJsiteServer.vue rename to dashboard/src/pages/NewJsiteServer.vue diff --git a/dashboard/src2/pages/NewReleaseGroup.vue b/dashboard/src/pages/NewReleaseGroup.vue similarity index 100% rename from dashboard/src2/pages/NewReleaseGroup.vue rename to dashboard/src/pages/NewReleaseGroup.vue diff --git a/dashboard/src2/pages/NewServer.vue b/dashboard/src/pages/NewServer.vue similarity index 100% rename from dashboard/src2/pages/NewServer.vue rename to dashboard/src/pages/NewServer.vue diff --git a/dashboard/src2/pages/NewSite.vue b/dashboard/src/pages/NewSite.vue similarity index 100% rename from dashboard/src2/pages/NewSite.vue rename to dashboard/src/pages/NewSite.vue diff --git a/dashboard/src2/pages/Partners.vue b/dashboard/src/pages/Partners.vue similarity index 100% rename from dashboard/src2/pages/Partners.vue rename to dashboard/src/pages/Partners.vue diff --git a/dashboard/src2/pages/PlayPage.vue b/dashboard/src/pages/PlayPage.vue similarity index 100% rename from dashboard/src2/pages/PlayPage.vue rename to dashboard/src/pages/PlayPage.vue diff --git a/dashboard/src2/pages/RechargeCredits.vue b/dashboard/src/pages/RechargeCredits.vue similarity index 100% rename from dashboard/src2/pages/RechargeCredits.vue rename to dashboard/src/pages/RechargeCredits.vue diff --git a/dashboard/src2/pages/ReleaseGroupBenchSites.vue b/dashboard/src/pages/ReleaseGroupBenchSites.vue similarity index 100% rename from dashboard/src2/pages/ReleaseGroupBenchSites.vue rename to dashboard/src/pages/ReleaseGroupBenchSites.vue diff --git a/dashboard/src2/pages/ResetPassword.vue b/dashboard/src/pages/ResetPassword.vue similarity index 100% rename from dashboard/src2/pages/ResetPassword.vue rename to dashboard/src/pages/ResetPassword.vue diff --git a/dashboard/src2/pages/Settings.vue b/dashboard/src/pages/Settings.vue similarity index 100% rename from dashboard/src2/pages/Settings.vue rename to dashboard/src/pages/Settings.vue diff --git a/dashboard/src2/pages/SetupAccount.vue b/dashboard/src/pages/SetupAccount.vue similarity index 100% rename from dashboard/src2/pages/SetupAccount.vue rename to dashboard/src/pages/SetupAccount.vue diff --git a/dashboard/src2/pages/SiteLogin.vue b/dashboard/src/pages/SiteLogin.vue similarity index 100% rename from dashboard/src2/pages/SiteLogin.vue rename to dashboard/src/pages/SiteLogin.vue diff --git a/dashboard/src2/pages/SiteUpdate.vue b/dashboard/src/pages/SiteUpdate.vue similarity index 100% rename from dashboard/src2/pages/SiteUpdate.vue rename to dashboard/src/pages/SiteUpdate.vue diff --git a/dashboard/src2/pages/Welcome.vue b/dashboard/src/pages/Welcome.vue similarity index 100% rename from dashboard/src2/pages/Welcome.vue rename to dashboard/src/pages/Welcome.vue diff --git a/dashboard/src2/pages/devtools/database/DatabaseAnalyzer.vue b/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue similarity index 100% rename from dashboard/src2/pages/devtools/database/DatabaseAnalyzer.vue rename to dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue diff --git a/dashboard/src2/pages/devtools/database/DatabaseSQLPlayground.vue b/dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue similarity index 100% rename from dashboard/src2/pages/devtools/database/DatabaseSQLPlayground.vue rename to dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue diff --git a/dashboard/src2/pages/devtools/log-browser/LogBrowser.vue b/dashboard/src/pages/devtools/log-browser/LogBrowser.vue similarity index 100% rename from dashboard/src2/pages/devtools/log-browser/LogBrowser.vue rename to dashboard/src/pages/devtools/log-browser/LogBrowser.vue diff --git a/dashboard/src2/pages/devtools/log-browser/LogList.vue b/dashboard/src/pages/devtools/log-browser/LogList.vue similarity index 100% rename from dashboard/src2/pages/devtools/log-browser/LogList.vue rename to dashboard/src/pages/devtools/log-browser/LogList.vue diff --git a/dashboard/src2/pages/devtools/log-browser/LogViewer.vue b/dashboard/src/pages/devtools/log-browser/LogViewer.vue similarity index 100% rename from dashboard/src2/pages/devtools/log-browser/LogViewer.vue rename to dashboard/src/pages/devtools/log-browser/LogViewer.vue diff --git a/dashboard/src2/pages/saas/AppSelector.vue b/dashboard/src/pages/saas/AppSelector.vue similarity index 100% rename from dashboard/src2/pages/saas/AppSelector.vue rename to dashboard/src/pages/saas/AppSelector.vue diff --git a/dashboard/src2/pages/saas/Login.vue b/dashboard/src/pages/saas/Login.vue similarity index 100% rename from dashboard/src2/pages/saas/Login.vue rename to dashboard/src/pages/saas/Login.vue diff --git a/dashboard/src2/pages/saas/LoginToSite.vue b/dashboard/src/pages/saas/LoginToSite.vue similarity index 100% rename from dashboard/src2/pages/saas/LoginToSite.vue rename to dashboard/src/pages/saas/LoginToSite.vue diff --git a/dashboard/src2/pages/saas/OAuthSetupAccount.vue b/dashboard/src/pages/saas/OAuthSetupAccount.vue similarity index 100% rename from dashboard/src2/pages/saas/OAuthSetupAccount.vue rename to dashboard/src/pages/saas/OAuthSetupAccount.vue diff --git a/dashboard/src2/pages/saas/SetupSite.vue b/dashboard/src/pages/saas/SetupSite.vue similarity index 100% rename from dashboard/src2/pages/saas/SetupSite.vue rename to dashboard/src/pages/saas/SetupSite.vue diff --git a/dashboard/src2/pages/saas/Signup.vue b/dashboard/src/pages/saas/Signup.vue similarity index 100% rename from dashboard/src2/pages/saas/Signup.vue rename to dashboard/src/pages/saas/Signup.vue diff --git a/dashboard/src2/pages/saas/VerifyEmail.vue b/dashboard/src/pages/saas/VerifyEmail.vue similarity index 100% rename from dashboard/src2/pages/saas/VerifyEmail.vue rename to dashboard/src/pages/saas/VerifyEmail.vue diff --git a/dashboard/src2/plugins.js b/dashboard/src/plugins.js similarity index 100% rename from dashboard/src2/plugins.js rename to dashboard/src/plugins.js diff --git a/dashboard/src2/registerServiceWorker.js b/dashboard/src/registerServiceWorker.js similarity index 100% rename from dashboard/src2/registerServiceWorker.js rename to dashboard/src/registerServiceWorker.js diff --git a/dashboard/src2/router.js b/dashboard/src/router.js similarity index 100% rename from dashboard/src2/router.js rename to dashboard/src/router.js diff --git a/dashboard/src2/router/index.js b/dashboard/src/router/index.js similarity index 100% rename from dashboard/src2/router/index.js rename to dashboard/src/router/index.js diff --git a/dashboard/src2/router/register.js b/dashboard/src/router/register.js similarity index 100% rename from dashboard/src2/router/register.js rename to dashboard/src/router/register.js diff --git a/dashboard/src2/socket.js b/dashboard/src/socket.js similarity index 100% rename from dashboard/src2/socket.js rename to dashboard/src/socket.js diff --git a/dashboard/src2/tests/core/ClickToCopy.test.js b/dashboard/src/tests/core/ClickToCopy.test.js similarity index 100% rename from dashboard/src2/tests/core/ClickToCopy.test.js rename to dashboard/src/tests/core/ClickToCopy.test.js diff --git a/dashboard/src2/tests/core/FeatureList.test.js b/dashboard/src/tests/core/FeatureList.test.js similarity index 100% rename from dashboard/src2/tests/core/FeatureList.test.js rename to dashboard/src/tests/core/FeatureList.test.js diff --git a/dashboard/src2/tests/core/RichSelect.test.js b/dashboard/src/tests/core/RichSelect.test.js similarity index 100% rename from dashboard/src2/tests/core/RichSelect.test.js rename to dashboard/src/tests/core/RichSelect.test.js diff --git a/dashboard/src2/tests/core/StarRatingComponent.test.js b/dashboard/src/tests/core/StarRatingComponent.test.js similarity index 100% rename from dashboard/src2/tests/core/StarRatingComponent.test.js rename to dashboard/src/tests/core/StarRatingComponent.test.js diff --git a/dashboard/src2/tests/setup/msw.js b/dashboard/src/tests/setup/msw.js similarity index 100% rename from dashboard/src2/tests/setup/msw.js rename to dashboard/src/tests/setup/msw.js diff --git a/dashboard/src2/types.ts b/dashboard/src/types.ts similarity index 100% rename from dashboard/src2/types.ts rename to dashboard/src/types.ts diff --git a/dashboard/src2/utils.js b/dashboard/src/utils.js similarity index 100% rename from dashboard/src2/utils.js rename to dashboard/src/utils.js diff --git a/dashboard/src2/utils/agentJob.js b/dashboard/src/utils/agentJob.js similarity index 100% rename from dashboard/src2/utils/agentJob.js rename to dashboard/src/utils/agentJob.js diff --git a/dashboard/src2/utils/billing.js b/dashboard/src/utils/billing.js similarity index 100% rename from dashboard/src2/utils/billing.js rename to dashboard/src/utils/billing.js diff --git a/dashboard/src2/utils/components.jsx b/dashboard/src/utils/components.jsx similarity index 100% rename from dashboard/src2/utils/components.jsx rename to dashboard/src/utils/components.jsx diff --git a/dashboard/src2/utils/country.ts b/dashboard/src/utils/country.ts similarity index 100% rename from dashboard/src2/utils/country.ts rename to dashboard/src/utils/country.ts diff --git a/dashboard/src2/utils/dayjs.js b/dashboard/src/utils/dayjs.js similarity index 100% rename from dashboard/src2/utils/dayjs.js rename to dashboard/src/utils/dayjs.js diff --git a/dashboard/src2/utils/device.ts b/dashboard/src/utils/device.ts similarity index 100% rename from dashboard/src2/utils/device.ts rename to dashboard/src/utils/device.ts diff --git a/dashboard/src2/utils/error.ts b/dashboard/src/utils/error.ts similarity index 100% rename from dashboard/src2/utils/error.ts rename to dashboard/src/utils/error.ts diff --git a/dashboard/src2/utils/format.js b/dashboard/src/utils/format.js similarity index 100% rename from dashboard/src2/utils/format.js rename to dashboard/src/utils/format.js diff --git a/dashboard/src2/utils/regions.ts b/dashboard/src/utils/regions.ts similarity index 100% rename from dashboard/src2/utils/regions.ts rename to dashboard/src/utils/regions.ts diff --git a/dashboard/src2/utils/resource.js b/dashboard/src/utils/resource.js similarity index 100% rename from dashboard/src2/utils/resource.js rename to dashboard/src/utils/resource.js diff --git a/dashboard/src2/utils/site.js b/dashboard/src/utils/site.js similarity index 100% rename from dashboard/src2/utils/site.js rename to dashboard/src/utils/site.js diff --git a/dashboard/src2/utils/throttle.ts b/dashboard/src/utils/throttle.ts similarity index 100% rename from dashboard/src2/utils/throttle.ts rename to dashboard/src/utils/throttle.ts diff --git a/dashboard/src2/utils/toast.js b/dashboard/src/utils/toast.js similarity index 100% rename from dashboard/src2/utils/toast.js rename to dashboard/src/utils/toast.js diff --git a/dashboard/src2/vendor/posthog.js b/dashboard/src/vendor/posthog.js similarity index 100% rename from dashboard/src2/vendor/posthog.js rename to dashboard/src/vendor/posthog.js diff --git a/dashboard/src2/views/auth/Auth.vue b/dashboard/src/views/auth/Auth.vue similarity index 100% rename from dashboard/src2/views/auth/Auth.vue rename to dashboard/src/views/auth/Auth.vue diff --git a/dashboard/src2/views/auth/ImpersonateTeam.vue b/dashboard/src/views/auth/ImpersonateTeam.vue similarity index 100% rename from dashboard/src2/views/auth/ImpersonateTeam.vue rename to dashboard/src/views/auth/ImpersonateTeam.vue diff --git a/dashboard/src2/views/auth/Login.vue b/dashboard/src/views/auth/Login.vue similarity index 100% rename from dashboard/src2/views/auth/Login.vue rename to dashboard/src/views/auth/Login.vue diff --git a/dashboard/src2/views/auth/ResetPassword.vue b/dashboard/src/views/auth/ResetPassword.vue similarity index 100% rename from dashboard/src2/views/auth/ResetPassword.vue rename to dashboard/src/views/auth/ResetPassword.vue diff --git a/dashboard/src2/views/auth/SetupAccount.vue b/dashboard/src/views/auth/SetupAccount.vue similarity index 100% rename from dashboard/src2/views/auth/SetupAccount.vue rename to dashboard/src/views/auth/SetupAccount.vue diff --git a/dashboard/src2/views/bench/Bench.vue b/dashboard/src/views/bench/Bench.vue similarity index 100% rename from dashboard/src2/views/bench/Bench.vue rename to dashboard/src/views/bench/Bench.vue diff --git a/dashboard/src2/views/bench/BenchApps.vue b/dashboard/src/views/bench/BenchApps.vue similarity index 100% rename from dashboard/src2/views/bench/BenchApps.vue rename to dashboard/src/views/bench/BenchApps.vue diff --git a/dashboard/src2/views/bench/BenchConfig.vue b/dashboard/src/views/bench/BenchConfig.vue similarity index 100% rename from dashboard/src2/views/bench/BenchConfig.vue rename to dashboard/src/views/bench/BenchConfig.vue diff --git a/dashboard/src2/views/bench/BenchDependencies.vue b/dashboard/src/views/bench/BenchDependencies.vue similarity index 100% rename from dashboard/src2/views/bench/BenchDependencies.vue rename to dashboard/src/views/bench/BenchDependencies.vue diff --git a/dashboard/src2/views/bench/BenchDeploys.vue b/dashboard/src/views/bench/BenchDeploys.vue similarity index 100% rename from dashboard/src2/views/bench/BenchDeploys.vue rename to dashboard/src/views/bench/BenchDeploys.vue diff --git a/dashboard/src2/views/bench/BenchDropDialog.vue b/dashboard/src/views/bench/BenchDropDialog.vue similarity index 100% rename from dashboard/src2/views/bench/BenchDropDialog.vue rename to dashboard/src/views/bench/BenchDropDialog.vue diff --git a/dashboard/src2/views/bench/BenchJobs.vue b/dashboard/src/views/bench/BenchJobs.vue similarity index 100% rename from dashboard/src2/views/bench/BenchJobs.vue rename to dashboard/src/views/bench/BenchJobs.vue diff --git a/dashboard/src2/views/bench/BenchLogs.vue b/dashboard/src/views/bench/BenchLogs.vue similarity index 100% rename from dashboard/src2/views/bench/BenchLogs.vue rename to dashboard/src/views/bench/BenchLogs.vue diff --git a/dashboard/src2/views/bench/BenchLogsDetail.vue b/dashboard/src/views/bench/BenchLogsDetail.vue similarity index 100% rename from dashboard/src2/views/bench/BenchLogsDetail.vue rename to dashboard/src/views/bench/BenchLogsDetail.vue diff --git a/dashboard/src2/views/bench/BenchRegions.vue b/dashboard/src/views/bench/BenchRegions.vue similarity index 100% rename from dashboard/src2/views/bench/BenchRegions.vue rename to dashboard/src/views/bench/BenchRegions.vue diff --git a/dashboard/src2/views/bench/BenchSettings.vue b/dashboard/src/views/bench/BenchSettings.vue similarity index 100% rename from dashboard/src2/views/bench/BenchSettings.vue rename to dashboard/src/views/bench/BenchSettings.vue diff --git a/dashboard/src2/views/bench/BenchSites.vue b/dashboard/src/views/bench/BenchSites.vue similarity index 100% rename from dashboard/src2/views/bench/BenchSites.vue rename to dashboard/src/views/bench/BenchSites.vue diff --git a/dashboard/src2/views/bench/Benches.vue b/dashboard/src/views/bench/Benches.vue similarity index 100% rename from dashboard/src2/views/bench/Benches.vue rename to dashboard/src/views/bench/Benches.vue diff --git a/dashboard/src2/views/bench/EditBenchTitleDialog.vue b/dashboard/src/views/bench/EditBenchTitleDialog.vue similarity index 100% rename from dashboard/src2/views/bench/EditBenchTitleDialog.vue rename to dashboard/src/views/bench/EditBenchTitleDialog.vue diff --git a/dashboard/src2/views/bench/NewBench.vue b/dashboard/src/views/bench/NewBench.vue similarity index 100% rename from dashboard/src2/views/bench/NewBench.vue rename to dashboard/src/views/bench/NewBench.vue diff --git a/dashboard/src2/views/bench/NewBenchApp.vue b/dashboard/src/views/bench/NewBenchApp.vue similarity index 100% rename from dashboard/src2/views/bench/NewBenchApp.vue rename to dashboard/src/views/bench/NewBenchApp.vue diff --git a/dashboard/src2/views/billing/AccountBilling.vue b/dashboard/src/views/billing/AccountBilling.vue similarity index 100% rename from dashboard/src2/views/billing/AccountBilling.vue rename to dashboard/src/views/billing/AccountBilling.vue diff --git a/dashboard/src2/views/billing/AccountBillingCards.vue b/dashboard/src/views/billing/AccountBillingCards.vue similarity index 100% rename from dashboard/src2/views/billing/AccountBillingCards.vue rename to dashboard/src/views/billing/AccountBillingCards.vue diff --git a/dashboard/src2/views/billing/AccountBillingCreditBalance.vue b/dashboard/src/views/billing/AccountBillingCreditBalance.vue similarity index 100% rename from dashboard/src2/views/billing/AccountBillingCreditBalance.vue rename to dashboard/src/views/billing/AccountBillingCreditBalance.vue diff --git a/dashboard/src2/views/billing/AccountBillingDetails.vue b/dashboard/src/views/billing/AccountBillingDetails.vue similarity index 100% rename from dashboard/src2/views/billing/AccountBillingDetails.vue rename to dashboard/src/views/billing/AccountBillingDetails.vue diff --git a/dashboard/src2/views/billing/AccountBillingPayments.vue b/dashboard/src/views/billing/AccountBillingPayments.vue similarity index 100% rename from dashboard/src2/views/billing/AccountBillingPayments.vue rename to dashboard/src/views/billing/AccountBillingPayments.vue diff --git a/dashboard/src2/views/billing/BillingOverview.vue b/dashboard/src/views/billing/BillingOverview.vue similarity index 100% rename from dashboard/src2/views/billing/BillingOverview.vue rename to dashboard/src/views/billing/BillingOverview.vue diff --git a/dashboard/src2/views/billing/BillingSummary.vue b/dashboard/src/views/billing/BillingSummary.vue similarity index 100% rename from dashboard/src2/views/billing/BillingSummary.vue rename to dashboard/src/views/billing/BillingSummary.vue diff --git a/dashboard/src2/views/billing/FinalizeInvoicesDialog.vue b/dashboard/src/views/billing/FinalizeInvoicesDialog.vue similarity index 100% rename from dashboard/src2/views/billing/FinalizeInvoicesDialog.vue rename to dashboard/src/views/billing/FinalizeInvoicesDialog.vue diff --git a/dashboard/src2/views/billing/PaymentMethods.vue b/dashboard/src/views/billing/PaymentMethods.vue similarity index 100% rename from dashboard/src2/views/billing/PaymentMethods.vue rename to dashboard/src/views/billing/PaymentMethods.vue diff --git a/dashboard/src2/views/billing/UpcomingInvoiceSummary.vue b/dashboard/src/views/billing/UpcomingInvoiceSummary.vue similarity index 100% rename from dashboard/src2/views/billing/UpcomingInvoiceSummary.vue rename to dashboard/src/views/billing/UpcomingInvoiceSummary.vue diff --git a/dashboard/src2/views/checkout/Checkout.vue b/dashboard/src/views/checkout/Checkout.vue similarity index 100% rename from dashboard/src2/views/checkout/Checkout.vue rename to dashboard/src/views/checkout/Checkout.vue diff --git a/dashboard/src2/views/checkout/CheckoutAddress.vue b/dashboard/src/views/checkout/CheckoutAddress.vue similarity index 100% rename from dashboard/src2/views/checkout/CheckoutAddress.vue rename to dashboard/src/views/checkout/CheckoutAddress.vue diff --git a/dashboard/src2/views/checkout/CheckoutApps.vue b/dashboard/src/views/checkout/CheckoutApps.vue similarity index 100% rename from dashboard/src2/views/checkout/CheckoutApps.vue rename to dashboard/src/views/checkout/CheckoutApps.vue diff --git a/dashboard/src2/views/checkout/CheckoutPayment.vue b/dashboard/src/views/checkout/CheckoutPayment.vue similarity index 100% rename from dashboard/src2/views/checkout/CheckoutPayment.vue rename to dashboard/src/views/checkout/CheckoutPayment.vue diff --git a/dashboard/src2/views/checkout/CheckoutPlans.vue b/dashboard/src/views/checkout/CheckoutPlans.vue similarity index 100% rename from dashboard/src2/views/checkout/CheckoutPlans.vue rename to dashboard/src/views/checkout/CheckoutPlans.vue diff --git a/dashboard/src2/views/checkout/PlanChangeSuccessful.vue b/dashboard/src/views/checkout/PlanChangeSuccessful.vue similarity index 100% rename from dashboard/src2/views/checkout/PlanChangeSuccessful.vue rename to dashboard/src/views/checkout/PlanChangeSuccessful.vue diff --git a/dashboard/src2/views/checkout/Subscription.vue b/dashboard/src/views/checkout/Subscription.vue similarity index 100% rename from dashboard/src2/views/checkout/Subscription.vue rename to dashboard/src/views/checkout/Subscription.vue diff --git a/dashboard/src2/views/general/404.vue b/dashboard/src/views/general/404.vue similarity index 100% rename from dashboard/src2/views/general/404.vue rename to dashboard/src/views/general/404.vue diff --git a/dashboard/src2/views/general/AgentJobs.vue b/dashboard/src/views/general/AgentJobs.vue similarity index 100% rename from dashboard/src2/views/general/AgentJobs.vue rename to dashboard/src/views/general/AgentJobs.vue diff --git a/dashboard/src2/views/general/AnsiblePlays.vue b/dashboard/src/views/general/AnsiblePlays.vue similarity index 100% rename from dashboard/src2/views/general/AnsiblePlays.vue rename to dashboard/src/views/general/AnsiblePlays.vue diff --git a/dashboard/src2/views/general/Home.vue b/dashboard/src/views/general/Home.vue similarity index 100% rename from dashboard/src2/views/general/Home.vue rename to dashboard/src/views/general/Home.vue diff --git a/dashboard/src2/views/general/JobsDetail.vue b/dashboard/src/views/general/JobsDetail.vue similarity index 100% rename from dashboard/src2/views/general/JobsDetail.vue rename to dashboard/src/views/general/JobsDetail.vue diff --git a/dashboard/src2/views/general/PlaysDetail.vue b/dashboard/src/views/general/PlaysDetail.vue similarity index 100% rename from dashboard/src2/views/general/PlaysDetail.vue rename to dashboard/src/views/general/PlaysDetail.vue diff --git a/dashboard/src2/views/general/StepsDetail.vue b/dashboard/src/views/general/StepsDetail.vue similarity index 100% rename from dashboard/src2/views/general/StepsDetail.vue rename to dashboard/src/views/general/StepsDetail.vue diff --git a/dashboard/src2/views/marketplace/InstallMarketplaceApp.vue b/dashboard/src/views/marketplace/InstallMarketplaceApp.vue similarity index 100% rename from dashboard/src2/views/marketplace/InstallMarketplaceApp.vue rename to dashboard/src/views/marketplace/InstallMarketplaceApp.vue diff --git a/dashboard/src2/views/marketplace/Marketplace.vue b/dashboard/src/views/marketplace/Marketplace.vue similarity index 100% rename from dashboard/src2/views/marketplace/Marketplace.vue rename to dashboard/src/views/marketplace/Marketplace.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceApp.vue b/dashboard/src/views/marketplace/MarketplaceApp.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceApp.vue rename to dashboard/src/views/marketplace/MarketplaceApp.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppAnalytics.vue b/dashboard/src/views/marketplace/MarketplaceAppAnalytics.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppAnalytics.vue rename to dashboard/src/views/marketplace/MarketplaceAppAnalytics.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppDeployment.vue b/dashboard/src/views/marketplace/MarketplaceAppDeployment.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppDeployment.vue rename to dashboard/src/views/marketplace/MarketplaceAppDeployment.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppOverview.vue b/dashboard/src/views/marketplace/MarketplaceAppOverview.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppOverview.vue rename to dashboard/src/views/marketplace/MarketplaceAppOverview.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppPricing.vue b/dashboard/src/views/marketplace/MarketplaceAppPricing.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppPricing.vue rename to dashboard/src/views/marketplace/MarketplaceAppPricing.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppReview.vue b/dashboard/src/views/marketplace/MarketplaceAppReview.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppReview.vue rename to dashboard/src/views/marketplace/MarketplaceAppReview.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceAppSubscriptions.vue b/dashboard/src/views/marketplace/MarketplaceAppSubscriptions.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceAppSubscriptions.vue rename to dashboard/src/views/marketplace/MarketplaceAppSubscriptions.vue diff --git a/dashboard/src2/views/marketplace/MarketplaceApps.vue b/dashboard/src/views/marketplace/MarketplaceApps.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplaceApps.vue rename to dashboard/src/views/marketplace/MarketplaceApps.vue diff --git a/dashboard/src2/views/marketplace/MarketplacePayoutDetails.vue b/dashboard/src/views/marketplace/MarketplacePayoutDetails.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplacePayoutDetails.vue rename to dashboard/src/views/marketplace/MarketplacePayoutDetails.vue diff --git a/dashboard/src2/views/marketplace/MarketplacePayouts.vue b/dashboard/src/views/marketplace/MarketplacePayouts.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplacePayouts.vue rename to dashboard/src/views/marketplace/MarketplacePayouts.vue diff --git a/dashboard/src2/views/marketplace/MarketplacePublisherProfile.vue b/dashboard/src/views/marketplace/MarketplacePublisherProfile.vue similarity index 100% rename from dashboard/src2/views/marketplace/MarketplacePublisherProfile.vue rename to dashboard/src/views/marketplace/MarketplacePublisherProfile.vue diff --git a/dashboard/src2/views/marketplace/NewMarketplaceApp.vue b/dashboard/src/views/marketplace/NewMarketplaceApp.vue similarity index 100% rename from dashboard/src2/views/marketplace/NewMarketplaceApp.vue rename to dashboard/src/views/marketplace/NewMarketplaceApp.vue diff --git a/dashboard/src2/views/notifications/Notifications.vue b/dashboard/src/views/notifications/Notifications.vue similarity index 100% rename from dashboard/src2/views/notifications/Notifications.vue rename to dashboard/src/views/notifications/Notifications.vue diff --git a/dashboard/src2/views/onboarding/ComingSoon.vue b/dashboard/src/views/onboarding/ComingSoon.vue similarity index 100% rename from dashboard/src2/views/onboarding/ComingSoon.vue rename to dashboard/src/views/onboarding/ComingSoon.vue diff --git a/dashboard/src2/views/onboarding/OnboardingStepCreateAccount.vue b/dashboard/src/views/onboarding/OnboardingStepCreateAccount.vue similarity index 100% rename from dashboard/src2/views/onboarding/OnboardingStepCreateAccount.vue rename to dashboard/src/views/onboarding/OnboardingStepCreateAccount.vue diff --git a/dashboard/src2/views/onboarding/OnboardingStepCreateSite.vue b/dashboard/src/views/onboarding/OnboardingStepCreateSite.vue similarity index 100% rename from dashboard/src2/views/onboarding/OnboardingStepCreateSite.vue rename to dashboard/src/views/onboarding/OnboardingStepCreateSite.vue diff --git a/dashboard/src2/views/onboarding/OnboardingStepSelectSitePlan.vue b/dashboard/src/views/onboarding/OnboardingStepSelectSitePlan.vue similarity index 100% rename from dashboard/src2/views/onboarding/OnboardingStepSelectSitePlan.vue rename to dashboard/src/views/onboarding/OnboardingStepSelectSitePlan.vue diff --git a/dashboard/src2/views/onboarding/OnboardingStepSetupPayment.vue b/dashboard/src/views/onboarding/OnboardingStepSetupPayment.vue similarity index 100% rename from dashboard/src2/views/onboarding/OnboardingStepSetupPayment.vue rename to dashboard/src/views/onboarding/OnboardingStepSetupPayment.vue diff --git a/dashboard/src2/views/onboarding/Support.vue b/dashboard/src/views/onboarding/Support.vue similarity index 100% rename from dashboard/src2/views/onboarding/Support.vue rename to dashboard/src/views/onboarding/Support.vue diff --git a/dashboard/src2/views/onboarding/UserPrompts.vue b/dashboard/src/views/onboarding/UserPrompts.vue similarity index 100% rename from dashboard/src2/views/onboarding/UserPrompts.vue rename to dashboard/src/views/onboarding/UserPrompts.vue diff --git a/dashboard/src2/views/onboarding/Welcome.vue b/dashboard/src/views/onboarding/Welcome.vue similarity index 100% rename from dashboard/src2/views/onboarding/Welcome.vue rename to dashboard/src/views/onboarding/Welcome.vue diff --git a/dashboard/src2/views/partials/LoginBox.vue b/dashboard/src/views/partials/LoginBox.vue similarity index 100% rename from dashboard/src2/views/partials/LoginBox.vue rename to dashboard/src/views/partials/LoginBox.vue diff --git a/dashboard/src2/views/security/FirewallOverview.vue b/dashboard/src/views/security/FirewallOverview.vue similarity index 100% rename from dashboard/src2/views/security/FirewallOverview.vue rename to dashboard/src/views/security/FirewallOverview.vue diff --git a/dashboard/src2/views/security/InfoSection.vue b/dashboard/src/views/security/InfoSection.vue similarity index 100% rename from dashboard/src2/views/security/InfoSection.vue rename to dashboard/src/views/security/InfoSection.vue diff --git a/dashboard/src2/views/security/SSHSession.vue b/dashboard/src/views/security/SSHSession.vue similarity index 100% rename from dashboard/src2/views/security/SSHSession.vue rename to dashboard/src/views/security/SSHSession.vue diff --git a/dashboard/src2/views/security/SSHSessionActivity.vue b/dashboard/src/views/security/SSHSessionActivity.vue similarity index 100% rename from dashboard/src2/views/security/SSHSessionActivity.vue rename to dashboard/src/views/security/SSHSessionActivity.vue diff --git a/dashboard/src2/views/security/SSHSessionOverview.vue b/dashboard/src/views/security/SSHSessionOverview.vue similarity index 100% rename from dashboard/src2/views/security/SSHSessionOverview.vue rename to dashboard/src/views/security/SSHSessionOverview.vue diff --git a/dashboard/src2/views/security/Security.vue b/dashboard/src/views/security/Security.vue similarity index 100% rename from dashboard/src2/views/security/Security.vue rename to dashboard/src/views/security/Security.vue diff --git a/dashboard/src2/views/security/SecurityOverview.vue b/dashboard/src/views/security/SecurityOverview.vue similarity index 100% rename from dashboard/src2/views/security/SecurityOverview.vue rename to dashboard/src/views/security/SecurityOverview.vue diff --git a/dashboard/src2/views/security/SecurityUpdateInfo.vue b/dashboard/src/views/security/SecurityUpdateInfo.vue similarity index 100% rename from dashboard/src2/views/security/SecurityUpdateInfo.vue rename to dashboard/src/views/security/SecurityUpdateInfo.vue diff --git a/dashboard/src2/views/security/SecurityUpdates.vue b/dashboard/src/views/security/SecurityUpdates.vue similarity index 100% rename from dashboard/src2/views/security/SecurityUpdates.vue rename to dashboard/src/views/security/SecurityUpdates.vue diff --git a/dashboard/src2/views/security/SecurityUpdatesOverview.vue b/dashboard/src/views/security/SecurityUpdatesOverview.vue similarity index 100% rename from dashboard/src2/views/security/SecurityUpdatesOverview.vue rename to dashboard/src/views/security/SecurityUpdatesOverview.vue diff --git a/dashboard/src2/views/security/Servers.vue b/dashboard/src/views/security/Servers.vue similarity index 100% rename from dashboard/src2/views/security/Servers.vue rename to dashboard/src/views/security/Servers.vue diff --git a/dashboard/src2/views/server/EditServerTitleDialog.vue b/dashboard/src/views/server/EditServerTitleDialog.vue similarity index 100% rename from dashboard/src2/views/server/EditServerTitleDialog.vue rename to dashboard/src/views/server/EditServerTitleDialog.vue diff --git a/dashboard/src2/views/server/NewAppServerPlans.vue b/dashboard/src/views/server/NewAppServerPlans.vue similarity index 100% rename from dashboard/src2/views/server/NewAppServerPlans.vue rename to dashboard/src/views/server/NewAppServerPlans.vue diff --git a/dashboard/src2/views/server/NewDBServerPlans.vue b/dashboard/src/views/server/NewDBServerPlans.vue similarity index 100% rename from dashboard/src2/views/server/NewDBServerPlans.vue rename to dashboard/src/views/server/NewDBServerPlans.vue diff --git a/dashboard/src2/views/server/NewSelfHostedServer.vue b/dashboard/src/views/server/NewSelfHostedServer.vue similarity index 100% rename from dashboard/src2/views/server/NewSelfHostedServer.vue rename to dashboard/src/views/server/NewSelfHostedServer.vue diff --git a/dashboard/src2/views/server/NewSelfHostedServerForm.vue b/dashboard/src/views/server/NewSelfHostedServerForm.vue similarity index 100% rename from dashboard/src2/views/server/NewSelfHostedServerForm.vue rename to dashboard/src/views/server/NewSelfHostedServerForm.vue diff --git a/dashboard/src2/views/server/NewSelfHostedServerHostname.vue b/dashboard/src/views/server/NewSelfHostedServerHostname.vue similarity index 100% rename from dashboard/src2/views/server/NewSelfHostedServerHostname.vue rename to dashboard/src/views/server/NewSelfHostedServerHostname.vue diff --git a/dashboard/src2/views/server/NewServer.vue b/dashboard/src/views/server/NewServer.vue similarity index 100% rename from dashboard/src2/views/server/NewServer.vue rename to dashboard/src/views/server/NewServer.vue diff --git a/dashboard/src2/views/server/NewServerHostname.vue b/dashboard/src/views/server/NewServerHostname.vue similarity index 100% rename from dashboard/src2/views/server/NewServerHostname.vue rename to dashboard/src/views/server/NewServerHostname.vue diff --git a/dashboard/src2/views/server/NewVerifyServer.vue b/dashboard/src/views/server/NewVerifyServer.vue similarity index 100% rename from dashboard/src2/views/server/NewVerifyServer.vue rename to dashboard/src/views/server/NewVerifyServer.vue diff --git a/dashboard/src2/views/server/SelfHostedServerPlan.vue b/dashboard/src/views/server/SelfHostedServerPlan.vue similarity index 100% rename from dashboard/src2/views/server/SelfHostedServerPlan.vue rename to dashboard/src/views/server/SelfHostedServerPlan.vue diff --git a/dashboard/src2/views/server/SelfHostedServerVerify.vue b/dashboard/src/views/server/SelfHostedServerVerify.vue similarity index 100% rename from dashboard/src2/views/server/SelfHostedServerVerify.vue rename to dashboard/src/views/server/SelfHostedServerVerify.vue diff --git a/dashboard/src2/views/server/Server.vue b/dashboard/src/views/server/Server.vue similarity index 100% rename from dashboard/src2/views/server/Server.vue rename to dashboard/src/views/server/Server.vue diff --git a/dashboard/src2/views/server/ServerAnalytics.vue b/dashboard/src/views/server/ServerAnalytics.vue similarity index 100% rename from dashboard/src2/views/server/ServerAnalytics.vue rename to dashboard/src/views/server/ServerAnalytics.vue diff --git a/dashboard/src2/views/server/ServerBenches.vue b/dashboard/src/views/server/ServerBenches.vue similarity index 100% rename from dashboard/src2/views/server/ServerBenches.vue rename to dashboard/src/views/server/ServerBenches.vue diff --git a/dashboard/src2/views/server/ServerDrop.vue b/dashboard/src/views/server/ServerDrop.vue similarity index 100% rename from dashboard/src2/views/server/ServerDrop.vue rename to dashboard/src/views/server/ServerDrop.vue diff --git a/dashboard/src2/views/server/ServerInstall.vue b/dashboard/src/views/server/ServerInstall.vue similarity index 100% rename from dashboard/src2/views/server/ServerInstall.vue rename to dashboard/src/views/server/ServerInstall.vue diff --git a/dashboard/src2/views/server/ServerJobs.vue b/dashboard/src/views/server/ServerJobs.vue similarity index 100% rename from dashboard/src2/views/server/ServerJobs.vue rename to dashboard/src/views/server/ServerJobs.vue diff --git a/dashboard/src2/views/server/ServerOverview.vue b/dashboard/src/views/server/ServerOverview.vue similarity index 100% rename from dashboard/src2/views/server/ServerOverview.vue rename to dashboard/src/views/server/ServerOverview.vue diff --git a/dashboard/src2/views/server/ServerOverviewInfo.vue b/dashboard/src/views/server/ServerOverviewInfo.vue similarity index 100% rename from dashboard/src2/views/server/ServerOverviewInfo.vue rename to dashboard/src/views/server/ServerOverviewInfo.vue diff --git a/dashboard/src2/views/server/ServerOverviewPlan.vue b/dashboard/src/views/server/ServerOverviewPlan.vue similarity index 100% rename from dashboard/src2/views/server/ServerOverviewPlan.vue rename to dashboard/src/views/server/ServerOverviewPlan.vue diff --git a/dashboard/src2/views/server/ServerPlays.vue b/dashboard/src/views/server/ServerPlays.vue similarity index 100% rename from dashboard/src2/views/server/ServerPlays.vue rename to dashboard/src/views/server/ServerPlays.vue diff --git a/dashboard/src2/views/server/ServerSettings.vue b/dashboard/src/views/server/ServerSettings.vue similarity index 100% rename from dashboard/src2/views/server/ServerSettings.vue rename to dashboard/src/views/server/ServerSettings.vue diff --git a/dashboard/src2/views/server/Servers.vue b/dashboard/src/views/server/Servers.vue similarity index 100% rename from dashboard/src2/views/server/Servers.vue rename to dashboard/src/views/server/Servers.vue diff --git a/dashboard/src2/views/settings/AccountAPI.vue b/dashboard/src/views/settings/AccountAPI.vue similarity index 100% rename from dashboard/src2/views/settings/AccountAPI.vue rename to dashboard/src/views/settings/AccountAPI.vue diff --git a/dashboard/src2/views/settings/AccountEmails.vue b/dashboard/src/views/settings/AccountEmails.vue similarity index 100% rename from dashboard/src2/views/settings/AccountEmails.vue rename to dashboard/src/views/settings/AccountEmails.vue diff --git a/dashboard/src2/views/settings/AccountGroups.vue b/dashboard/src/views/settings/AccountGroups.vue similarity index 100% rename from dashboard/src2/views/settings/AccountGroups.vue rename to dashboard/src/views/settings/AccountGroups.vue diff --git a/dashboard/src2/views/settings/AccountMembers.vue b/dashboard/src/views/settings/AccountMembers.vue similarity index 100% rename from dashboard/src2/views/settings/AccountMembers.vue rename to dashboard/src/views/settings/AccountMembers.vue diff --git a/dashboard/src2/views/settings/AccountPartner.vue b/dashboard/src/views/settings/AccountPartner.vue similarity index 100% rename from dashboard/src2/views/settings/AccountPartner.vue rename to dashboard/src/views/settings/AccountPartner.vue diff --git a/dashboard/src2/views/settings/AccountProfile.vue b/dashboard/src/views/settings/AccountProfile.vue similarity index 100% rename from dashboard/src2/views/settings/AccountProfile.vue rename to dashboard/src/views/settings/AccountProfile.vue diff --git a/dashboard/src2/views/settings/AccountReferral.vue b/dashboard/src/views/settings/AccountReferral.vue similarity index 100% rename from dashboard/src2/views/settings/AccountReferral.vue rename to dashboard/src/views/settings/AccountReferral.vue diff --git a/dashboard/src2/views/settings/AccountSSHKey.vue b/dashboard/src/views/settings/AccountSSHKey.vue similarity index 100% rename from dashboard/src2/views/settings/AccountSSHKey.vue rename to dashboard/src/views/settings/AccountSSHKey.vue diff --git a/dashboard/src2/views/settings/AccountSettings.vue b/dashboard/src/views/settings/AccountSettings.vue similarity index 100% rename from dashboard/src2/views/settings/AccountSettings.vue rename to dashboard/src/views/settings/AccountSettings.vue diff --git a/dashboard/src2/views/settings/AccountTeam.vue b/dashboard/src/views/settings/AccountTeam.vue similarity index 100% rename from dashboard/src2/views/settings/AccountTeam.vue rename to dashboard/src/views/settings/AccountTeam.vue diff --git a/dashboard/src2/views/settings/DeveloperSettings.vue b/dashboard/src/views/settings/DeveloperSettings.vue similarity index 100% rename from dashboard/src2/views/settings/DeveloperSettings.vue rename to dashboard/src/views/settings/DeveloperSettings.vue diff --git a/dashboard/src2/views/settings/EditPermissions.vue b/dashboard/src/views/settings/EditPermissions.vue similarity index 100% rename from dashboard/src2/views/settings/EditPermissions.vue rename to dashboard/src/views/settings/EditPermissions.vue diff --git a/dashboard/src2/views/settings/FeatureFlags.vue b/dashboard/src/views/settings/FeatureFlags.vue similarity index 100% rename from dashboard/src2/views/settings/FeatureFlags.vue rename to dashboard/src/views/settings/FeatureFlags.vue diff --git a/dashboard/src2/views/settings/ManageGroupMembers.vue b/dashboard/src/views/settings/ManageGroupMembers.vue similarity index 100% rename from dashboard/src2/views/settings/ManageGroupMembers.vue rename to dashboard/src/views/settings/ManageGroupMembers.vue diff --git a/dashboard/src2/views/settings/PartnerCustomers.vue b/dashboard/src/views/settings/PartnerCustomers.vue similarity index 100% rename from dashboard/src2/views/settings/PartnerCustomers.vue rename to dashboard/src/views/settings/PartnerCustomers.vue diff --git a/dashboard/src2/views/settings/PartnerReferral.vue b/dashboard/src/views/settings/PartnerReferral.vue similarity index 100% rename from dashboard/src2/views/settings/PartnerReferral.vue rename to dashboard/src/views/settings/PartnerReferral.vue diff --git a/dashboard/src2/views/settings/PartnerRequestStatus.vue b/dashboard/src/views/settings/PartnerRequestStatus.vue similarity index 100% rename from dashboard/src2/views/settings/PartnerRequestStatus.vue rename to dashboard/src/views/settings/PartnerRequestStatus.vue diff --git a/dashboard/src2/views/settings/PartnerSettings.vue b/dashboard/src/views/settings/PartnerSettings.vue similarity index 100% rename from dashboard/src2/views/settings/PartnerSettings.vue rename to dashboard/src/views/settings/PartnerSettings.vue diff --git a/dashboard/src2/views/settings/ProfileSettings.vue b/dashboard/src/views/settings/ProfileSettings.vue similarity index 100% rename from dashboard/src2/views/settings/ProfileSettings.vue rename to dashboard/src/views/settings/ProfileSettings.vue diff --git a/dashboard/src2/views/settings/TeamSettings.vue b/dashboard/src/views/settings/TeamSettings.vue similarity index 100% rename from dashboard/src2/views/settings/TeamSettings.vue rename to dashboard/src/views/settings/TeamSettings.vue diff --git a/dashboard/src2/views/site/AppSiteSetup.vue b/dashboard/src/views/site/AppSiteSetup.vue similarity index 100% rename from dashboard/src2/views/site/AppSiteSetup.vue rename to dashboard/src/views/site/AppSiteSetup.vue diff --git a/dashboard/src2/views/site/DatabaseAccessDialog.vue b/dashboard/src/views/site/DatabaseAccessDialog.vue similarity index 100% rename from dashboard/src2/views/site/DatabaseAccessDialog.vue rename to dashboard/src/views/site/DatabaseAccessDialog.vue diff --git a/dashboard/src2/views/site/NewSite.vue b/dashboard/src/views/site/NewSite.vue similarity index 100% rename from dashboard/src2/views/site/NewSite.vue rename to dashboard/src/views/site/NewSite.vue diff --git a/dashboard/src2/views/site/NewSiteApps.vue b/dashboard/src/views/site/NewSiteApps.vue similarity index 100% rename from dashboard/src2/views/site/NewSiteApps.vue rename to dashboard/src/views/site/NewSiteApps.vue diff --git a/dashboard/src2/views/site/NewSiteHostname.vue b/dashboard/src/views/site/NewSiteHostname.vue similarity index 100% rename from dashboard/src2/views/site/NewSiteHostname.vue rename to dashboard/src/views/site/NewSiteHostname.vue diff --git a/dashboard/src2/views/site/NewSitePlans.vue b/dashboard/src/views/site/NewSitePlans.vue similarity index 100% rename from dashboard/src2/views/site/NewSitePlans.vue rename to dashboard/src/views/site/NewSitePlans.vue diff --git a/dashboard/src2/views/site/NewSiteRestore.vue b/dashboard/src/views/site/NewSiteRestore.vue similarity index 100% rename from dashboard/src2/views/site/NewSiteRestore.vue rename to dashboard/src/views/site/NewSiteRestore.vue diff --git a/dashboard/src2/views/site/Site.vue b/dashboard/src/views/site/Site.vue similarity index 100% rename from dashboard/src2/views/site/Site.vue rename to dashboard/src/views/site/Site.vue diff --git a/dashboard/src2/views/site/SiteActivity.vue b/dashboard/src/views/site/SiteActivity.vue similarity index 100% rename from dashboard/src2/views/site/SiteActivity.vue rename to dashboard/src/views/site/SiteActivity.vue diff --git a/dashboard/src2/views/site/SiteAlerts.vue b/dashboard/src/views/site/SiteAlerts.vue similarity index 100% rename from dashboard/src2/views/site/SiteAlerts.vue rename to dashboard/src/views/site/SiteAlerts.vue diff --git a/dashboard/src2/views/site/SiteAnalyticsUptime.vue b/dashboard/src/views/site/SiteAnalyticsUptime.vue similarity index 100% rename from dashboard/src2/views/site/SiteAnalyticsUptime.vue rename to dashboard/src/views/site/SiteAnalyticsUptime.vue diff --git a/dashboard/src2/views/site/SiteAppsAndSubscriptions.vue b/dashboard/src/views/site/SiteAppsAndSubscriptions.vue similarity index 100% rename from dashboard/src2/views/site/SiteAppsAndSubscriptions.vue rename to dashboard/src/views/site/SiteAppsAndSubscriptions.vue diff --git a/dashboard/src2/views/site/SiteAutoUpdate.vue b/dashboard/src/views/site/SiteAutoUpdate.vue similarity index 100% rename from dashboard/src2/views/site/SiteAutoUpdate.vue rename to dashboard/src/views/site/SiteAutoUpdate.vue diff --git a/dashboard/src2/views/site/SiteBinaryLogs.vue b/dashboard/src/views/site/SiteBinaryLogs.vue similarity index 100% rename from dashboard/src2/views/site/SiteBinaryLogs.vue rename to dashboard/src/views/site/SiteBinaryLogs.vue diff --git a/dashboard/src2/views/site/SiteChangeGroupDialog.vue b/dashboard/src/views/site/SiteChangeGroupDialog.vue similarity index 100% rename from dashboard/src2/views/site/SiteChangeGroupDialog.vue rename to dashboard/src/views/site/SiteChangeGroupDialog.vue diff --git a/dashboard/src2/views/site/SiteChangeRegionDialog.vue b/dashboard/src/views/site/SiteChangeRegionDialog.vue similarity index 100% rename from dashboard/src2/views/site/SiteChangeRegionDialog.vue rename to dashboard/src/views/site/SiteChangeRegionDialog.vue diff --git a/dashboard/src2/views/site/SiteChangeServerDialog.vue b/dashboard/src/views/site/SiteChangeServerDialog.vue similarity index 100% rename from dashboard/src2/views/site/SiteChangeServerDialog.vue rename to dashboard/src/views/site/SiteChangeServerDialog.vue diff --git a/dashboard/src2/views/site/SiteCharts.vue b/dashboard/src/views/site/SiteCharts.vue similarity index 100% rename from dashboard/src2/views/site/SiteCharts.vue rename to dashboard/src/views/site/SiteCharts.vue diff --git a/dashboard/src2/views/site/SiteConfig.vue b/dashboard/src/views/site/SiteConfig.vue similarity index 100% rename from dashboard/src2/views/site/SiteConfig.vue rename to dashboard/src/views/site/SiteConfig.vue diff --git a/dashboard/src2/views/site/SiteConsole.vue b/dashboard/src/views/site/SiteConsole.vue similarity index 100% rename from dashboard/src2/views/site/SiteConsole.vue rename to dashboard/src/views/site/SiteConsole.vue diff --git a/dashboard/src2/views/site/SiteDatabase.vue b/dashboard/src/views/site/SiteDatabase.vue similarity index 100% rename from dashboard/src2/views/site/SiteDatabase.vue rename to dashboard/src/views/site/SiteDatabase.vue diff --git a/dashboard/src2/views/site/SiteDatabaseBackups.vue b/dashboard/src/views/site/SiteDatabaseBackups.vue similarity index 100% rename from dashboard/src2/views/site/SiteDatabaseBackups.vue rename to dashboard/src/views/site/SiteDatabaseBackups.vue diff --git a/dashboard/src2/views/site/SiteDatabaseRestore.vue b/dashboard/src/views/site/SiteDatabaseRestore.vue similarity index 100% rename from dashboard/src2/views/site/SiteDatabaseRestore.vue rename to dashboard/src/views/site/SiteDatabaseRestore.vue diff --git a/dashboard/src2/views/site/SiteDeadlockReport.vue b/dashboard/src/views/site/SiteDeadlockReport.vue similarity index 100% rename from dashboard/src2/views/site/SiteDeadlockReport.vue rename to dashboard/src/views/site/SiteDeadlockReport.vue diff --git a/dashboard/src2/views/site/SiteDrop.vue b/dashboard/src/views/site/SiteDrop.vue similarity index 100% rename from dashboard/src2/views/site/SiteDrop.vue rename to dashboard/src/views/site/SiteDrop.vue diff --git a/dashboard/src2/views/site/SiteInstalling.vue b/dashboard/src/views/site/SiteInstalling.vue similarity index 100% rename from dashboard/src2/views/site/SiteInstalling.vue rename to dashboard/src/views/site/SiteInstalling.vue diff --git a/dashboard/src2/views/site/SiteJobs.vue b/dashboard/src/views/site/SiteJobs.vue similarity index 100% rename from dashboard/src2/views/site/SiteJobs.vue rename to dashboard/src/views/site/SiteJobs.vue diff --git a/dashboard/src2/views/site/SiteList.vue b/dashboard/src/views/site/SiteList.vue similarity index 100% rename from dashboard/src2/views/site/SiteList.vue rename to dashboard/src/views/site/SiteList.vue diff --git a/dashboard/src2/views/site/SiteLogs.vue b/dashboard/src/views/site/SiteLogs.vue similarity index 100% rename from dashboard/src2/views/site/SiteLogs.vue rename to dashboard/src/views/site/SiteLogs.vue diff --git a/dashboard/src2/views/site/SiteLogsDetail.vue b/dashboard/src/views/site/SiteLogsDetail.vue similarity index 100% rename from dashboard/src2/views/site/SiteLogsDetail.vue rename to dashboard/src/views/site/SiteLogsDetail.vue diff --git a/dashboard/src2/views/site/SiteMariaDBProcessList.vue b/dashboard/src/views/site/SiteMariaDBProcessList.vue similarity index 100% rename from dashboard/src2/views/site/SiteMariaDBProcessList.vue rename to dashboard/src/views/site/SiteMariaDBProcessList.vue diff --git a/dashboard/src2/views/site/SiteMariaDBSlowQueries.vue b/dashboard/src/views/site/SiteMariaDBSlowQueries.vue similarity index 100% rename from dashboard/src2/views/site/SiteMariaDBSlowQueries.vue rename to dashboard/src/views/site/SiteMariaDBSlowQueries.vue diff --git a/dashboard/src2/views/site/SiteMonitorsList.vue b/dashboard/src/views/site/SiteMonitorsList.vue similarity index 100% rename from dashboard/src2/views/site/SiteMonitorsList.vue rename to dashboard/src/views/site/SiteMonitorsList.vue diff --git a/dashboard/src2/views/site/SiteOverview.vue b/dashboard/src/views/site/SiteOverview.vue similarity index 100% rename from dashboard/src2/views/site/SiteOverview.vue rename to dashboard/src/views/site/SiteOverview.vue diff --git a/dashboard/src2/views/site/SiteOverviewCPUUsage.vue b/dashboard/src/views/site/SiteOverviewCPUUsage.vue similarity index 100% rename from dashboard/src2/views/site/SiteOverviewCPUUsage.vue rename to dashboard/src/views/site/SiteOverviewCPUUsage.vue diff --git a/dashboard/src2/views/site/SiteOverviewDomains.vue b/dashboard/src/views/site/SiteOverviewDomains.vue similarity index 100% rename from dashboard/src2/views/site/SiteOverviewDomains.vue rename to dashboard/src/views/site/SiteOverviewDomains.vue diff --git a/dashboard/src2/views/site/SiteOverviewInfo.vue b/dashboard/src/views/site/SiteOverviewInfo.vue similarity index 100% rename from dashboard/src2/views/site/SiteOverviewInfo.vue rename to dashboard/src/views/site/SiteOverviewInfo.vue diff --git a/dashboard/src2/views/site/SiteOverviewPlan.vue b/dashboard/src/views/site/SiteOverviewPlan.vue similarity index 100% rename from dashboard/src2/views/site/SiteOverviewPlan.vue rename to dashboard/src/views/site/SiteOverviewPlan.vue diff --git a/dashboard/src2/views/site/SitePlansDialog.vue b/dashboard/src/views/site/SitePlansDialog.vue similarity index 100% rename from dashboard/src2/views/site/SitePlansDialog.vue rename to dashboard/src/views/site/SitePlansDialog.vue diff --git a/dashboard/src2/views/site/SiteRequestLogs.vue b/dashboard/src/views/site/SiteRequestLogs.vue similarity index 100% rename from dashboard/src2/views/site/SiteRequestLogs.vue rename to dashboard/src/views/site/SiteRequestLogs.vue diff --git a/dashboard/src2/views/site/SiteSettings.vue b/dashboard/src/views/site/SiteSettings.vue similarity index 100% rename from dashboard/src2/views/site/SiteSettings.vue rename to dashboard/src/views/site/SiteSettings.vue diff --git a/dashboard/src2/views/site/SiteTransferDialog.vue b/dashboard/src/views/site/SiteTransferDialog.vue similarity index 100% rename from dashboard/src2/views/site/SiteTransferDialog.vue rename to dashboard/src/views/site/SiteTransferDialog.vue diff --git a/dashboard/src2/views/site/SiteVersionUpgradeDialog.vue b/dashboard/src/views/site/SiteVersionUpgradeDialog.vue similarity index 100% rename from dashboard/src2/views/site/SiteVersionUpgradeDialog.vue rename to dashboard/src/views/site/SiteVersionUpgradeDialog.vue diff --git a/dashboard/src2/views/site/Sites.vue b/dashboard/src/views/site/Sites.vue similarity index 100% rename from dashboard/src2/views/site/Sites.vue rename to dashboard/src/views/site/Sites.vue diff --git a/dashboard/src2/views/spaces/CodeServer.vue b/dashboard/src/views/spaces/CodeServer.vue similarity index 100% rename from dashboard/src2/views/spaces/CodeServer.vue rename to dashboard/src/views/spaces/CodeServer.vue diff --git a/dashboard/src2/views/spaces/CodeServerJobs.vue b/dashboard/src/views/spaces/CodeServerJobs.vue similarity index 100% rename from dashboard/src2/views/spaces/CodeServerJobs.vue rename to dashboard/src/views/spaces/CodeServerJobs.vue diff --git a/dashboard/src2/views/spaces/CodeServerOverview.vue b/dashboard/src/views/spaces/CodeServerOverview.vue similarity index 100% rename from dashboard/src2/views/spaces/CodeServerOverview.vue rename to dashboard/src/views/spaces/CodeServerOverview.vue diff --git a/dashboard/src2/views/spaces/CodeServerOverviewInfo.vue b/dashboard/src/views/spaces/CodeServerOverviewInfo.vue similarity index 100% rename from dashboard/src2/views/spaces/CodeServerOverviewInfo.vue rename to dashboard/src/views/spaces/CodeServerOverviewInfo.vue diff --git a/dashboard/src2/views/spaces/CodeServersList.vue b/dashboard/src/views/spaces/CodeServersList.vue similarity index 100% rename from dashboard/src2/views/spaces/CodeServersList.vue rename to dashboard/src/views/spaces/CodeServersList.vue diff --git a/dashboard/src2/views/spaces/CreateCodeServerDialog.vue b/dashboard/src/views/spaces/CreateCodeServerDialog.vue similarity index 100% rename from dashboard/src2/views/spaces/CreateCodeServerDialog.vue rename to dashboard/src/views/spaces/CreateCodeServerDialog.vue diff --git a/dashboard/src2/views/spaces/NewCodeServer.vue b/dashboard/src/views/spaces/NewCodeServer.vue similarity index 100% rename from dashboard/src2/views/spaces/NewCodeServer.vue rename to dashboard/src/views/spaces/NewCodeServer.vue diff --git a/dashboard/src2/views/spaces/NewCodeServerBench.vue b/dashboard/src/views/spaces/NewCodeServerBench.vue similarity index 100% rename from dashboard/src2/views/spaces/NewCodeServerBench.vue rename to dashboard/src/views/spaces/NewCodeServerBench.vue diff --git a/dashboard/src2/views/spaces/NewCodeServerGroup.vue b/dashboard/src/views/spaces/NewCodeServerGroup.vue similarity index 100% rename from dashboard/src2/views/spaces/NewCodeServerGroup.vue rename to dashboard/src/views/spaces/NewCodeServerGroup.vue diff --git a/dashboard/src2/views/spaces/NewCodeServerHostname.vue b/dashboard/src/views/spaces/NewCodeServerHostname.vue similarity index 100% rename from dashboard/src2/views/spaces/NewCodeServerHostname.vue rename to dashboard/src/views/spaces/NewCodeServerHostname.vue diff --git a/dashboard/src2/views/spaces/Spaces.vue b/dashboard/src/views/spaces/Spaces.vue similarity index 100% rename from dashboard/src2/views/spaces/Spaces.vue rename to dashboard/src/views/spaces/Spaces.vue diff --git a/dashboard/src2/views/spaces/SpacesList.vue b/dashboard/src/views/spaces/SpacesList.vue similarity index 100% rename from dashboard/src2/views/spaces/SpacesList.vue rename to dashboard/src/views/spaces/SpacesList.vue diff --git a/dashboard/tailwind.config.cjs b/dashboard/tailwind.config.cjs index b05c606..fc5ea6e 100644 --- a/dashboard/tailwind.config.cjs +++ b/dashboard/tailwind.config.cjs @@ -6,7 +6,7 @@ module.exports = { './public/index.html', './src/**/*.html', './src/**/*.vue', - './src2/**/*.vue', + './src/**/*.vue', './src/assets/*.css', './node_modules/jingrow-ui/src/components/**/*.{vue,js,ts}' ], diff --git a/dashboard/vite.config.ts b/dashboard/vite.config.ts index 17de35d..d389676 100644 --- a/dashboard/vite.config.ts +++ b/dashboard/vite.config.ts @@ -17,7 +17,7 @@ export default defineConfig({ jingrowui(), Components({ dirs: [ - 'src2/components', + 'src/components', 'node_modules/jingrow-ui/src/components' ], resolvers: [IconsResolver()] @@ -33,7 +33,7 @@ export default defineConfig({ ], resolve: { alias: { - '@': path.resolve(__dirname, 'src2') + '@': path.resolve(__dirname, 'src') } }, optimizeDeps: { @@ -65,7 +65,7 @@ export default defineConfig({ test: { globals: true, environment: 'jsdom', - setupFiles: 'src2/tests/setup/msw.js', + setupFiles: 'src/tests/setup/msw.js', coverage: { extension: ['.vue', '.js'], all: true diff --git a/dashboard/vite.config.ts.timestamp-1743195879566-0d6d78d20076a.mjs b/dashboard/vite.config.ts.timestamp-1743195879566-0d6d78d20076a.mjs index ce9661e..f4f0e59 100644 --- a/dashboard/vite.config.ts.timestamp-1743195879566-0d6d78d20076a.mjs +++ b/dashboard/vite.config.ts.timestamp-1743195879566-0d6d78d20076a.mjs @@ -19,7 +19,7 @@ var vite_config_default = defineConfig({ Components({ dirs: [ "src/components", - // 'src2/components', + // 'src/components', "node_modules/jingrow-ui/src/components" ], resolvers: [IconsResolver()] diff --git a/dashboard/vite.config.ts.timestamp-1754345788699-f26a21cb45774.mjs b/dashboard/vite.config.ts.timestamp-1754345788699-f26a21cb45774.mjs index 9f816a0..be7d58b 100644 --- a/dashboard/vite.config.ts.timestamp-1754345788699-f26a21cb45774.mjs +++ b/dashboard/vite.config.ts.timestamp-1754345788699-f26a21cb45774.mjs @@ -19,7 +19,7 @@ var vite_config_default = defineConfig({ Components({ dirs: [ "src/components", - // 'src2/components', + // 'src/components', "node_modules/jingrow-ui/src/components" ], resolvers: [IconsResolver()]