diff --git a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx b/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
index ac37ae7d1..f1782dfa2 100644
--- a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
+++ b/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
@@ -19,7 +19,7 @@ import {
   changeTimezone,
   selectTimezone,
 } from '../../../../../store/wizardSlice';
-import { timezones } from '../../../../../timezones';
+import { timezones } from '../timezonesList';
 
 const TimezoneDropDown = () => {
   const timezone = useAppSelector(selectTimezone);
diff --git a/src/timezones.ts b/src/Components/CreateImageWizard/steps/Timezone/timezonesList.ts
similarity index 100%
rename from src/timezones.ts
rename to src/Components/CreateImageWizard/steps/Timezone/timezonesList.ts
diff --git a/src/Components/Blueprints/ImportBlueprintModal.test.tsx b/src/test/Components/Blueprints/ImportBlueprintModal.test.tsx
similarity index 98%
rename from src/Components/Blueprints/ImportBlueprintModal.test.tsx
rename to src/test/Components/Blueprints/ImportBlueprintModal.test.tsx
index 68d59c117..7df05a218 100644
--- a/src/Components/Blueprints/ImportBlueprintModal.test.tsx
+++ b/src/test/Components/Blueprints/ImportBlueprintModal.test.tsx
@@ -1,8 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { clickNext } from '../../test/Components/CreateImageWizard/wizardTestUtils';
-import { renderCustomRoutesWithReduxRouter } from '../../test/testUtils';
+import { renderCustomRoutesWithReduxRouter } from '../../testUtils';
+import { clickNext } from '../CreateImageWizard/wizardTestUtils';
 
 const BLUEPRINT_JSON = `{
   "customizations": {