diff --git a/.eslintrc.js b/.eslintrc.js
index 4eb0399f631..edfcaa2cb72 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -206,6 +206,11 @@ module.exports = {
                         message:
                             'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.',
                     },
+                    {
+                        name: '..',
+                        message:
+                            'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.',
+                    },
                 ],
             },
         ],
diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts
index 3b0f41ab1d6..8480ee3184e 100644
--- a/packages/core/src/codewhisperer/commands/startTestGeneration.ts
+++ b/packages/core/src/codewhisperer/commands/startTestGeneration.ts
@@ -15,7 +15,7 @@ import {
     throwIfCancelled,
 } from '../service/testGenHandler'
 import path from 'path'
-import { testGenState } from '..'
+import { testGenState } from '../models/model'
 import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 import { ChildProcess, spawn } from 'child_process' // eslint-disable-line no-restricted-imports
 import { BuildStatus } from '../../amazonqTest/chat/session/session'
diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts
index ee2de612b77..01be77a834b 100644
--- a/packages/core/src/codewhisperer/service/testGenHandler.ts
+++ b/packages/core/src/codewhisperer/service/testGenHandler.ts
@@ -16,7 +16,7 @@ import CodeWhispererUserClient, {
 import { CreateUploadUrlError, InvalidSourceZipError, TestGenFailedError, TestGenTimedOutError } from '../models/errors'
 import { getMd5, uploadArtifactToS3 } from './securityScanHandler'
 import { fs, randomUUID, sleep, tempDirPath } from '../../shared'
-import { ShortAnswer, TestGenerationJobStatus, testGenState } from '..'
+import { ShortAnswer, testGenState } from '../models/model'
 import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession'
 import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
 import { downloadExportResultArchive } from '../../shared/utilities/download'
@@ -182,9 +182,9 @@ export async function pollTestJobStatus(
             }
             ChatSessionManager.Instance.getSession().shortAnswer = shortAnswer
         }
-        if (resp.testGenerationJob?.status !== TestGenerationJobStatus.IN_PROGRESS) {
+        if (resp.testGenerationJob?.status !== CodeWhispererConstants.TestGenerationJobStatus.IN_PROGRESS) {
             // This can be FAILED or COMPLETED
-            status = resp.testGenerationJob?.status as TestGenerationJobStatus
+            status = resp.testGenerationJob?.status as CodeWhispererConstants.TestGenerationJobStatus
             logger.verbose(`testgen job status: ${status}`)
             logger.verbose(`Complete polling test job status.`)
             break
diff --git a/packages/core/src/shared/env/resolveEnv.ts b/packages/core/src/shared/env/resolveEnv.ts
index 2c50169f984..7b1b4bc31cb 100644
--- a/packages/core/src/shared/env/resolveEnv.ts
+++ b/packages/core/src/shared/env/resolveEnv.ts
@@ -10,7 +10,7 @@
 
 import * as crypto from 'crypto'
 import { DevSettings } from '../settings'
-import { getLogger } from '..'
+import { getLogger } from '../logger/logger'
 import { ToolkitError } from '../errors'
 import { userInfo } from 'os'
 import path from 'path'
diff --git a/packages/core/src/shared/utilities/downloadPatterns.ts b/packages/core/src/shared/utilities/downloadPatterns.ts
index 7936bd39ba9..12f4fb04b9c 100644
--- a/packages/core/src/shared/utilities/downloadPatterns.ts
+++ b/packages/core/src/shared/utilities/downloadPatterns.ts
@@ -8,7 +8,7 @@ import AdmZip from 'adm-zip'
 import { getLogger } from '../logger/logger'
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { ToolkitError } from '..'
+import { ToolkitError } from '../errors'
 
 // Get pattern code and save it in temporary folder
 async function fetchUrl(owner: string, repoName: string, assetName: string): Promise<Buffer> {
diff --git a/packages/core/src/shared/utilities/pollingSet.ts b/packages/core/src/shared/utilities/pollingSet.ts
index 321dde153b8..d8c4f7c6ded 100644
--- a/packages/core/src/shared/utilities/pollingSet.ts
+++ b/packages/core/src/shared/utilities/pollingSet.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { globals } from '..'
+import globals from '../../shared/extensionGlobals'
 
 /**
  * A useful abstraction that does the following: