diff --git a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
index 79f6a75143..964cf4538a 100644
--- a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
@@ -64,12 +64,12 @@ import {
   EntityProvider,
   LocationService,
 } from '../next/types';
-import { ConfigLocationEntityProvider } from './ConfigLocationEntityProvider';
+import { ConfigLocationEntityProvider } from '../providers/ConfigLocationEntityProvider';
 import { DefaultProcessingDatabase } from '../database/DefaultProcessingDatabase';
 import { applyDatabaseMigrations } from '../database/migrations';
 import { DefaultCatalogProcessingEngine } from './DefaultCatalogProcessingEngine';
 import { DefaultLocationService } from './DefaultLocationService';
-import { DefaultLocationStore } from './DefaultLocationStore';
+import { DefaultLocationStore } from '../providers/DefaultLocationStore';
 import { NextEntitiesCatalog } from './NextEntitiesCatalog';
 import { DefaultCatalogProcessingOrchestrator } from '../processing/DefaultCatalogProcessingOrchestrator';
 import { Stitcher } from '../stitching/Stitcher';
diff --git a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.test.ts
similarity index 98%
rename from plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
rename to plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.test.ts
index 0663ad8d04..a44c803c5f 100644
--- a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
+++ b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.test.ts
@@ -17,7 +17,7 @@
 import { ConfigReader } from '@backstage/config';
 import path from 'path';
 import { ConfigLocationEntityProvider } from './ConfigLocationEntityProvider';
-import { EntityProviderConnection } from './types';
+import { EntityProviderConnection } from '../next/types';
 
 describe('ConfigLocationEntityProvider', () => {
   it('should apply mutation with the correct paths in the config', async () => {
diff --git a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts
similarity index 93%
rename from plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts
rename to plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts
index 4f1c93da3e..ce88488d8f 100644
--- a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts
+++ b/plugins/catalog-backend/src/providers/ConfigLocationEntityProvider.ts
@@ -17,8 +17,8 @@
 import { Config } from '@backstage/config';
 import path from 'path';
 import { getEntityLocationRef } from '../processing/util';
-import { EntityProvider, EntityProviderConnection } from './types';
-import { locationSpecToLocationEntity } from './util';
+import { EntityProvider, EntityProviderConnection } from '../next/types';
+import { locationSpecToLocationEntity } from '../next/util';
 
 export class ConfigLocationEntityProvider implements EntityProvider {
   constructor(private readonly config: Config) {}
diff --git a/plugins/catalog-backend/src/next/DefaultLocationStore.test.ts b/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts
similarity index 100%
rename from plugins/catalog-backend/src/next/DefaultLocationStore.test.ts
rename to plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts
diff --git a/plugins/catalog-backend/src/next/DefaultLocationStore.ts b/plugins/catalog-backend/src/providers/DefaultLocationStore.ts
similarity index 98%
rename from plugins/catalog-backend/src/next/DefaultLocationStore.ts
rename to plugins/catalog-backend/src/providers/DefaultLocationStore.ts
index fdada36737..5498b7105e 100644
--- a/plugins/catalog-backend/src/next/DefaultLocationStore.ts
+++ b/plugins/catalog-backend/src/providers/DefaultLocationStore.ts
@@ -24,8 +24,8 @@ import {
   EntityProvider,
   EntityProviderConnection,
   LocationStore,
-} from './types';
-import { locationSpecToLocationEntity } from './util';
+} from '../next/types';
+import { locationSpecToLocationEntity } from '../next/util';
 
 export class DefaultLocationStore implements LocationStore, EntityProvider {
   private _connection: EntityProviderConnection | undefined;