diff --git a/codegen-examples/examples/dict_to_schema/run.py b/codegen-examples/examples/dict_to_schema/run.py
index 838779da4..51dab7d8c 100644
--- a/codegen-examples/examples/dict_to_schema/run.py
+++ b/codegen-examples/examples/dict_to_schema/run.py
@@ -1,5 +1,5 @@
 import codegen
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen import Codebase
 
 
diff --git a/codegen-examples/examples/fragment_to_shorthand/run.py b/codegen-examples/examples/fragment_to_shorthand/run.py
index c140cb183..80e2e2108 100644
--- a/codegen-examples/examples/fragment_to_shorthand/run.py
+++ b/codegen-examples/examples/fragment_to_shorthand/run.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @codegen.function("fragment_to_shorthand")
diff --git a/codegen-examples/examples/freezegun_to_timemachine_migration/run.py b/codegen-examples/examples/freezegun_to_timemachine_migration/run.py
index 543795d0c..c1fca07bd 100644
--- a/codegen-examples/examples/freezegun_to_timemachine_migration/run.py
+++ b/codegen-examples/examples/freezegun_to_timemachine_migration/run.py
@@ -1,5 +1,5 @@
 import codegen
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen import Codebase
 
 
diff --git a/codegen-examples/examples/generate_training_data/run.py b/codegen-examples/examples/generate_training_data/run.py
index 17fd1167a..0b6f38d95 100644
--- a/codegen-examples/examples/generate_training_data/run.py
+++ b/codegen-examples/examples/generate_training_data/run.py
@@ -2,7 +2,7 @@
 
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.sdk.core.external_module import ExternalModule
 from codegen.sdk.core.import_resolution import Import
 from codegen.sdk.core.symbol import Symbol
diff --git a/codegen-examples/examples/langchain_agent/run.py b/codegen-examples/examples/langchain_agent/run.py
index cff0d15f1..8607b2160 100644
--- a/codegen-examples/examples/langchain_agent/run.py
+++ b/codegen-examples/examples/langchain_agent/run.py
@@ -14,7 +14,7 @@
     SemanticEditTool,
     ViewFileTool,
 )
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from langchain import hub
 from langchain.agents import AgentExecutor
 from langchain.agents.openai_functions_agent.base import OpenAIFunctionsAgent
diff --git a/codegen-examples/examples/modules_dependencies/run.py b/codegen-examples/examples/modules_dependencies/run.py
index 4fefd8076..03b35ad7d 100644
--- a/codegen-examples/examples/modules_dependencies/run.py
+++ b/codegen-examples/examples/modules_dependencies/run.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import networkx as nx
 
 
diff --git a/codegen-examples/examples/openapi_decorators/run.py b/codegen-examples/examples/openapi_decorators/run.py
index 8834f3f81..4c3dbe2a5 100644
--- a/codegen-examples/examples/openapi_decorators/run.py
+++ b/codegen-examples/examples/openapi_decorators/run.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def analyze_model_fields(method) -> dict:
diff --git a/codegen-examples/examples/reexport_management/run.py b/codegen-examples/examples/reexport_management/run.py
index b4b0aaf9a..f28811e87 100644
--- a/codegen-examples/examples/reexport_management/run.py
+++ b/codegen-examples/examples/reexport_management/run.py
@@ -3,7 +3,7 @@
 
 from codegen.sdk.typescript.file import TSImport
 
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 processed_imports = set()
 
diff --git a/codegen-examples/examples/slack_chatbot/api.py b/codegen-examples/examples/slack_chatbot/api.py
index a3c385284..7b96cc26f 100644
--- a/codegen-examples/examples/slack_chatbot/api.py
+++ b/codegen-examples/examples/slack_chatbot/api.py
@@ -6,7 +6,7 @@
 import modal
 from codegen import Codebase
 from codegen.extensions import VectorIndex
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from fastapi import FastAPI, Request
 from openai import OpenAI
 from slack_bolt import App
diff --git a/codegen-examples/examples/sqlalchemy_soft_delete/run.py b/codegen-examples/examples/sqlalchemy_soft_delete/run.py
index 3e2072e60..d971d8520 100644
--- a/codegen-examples/examples/sqlalchemy_soft_delete/run.py
+++ b/codegen-examples/examples/sqlalchemy_soft_delete/run.py
@@ -1,7 +1,7 @@
 import codegen
 from codegen import Codebase
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import shutil
 import subprocess
 from pathlib import Path
diff --git a/codegen-examples/examples/usesuspensequery_to_usesuspensequeries/run.py b/codegen-examples/examples/usesuspensequery_to_usesuspensequeries/run.py
index c68174ca6..8a7163d6b 100644
--- a/codegen-examples/examples/usesuspensequery_to_usesuspensequeries/run.py
+++ b/codegen-examples/examples/usesuspensequery_to_usesuspensequeries/run.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
 
 
diff --git a/codegen-examples/examples/visualize_codebases/blast_radius.py b/codegen-examples/examples/visualize_codebases/blast_radius.py
index 1e4f06fe9..a644d617f 100644
--- a/codegen-examples/examples/visualize_codebases/blast_radius.py
+++ b/codegen-examples/examples/visualize_codebases/blast_radius.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import networkx as nx
 from codegen.sdk.python.symbol import PySymbol
 from codegen.sdk.python.function import PyFunction
diff --git a/codegen-examples/examples/visualize_codebases/call_trace.py b/codegen-examples/examples/visualize_codebases/call_trace.py
index 6132a9ffc..d13f6cf15 100644
--- a/codegen-examples/examples/visualize_codebases/call_trace.py
+++ b/codegen-examples/examples/visualize_codebases/call_trace.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import networkx as nx
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
 from codegen.sdk.core.function import Function
diff --git a/codegen-examples/examples/visualize_codebases/dependency_trace.py b/codegen-examples/examples/visualize_codebases/dependency_trace.py
index 8604acfa0..8a134ffcd 100644
--- a/codegen-examples/examples/visualize_codebases/dependency_trace.py
+++ b/codegen-examples/examples/visualize_codebases/dependency_trace.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import networkx as nx
 from codegen.sdk.core.class_definition import Class
 from codegen.sdk.core.symbol import Symbol
diff --git a/codegen-examples/examples/visualize_codebases/method_relationships.py b/codegen-examples/examples/visualize_codebases/method_relationships.py
index 7042bbb0a..d31cc01ad 100644
--- a/codegen-examples/examples/visualize_codebases/method_relationships.py
+++ b/codegen-examples/examples/visualize_codebases/method_relationships.py
@@ -1,6 +1,6 @@
 import codegen
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 import networkx as nx
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
 from codegen.sdk.core.function import Function
diff --git a/docs/conftest.py b/docs/conftest.py
index f597d010b..f578dcb04 100644
--- a/docs/conftest.py
+++ b/docs/conftest.py
@@ -8,7 +8,7 @@
 
 from codegen.sdk.code_generation.current_code_codebase import get_documented_objects
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.sdk.typescript.class_definition import TSClass
 from codegen.sdk.typescript.file import TSFile
 from codegen.gscli.generate.runner_imports import EXTERNAL_IMPORTS
diff --git a/pyproject.toml b/pyproject.toml
index bf4da2bb1..8cf9926c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -160,7 +160,7 @@ dev-dependencies = [
 
 
 [tool.uv.workspace]
-members = ["codegen", "codegen-examples"]
+#members = ["codegen", "codegen-examples"]
 exclude = ["codegen-examples"]
 
 [tool.cython-lint]
diff --git a/scripts/profiling/apis.py b/scripts/profiling/apis.py
index ac61f7e97..464029dd5 100644
--- a/scripts/profiling/apis.py
+++ b/scripts/profiling/apis.py
@@ -7,7 +7,7 @@
 from tabulate import tabulate
 
 from codegen.sdk.codebase.factory.get_dev_customer_codebase import get_codebase_codegen
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logging.basicConfig(level=logging.INFO)
 codegen = get_codebase_codegen("../codegen", ".")
diff --git a/src/codegen/cli/api/client.py b/src/codegen/cli/api/client.py
index 73c5f9f39..0150299d0 100644
--- a/src/codegen/cli/api/client.py
+++ b/src/codegen/cli/api/client.py
@@ -45,8 +45,8 @@
 from codegen.cli.env.global_env import global_env
 from codegen.cli.errors import InvalidTokenError, ServerError
 from codegen.cli.utils.codemods import Codemod
-from codegen.cli.utils.constants import ProgrammingLanguage
 from codegen.cli.utils.function_finder import DecoratedFunction
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 InputT = TypeVar("InputT", bound=BaseModel)
 OutputT = TypeVar("OutputT", bound=BaseModel)
diff --git a/src/codegen/cli/api/schemas.py b/src/codegen/cli/api/schemas.py
index fbc8eb7b2..0cb20a619 100644
--- a/src/codegen/cli/api/schemas.py
+++ b/src/codegen/cli/api/schemas.py
@@ -4,8 +4,8 @@
 from pydantic import BaseModel
 from pydantic.fields import Field
 
-from codegen.cli.utils.constants import ProgrammingLanguage
 from codegen.cli.utils.schema import SafeBaseModel
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 T = TypeVar("T")
 
diff --git a/src/codegen/cli/auth/session.py b/src/codegen/cli/auth/session.py
index caba48958..8e0090a11 100644
--- a/src/codegen/cli/auth/session.py
+++ b/src/codegen/cli/auth/session.py
@@ -8,7 +8,7 @@
 from codegen.cli.errors import AuthError, NoTokenError
 from codegen.cli.git.repo import get_git_repo
 from codegen.cli.utils.config import Config, get_config, write_config
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @dataclass
@@ -39,15 +39,19 @@ class CodegenSession:
     """Represents an authenticated codegen session with user and repository context"""
 
     # =====[ Instance attributes ]=====
-    token: str | None = None
+    _token: str | None = None
 
     # =====[ Lazy instance attributes ]=====
     _config: Config | None = None
     _identity: Identity | None = None
     _profile: UserProfile | None = None
 
-    def __init__(self, token: str | None = None):
-        self.token = token or get_current_token()
+    @property
+    def token(self) -> str | None:
+        """Get the current authentication token"""
+        if self._token:
+            return self._token
+        return get_current_token()
 
     @property
     def config(self) -> Config:
diff --git a/src/codegen/cli/commands/init/main.py b/src/codegen/cli/commands/init/main.py
index cf69df000..4a7a1e261 100644
--- a/src/codegen/cli/commands/init/main.py
+++ b/src/codegen/cli/commands/init/main.py
@@ -1,65 +1,84 @@
+import os
 import subprocess
 import sys
 from pathlib import Path
 
 import rich
 import rich_click as click
+from github import BadCredentialsException
+from github.MainClass import Github
 
-from codegen.cli.auth.constants import CODEGEN_DIR
 from codegen.cli.auth.session import CodegenSession
 from codegen.cli.commands.init.render import get_success_message
-from codegen.cli.git.url import get_git_organization_and_repo
 from codegen.cli.rich.codeblocks import format_command
-from codegen.cli.utils.constants import ProgrammingLanguage
 from codegen.cli.workspace.initialize_workspace import initialize_codegen
+from codegen.git.repo_operator.local_git_repo import LocalGitRepo
+from codegen.shared.configs.config import config
+from codegen.shared.configs.constants import CONFIG_PATH
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @click.command(name="init")
-@click.option("--repo-name", type=str, help="The name of the repository")
-@click.option("--organization-name", type=str, help="The name of the organization")
-@click.option("--fetch-docs", is_flag=True, help="Fetch docs and examples (requires auth)")
+@click.option("--path", type=str, help="Path within a git repository. Defaults to the current directory.")
+@click.option("--token", type=str, help="Access token for the git repository. Required for full functionality.")
 @click.option("--language", type=click.Choice(["python", "typescript"], case_sensitive=False), help="Override automatic language detection")
-def init_command(repo_name: str | None = None, organization_name: str | None = None, fetch_docs: bool = False, language: str | None = None):
+@click.option("--fetch-docs", is_flag=True, help="Fetch docs and examples (requires auth)")
+def init_command(path: str | None = None, token: str | None = None, language: str | None = None, fetch_docs: bool = False):
     """Initialize or update the Codegen folder."""
     # Print a message if not in a git repo
+    path = str(Path.cwd()) if path is None else path
     try:
+        os.chdir(path)
         output = subprocess.run(["git", "rev-parse", "--show-toplevel"], capture_output=True, check=True, text=True)
+        local_git = LocalGitRepo(repo_path=output.stdout.strip())
     except (subprocess.CalledProcessError, FileNotFoundError):
-        rich.print("\n[bold red]Error:[/bold red] Not in a git repository")
+        rich.print(f"\n[bold red]Error:[/bold red] Path={path} is not in a git repository")
         rich.print("[white]Please run this command from within a git repository.[/white]")
         rich.print("\n[dim]To initialize a new git repository:[/dim]")
         rich.print(format_command("git init"))
-        rich.print(format_command("git remote add origin <your-repo-url>"))
         rich.print(format_command("codegen init"))
         sys.exit(1)
 
-    # Convert language string to enum if provided
-    programming_language = None
-    if language:
-        programming_language = ProgrammingLanguage[language.upper()]
+    if local_git.origin_remote is None:
+        rich.print("\n[bold red]Error:[/bold red] No remote found for repository")
+        rich.print("[white]Please add a remote to the repository.[/white]")
+        rich.print("\n[dim]To add a remote to the repository:[/dim]")
+        rich.print(format_command("git remote add origin <your-repo-url>"))
+        sys.exit(1)
+
+    if token is None:
+        token = config.secrets.github_token
+    else:
+        config.secrets.github_token = token
 
-    # Only create session if we need to fetch docs
-    session = CodegenSession() if fetch_docs else None
-    codegen_dir = Path.cwd() / CODEGEN_DIR if not session else session.codegen_dir
-    is_update = codegen_dir.exists()
+    if not token:
+        rich.print("\n[bold yellow]Warning:[/bold yellow] GitHub token not found")
+        rich.print("To enable full functionality, please set your GitHub token:")
+        rich.print(format_command("export CODEGEN_SECRETS__GITHUB_TOKEN=<your-token>"))
+        rich.print("Or pass in as a parameter:")
+        rich.print(format_command("codegen init --token <your-token>"))
+    else:
+        # Validate that the token is valid for the repo path.
+        try:
+            Github(login_or_token=token).get_repo(local_git.full_name)
+        except BadCredentialsException:
+            rich.print(format_command(f"\n[bold red]Error:[/bold red] Invalid GitHub token={token} for repo={local_git.full_name}"))
+            rich.print("[white]Please provide a valid GitHub token for this repository.[/white]")
+            sys.exit(1)
 
-    # Only update config if we have a session
-    if session:
-        if organization_name is not None:
-            session.config.organization_name = organization_name
-        if repo_name is not None:
-            session.config.repo_name = repo_name
-        if not session.config.organization_name or not session.config.repo_name:
-            cwd_org, cwd_repo = get_git_organization_and_repo(session.git_repo)
-            session.config.organization_name = session.config.organization_name or cwd_org
-            session.config.repo_name = session.config.repo_name or cwd_repo
-        if programming_language:
-            session.config.programming_language = programming_language
-        session.write_config()
+    # Save repo config
+    config.repository.repo_path = local_git.repo_path
+    config.repository.repo_name = local_git.name
+    config.repository.full_name = local_git.full_name
+    config.repository.user_name = local_git.user_name
+    config.repository.user_email = local_git.user_email
+    config.repository.language = (language or local_git.get_language(access_token=token)).upper()
+    config.save()
 
-    action = "Updating" if is_update else "Initializing"
+    session = CodegenSession()
+    action = "Updating" if CONFIG_PATH.exists() else "Initializing"
     rich.print("")
-    codegen_dir, docs_dir, examples_dir = initialize_codegen(action, session=session, fetch_docs=fetch_docs, programming_language=programming_language)
+    codegen_dir, docs_dir, examples_dir = initialize_codegen(action, session=session, fetch_docs=fetch_docs, programming_language=ProgrammingLanguage(config.repository.language))
 
     # Print success message
     rich.print(f"✅ {action} complete\n")
diff --git a/src/codegen/cli/git/folder.py b/src/codegen/cli/git/folder.py
index 295ead936..7d90c53fb 100644
--- a/src/codegen/cli/git/folder.py
+++ b/src/codegen/cli/git/folder.py
@@ -2,6 +2,7 @@
 from pathlib import Path
 
 
+# TODO: move to codegen.git module
 def get_git_folder(path: os.PathLike | None = None) -> Path | None:
     if path is None:
         path = Path.cwd()
diff --git a/src/codegen/cli/git/repo.py b/src/codegen/cli/git/repo.py
index 21933d42d..73b4b3b45 100644
--- a/src/codegen/cli/git/repo.py
+++ b/src/codegen/cli/git/repo.py
@@ -6,6 +6,7 @@
 from codegen.cli.git.folder import get_git_folder
 
 
+# TODO: move to codegen.git module
 def get_git_repo(path: os.PathLike | None = None) -> Repository | None:
     if path is None:
         path = Path.cwd()
diff --git a/src/codegen/cli/mcp/resources/system_prompt.py b/src/codegen/cli/mcp/resources/system_prompt.py
index 74c607f69..5f8ead36d 100644
--- a/src/codegen/cli/mcp/resources/system_prompt.py
+++ b/src/codegen/cli/mcp/resources/system_prompt.py
@@ -1327,7 +1327,7 @@ def baz():
 
 ```python
 from codegen import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 # Parse from a git repository root
 codebase = Codebase("path/to/repository")
@@ -1360,7 +1360,7 @@ def baz():
 
 ```python
 import codegen
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 # Fetch and parse a repository (defaults to /tmp/codegen/{repo_name})
 codebase = codegen.from_repo('fastapi/fastapi')
@@ -1423,7 +1423,7 @@ def baz():
 from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
 from codegen.git.schemas.repo_config import RepoConfig
 from codegen.sdk.codebase.config import ProjectConfig
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 codebase = Codebase(
     projects = [
diff --git a/src/codegen/cli/mcp/server.py b/src/codegen/cli/mcp/server.py
index 22d8c62da..ed82767ab 100644
--- a/src/codegen/cli/mcp/server.py
+++ b/src/codegen/cli/mcp/server.py
@@ -5,7 +5,7 @@
 from codegen.cli.api.client import RestAPI
 from codegen.cli.mcp.resources.system_prompt import SYSTEM_PROMPT
 from codegen.cli.mcp.resources.system_setup_instructions import SETUP_INSTRUCTIONS
-from codegen.cli.utils.constants import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 # Initialize FastMCP server
 
diff --git a/src/codegen/cli/workspace/initialize_workspace.py b/src/codegen/cli/workspace/initialize_workspace.py
index 1482450a9..70657e6ef 100644
--- a/src/codegen/cli/workspace/initialize_workspace.py
+++ b/src/codegen/cli/workspace/initialize_workspace.py
@@ -14,11 +14,11 @@
 from codegen.cli.git.repo import get_git_repo
 from codegen.cli.git.url import get_git_organization_and_repo
 from codegen.cli.rich.spinners import create_spinner
-from codegen.cli.utils.constants import ProgrammingLanguage
 from codegen.cli.utils.notebooks import create_notebook
 from codegen.cli.workspace.docs_workspace import populate_api_docs
 from codegen.cli.workspace.examples_workspace import populate_examples
 from codegen.cli.workspace.venv_manager import VenvManager
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def initialize_codegen(
diff --git a/src/codegen/git/clients/github_client.py b/src/codegen/git/clients/github_client.py
index 56acfeae6..44e0dbb60 100644
--- a/src/codegen/git/clients/github_client.py
+++ b/src/codegen/git/clients/github_client.py
@@ -15,7 +15,7 @@ class GithubClient:
     base_url: str
     _client: Github
 
-    def __init__(self, token: str, base_url: str = Consts.DEFAULT_BASE_URL):
+    def __init__(self, token: str | None = None, base_url: str = Consts.DEFAULT_BASE_URL):
         self.base_url = base_url
         self._client = Github(token, base_url=base_url)
 
diff --git a/src/codegen/git/repo_operator/local_git_repo.py b/src/codegen/git/repo_operator/local_git_repo.py
new file mode 100644
index 000000000..73d4b9041
--- /dev/null
+++ b/src/codegen/git/repo_operator/local_git_repo.py
@@ -0,0 +1,72 @@
+import os
+from functools import cached_property
+
+from git import Repo
+from git.remote import Remote
+
+from codegen.git.clients.git_repo_client import GitRepoClient
+from codegen.git.schemas.repo_config import RepoConfig
+from codegen.git.utils.language import determine_project_language
+
+
+# TODO: merge this with RepoOperator
+class LocalGitRepo:
+    repo_path: str
+
+    def __init__(self, repo_path: str):
+        self.repo_path = repo_path
+
+    @cached_property
+    def git_cli(self) -> Repo:
+        return Repo(self.repo_path)
+
+    @cached_property
+    def name(self) -> str:
+        return os.path.basename(self.repo_path)
+
+    @cached_property
+    def full_name(self) -> str | None:
+        if not self.origin_remote:
+            return None
+
+        url_segments = self.origin_remote.url.split("/")
+        return f"{url_segments[-2]}/{url_segments[-1].replace('.git', '')}"
+
+    @cached_property
+    def origin_remote(self) -> Remote | None:
+        """Returns the url of the first remote found on the repo, or None if no remotes are set"""
+        if self.has_remote():
+            return self.git_cli.remote("origin")
+
+    @cached_property
+    def base_url(self) -> str | None:
+        if self.origin_remote:
+            return self.origin_remote.url
+        return None
+
+    @property
+    def user_name(self) -> str | None:
+        with self.git_cli.config_reader() as reader:
+            if reader.has_option("user", "name"):
+                return reader.get("user", "name")
+        return None
+
+    @property
+    def user_email(self) -> str | None:
+        with self.git_cli.config_reader() as reader:
+            if reader.has_option("user", "email"):
+                return reader.get("user", "email")
+        return None
+
+    def get_language(self, access_token: str | None = None) -> str:
+        """Returns the majority language of the repository"""
+        if access_token is None:
+            return str(determine_project_language(self.repo_path))
+
+        repo_config = RepoConfig.from_repo_path(repo_path=self.repo_path)
+        repo_config.full_name = self.full_name
+        remote_git = GitRepoClient(repo_config=repo_config, access_token=access_token)
+        return remote_git.repo.language.upper()
+
+    def has_remote(self) -> bool:
+        return bool(self.git_cli.remotes)
diff --git a/src/codegen/git/repo_operator/local_repo_operator.py b/src/codegen/git/repo_operator/local_repo_operator.py
index a178f95c8..8b0a528b3 100644
--- a/src/codegen/git/repo_operator/local_repo_operator.py
+++ b/src/codegen/git/repo_operator/local_repo_operator.py
@@ -5,15 +5,13 @@
 
 from codeowners import CodeOwners as CodeOwnersParser
 from git import Repo as GitCLI
-from github import Github
 from github.PullRequest import PullRequest
-from github.Repository import Repository
 
 from codegen.git.clients.git_repo_client import GitRepoClient
+from codegen.git.repo_operator.local_git_repo import LocalGitRepo
 from codegen.git.repo_operator.repo_operator import RepoOperator
 from codegen.git.schemas.enums import FetchResult
 from codegen.git.schemas.repo_config import RepoConfig
-from codegen.git.utils.clone_url import url_to_github
 from codegen.git.utils.file_utils import create_files
 
 logger = logging.getLogger(__name__)
@@ -30,49 +28,37 @@ class LocalRepoOperator(RepoOperator):
     - Creating "fake" repos from a dictionary of files contents
     """
 
-    _git_cli: GitCLI
-    _github_api_key: str | None
-    _remote_git_repo: GitRepoClient | None = None
+    _local_git_repo: LocalGitRepo
 
     def __init__(
         self,
         repo_config: RepoConfig,
-        github_api_key: str | None = None,
+        access_token: str | None = None,
         bot_commit: bool = False,
     ) -> None:
-        self._github_api_key = github_api_key
-        self._remote_git_repo = None
-        super().__init__(repo_config, bot_commit)
+        super().__init__(repo_config=repo_config, access_token=access_token, bot_commit=bot_commit)
         os.makedirs(self.repo_path, exist_ok=True)
         GitCLI.init(self.repo_path)
+        self._local_git_repo = LocalGitRepo(repo_path=repo_config.repo_path)
+        if repo_config.full_name is None:
+            repo_config.full_name = self._local_git_repo.full_name
 
     ####################################################################################################################
     # PROPERTIES
     ####################################################################################################################
 
     @property
-    def remote_git_repo(self) -> Repository:
-        if self._remote_git_repo is None:
-            if not self._github_api_key:
-                return None
-
-            if not (base_url := self.base_url):
-                msg = "Could not determine GitHub URL from remotes"
-                raise ValueError(msg)
-
-            # Extract owner and repo from the base URL
-            # Format: https://github.com/owner/repo
-            parts = base_url.split("/")
-            if len(parts) < 2:
-                msg = f"Invalid GitHub URL format: {base_url}"
-                raise ValueError(msg)
+    def remote_git_repo(self) -> GitRepoClient | None:
+        """Get the remote GitRepoClient object for the current local repo."""
+        if not self.access_token:
+            msg = "Must initialize with access_token to get remote"
+            raise ValueError(msg)
 
-            owner = parts[-4]
-            repo = parts[-3]
+        if not self._local_git_repo.has_remote():
+            msg = "Cannot initialize remote GitRepoClient from local Git"
+            raise ValueError(msg)
 
-            github = Github(self._github_api_key)
-            self._remote_git_repo = github.get_repo(f"{owner}/{repo}")
-        return self._remote_git_repo
+        return super().remote_git_repo
 
     ####################################################################################################################
     # CLASS METHODS
@@ -100,16 +86,16 @@ def create_from_files(cls, repo_path: str, files: dict[str, str], bot_commit: bo
         return op
 
     @classmethod
-    def create_from_commit(cls, repo_path: str, commit: str, url: str, github_api_key: str | None = None) -> Self:
+    def create_from_commit(cls, repo_path: str, commit: str, url: str, access_token: str | None = None) -> Self:
         """Do a shallow checkout of a particular commit to get a repository from a given remote URL.
 
         Args:
             repo_path (str): Path where the repo should be cloned
             commit (str): The commit hash to checkout
             url (str): Git URL of the repository
-            github_api_key (str | None): Optional GitHub API key for operations that need GitHub access
+            access_token (str | None): Optional GitHub API key for operations that need GitHub access
         """
-        op = cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, github_api_key=github_api_key)
+        op = cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, access_token=access_token)
         op.discard_changes()
         if op.get_active_branch_or_commit() != commit:
             op.create_remote("origin", url)
@@ -118,13 +104,13 @@ def create_from_commit(cls, repo_path: str, commit: str, url: str, github_api_ke
         return op
 
     @classmethod
-    def create_from_repo(cls, repo_path: str, url: str, github_api_key: str | None = None) -> Self:
+    def create_from_repo(cls, repo_path: str, url: str, access_token: str | None = None) -> Self:
         """Create a fresh clone of a repository or use existing one if up to date.
 
         Args:
             repo_path (str): Path where the repo should be cloned
             url (str): Git URL of the repository
-            github_api_key (str | None): Optional GitHub API key for operations that need GitHub access
+            access_token (str | None): Optional GitHub API key for operations that need GitHub access
         """
         # Check if repo already exists
         if os.path.exists(repo_path):
@@ -140,7 +126,7 @@ def create_from_repo(cls, repo_path: str, url: str, github_api_key: str | None =
                     remote_head = git_cli.remotes.origin.refs[git_cli.active_branch.name].commit
                     # If up to date, use existing repo
                     if local_head.hexsha == remote_head.hexsha:
-                        return cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, github_api_key=github_api_key)
+                        return cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, access_token=access_token)
             except Exception:
                 # If any git operations fail, fallback to fresh clone
                 pass
@@ -157,7 +143,7 @@ def create_from_repo(cls, repo_path: str, url: str, github_api_key: str | None =
         # Initialize with the cloned repo
         git_cli = GitCLI(repo_path)
 
-        return cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, github_api_key=github_api_key)
+        return cls(repo_config=RepoConfig.from_repo_path(repo_path), bot_commit=False, access_token=access_token)
 
     ####################################################################################################################
     # PROPERTIES
@@ -169,8 +155,7 @@ def codeowners_parser(self) -> CodeOwnersParser | None:
 
     @cached_property
     def base_url(self) -> str | None:
-        if remote := next(iter(self.git_cli.remotes), None):
-            return url_to_github(remote.url, self.get_active_branch_or_commit())
+        return self._local_git_repo.base_url
 
     @override
     def pull_repo(self) -> None:
diff --git a/src/codegen/git/repo_operator/remote_repo_operator.py b/src/codegen/git/repo_operator/remote_repo_operator.py
index a9f711551..05d840c79 100644
--- a/src/codegen/git/repo_operator/remote_repo_operator.py
+++ b/src/codegen/git/repo_operator/remote_repo_operator.py
@@ -6,7 +6,6 @@
 from codeowners import CodeOwners as CodeOwnersParser
 from git import GitCommandError
 
-from codegen.git.clients.git_repo_client import GitRepoClient
 from codegen.git.repo_operator.repo_operator import RepoOperator
 from codegen.git.schemas.enums import CheckoutResult, FetchResult, SetupOption
 from codegen.git.schemas.repo_config import RepoConfig
@@ -22,16 +21,6 @@
 class RemoteRepoOperator(RepoOperator):
     """A wrapper around GitPython to make it easier to interact with a cloned lowside repo."""
 
-    # __init__ attributes
-    repo_config: RepoConfig
-    base_dir: str
-    access_token: str | None = None
-
-    # lazy attributes
-    _remote_git_repo: GitRepoClient | None = None
-    _codeowners_parser: CodeOwnersParser | None = None
-    _default_branch: str | None = None
-
     # TODO: allow setting the access scope level of the lowside repo (currently it's always WRITE)
     def __init__(
         self,
@@ -41,8 +30,7 @@ def __init__(
         bot_commit: bool = True,
         access_token: str | None = None,
     ) -> None:
-        super().__init__(repo_config=repo_config, bot_commit=bot_commit)
-        self.access_token = access_token
+        super().__init__(repo_config=repo_config, access_token=access_token, bot_commit=bot_commit)
         self.setup_repo_dir(setup_option=setup_option, shallow=shallow)
 
     ####################################################################################################################
@@ -55,12 +43,6 @@ def clone_url(self) -> str:
             return get_authenticated_clone_url_for_repo_config(repo=self.repo_config, token=self.access_token)
         return super().clone_url
 
-    @property
-    def remote_git_repo(self) -> GitRepoClient:
-        if not self._remote_git_repo:
-            self._remote_git_repo = GitRepoClient(self.repo_config, access_token=self.access_token)
-        return self._remote_git_repo
-
     @property
     def default_branch(self) -> str:
         if self._default_branch is None:
diff --git a/src/codegen/git/repo_operator/repo_operator.py b/src/codegen/git/repo_operator/repo_operator.py
index 692fbf28a..859f53517 100644
--- a/src/codegen/git/repo_operator/repo_operator.py
+++ b/src/codegen/git/repo_operator/repo_operator.py
@@ -14,6 +14,7 @@
 from git import Repo as GitCLI
 from git.remote import PushInfoList
 
+from codegen.git.clients.git_repo_client import GitRepoClient
 from codegen.git.configs.constants import CODEGEN_BOT_EMAIL, CODEGEN_BOT_NAME
 from codegen.git.schemas.enums import CheckoutResult, FetchResult
 from codegen.git.schemas.repo_config import RepoConfig
@@ -30,16 +31,22 @@ class RepoOperator(ABC):
     repo_config: RepoConfig
     base_dir: str
     bot_commit: bool = True
+    access_token: str | None = None
+
+    # lazy attributes
     _codeowners_parser: CodeOwnersParser | None = None
     _default_branch: str | None = None
+    _remote_git_repo: GitRepoClient | None = None
 
     def __init__(
         self,
         repo_config: RepoConfig,
+        access_token: str | None = None,
         bot_commit: bool = True,
     ) -> None:
         assert repo_config is not None
         self.repo_config = repo_config
+        self.access_token = access_token
         self.base_dir = repo_config.base_dir
         self.bot_commit = bot_commit
 
@@ -55,6 +62,12 @@ def repo_name(self) -> str:
     def repo_path(self) -> str:
         return os.path.join(self.base_dir, self.repo_name)
 
+    @property
+    def remote_git_repo(self) -> GitRepoClient:
+        if not self._remote_git_repo:
+            self._remote_git_repo = GitRepoClient(self.repo_config, access_token=self.access_token)
+        return self._remote_git_repo
+
     @property
     def clone_url(self) -> str:
         return f"https://github.com/{self.repo_config.full_name}.git"
diff --git a/src/codegen/git/schemas/repo_config.py b/src/codegen/git/schemas/repo_config.py
index 8d5cb7f46..f7d152cd7 100644
--- a/src/codegen/git/schemas/repo_config.py
+++ b/src/codegen/git/schemas/repo_config.py
@@ -5,6 +5,7 @@
 from pydantic import BaseModel
 
 from codegen.git.schemas.enums import RepoVisibility
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logger = logging.getLogger(__name__)
 
@@ -20,7 +21,7 @@ class RepoConfig(BaseModel):
     # Codebase fields
     base_dir: str = "/tmp"  # parent directory of the git repo
     base_path: str | None = None  # root directory of the codebase within the repo
-    language: str | None = "PYTHON"
+    language: ProgrammingLanguage | None = ProgrammingLanguage.PYTHON
     subdirectories: list[str] | None = None
     respect_gitignore: bool = True
 
@@ -29,10 +30,10 @@ def repo_path(self) -> str:
         return f"{self.base_dir}/{self.name}"
 
     @classmethod
-    def from_repo_path(cls, repo_path: str, **kwargs) -> "RepoConfig":
+    def from_repo_path(cls, repo_path: str) -> "RepoConfig":
         name = os.path.basename(repo_path)
         base_dir = os.path.dirname(repo_path)
-        return cls(name=name, base_dir=base_dir, **kwargs)
+        return cls(name=name, base_dir=base_dir)
 
     # TODO: remove
     def encoded_json(self):
diff --git a/src/codegen/git/utils/clone.py b/src/codegen/git/utils/clone.py
index c427b5aa1..a4e937458 100644
--- a/src/codegen/git/utils/clone.py
+++ b/src/codegen/git/utils/clone.py
@@ -7,9 +7,6 @@
 logger = logging.getLogger(__name__)
 
 
-# return os.path.join(repo_path, repo_name), clone_url
-
-
 # TODO: update to use GitPython instead + move into LocalRepoOperator
 def clone_repo(
     repo_path: str,
diff --git a/src/codegen/git/utils/file_utils.py b/src/codegen/git/utils/file_utils.py
index 5aa3af80a..f8ed0cbb6 100644
--- a/src/codegen/git/utils/file_utils.py
+++ b/src/codegen/git/utils/file_utils.py
@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 
 def create_file(file_path: str, content: str | bytes) -> str:
@@ -35,3 +36,38 @@ def create_file(file_path: str, content: str | bytes) -> str:
 def create_files(base_dir: str, files: dict[str, str]) -> None:
     for filename, content in files.items():
         create_file(os.path.join(base_dir, filename), content)
+
+
+def split_git_path(filepath: str) -> tuple[str, str | None]:
+    """Split a filepath into (git_root, base_path) tuple by finding .git directory.
+
+    Args:
+        filepath (str): The full path to split
+
+    Returns:
+        tuple: (git_root_path, relative_path)
+
+    Raises:
+        ValueError: If the path is not in a git repository
+    """
+    # Convert to absolute path and resolve any symlinks
+    path = Path(filepath).resolve()
+
+    # Start from the given path and traverse up until we find .git
+    current = path
+    while current != current.parent:
+        if (current / ".git").exists():
+            # Found the git root
+            git_root = str(current)
+            rel_path = str(path.relative_to(current))
+
+            # Handle the case where filepath is the git root itself
+            if rel_path == ".":
+                rel_path = None
+
+            return (git_root, rel_path)
+        current = current.parent
+
+    # If we get here, we didn't find a .git directory
+    msg = f"Path '{filepath}' is not in a git repository!"
+    raise ValueError(msg)
diff --git a/src/codegen/git/utils/language.py b/src/codegen/git/utils/language.py
new file mode 100644
index 000000000..b4bb09ffb
--- /dev/null
+++ b/src/codegen/git/utils/language.py
@@ -0,0 +1,89 @@
+from collections import Counter
+from pathlib import Path
+from typing import Literal
+
+from codegen.shared.enums.programming_language import ProgrammingLanguage
+
+
+def determine_project_language(folder_path: str, strategy: Literal["most_common", "package_json"] = "package_json") -> ProgrammingLanguage:
+    """Determines the primary programming language of a project.
+
+    Args:
+        folder_path (str): Path to the folder to analyze
+        strategy (Literal["most_common", "package_json"]): Strategy to use for determining language.
+            "most_common" analyzes file extensions, "package_json" checks for package.json presence.
+
+    Returns:
+        ProgrammingLanguage: The determined programming language
+    """
+    # TODO: Create a new strategy that follows gitignore
+    if strategy == "most_common":
+        return _determine_language_by_file_count(folder_path)
+    elif strategy == "package_json":
+        return _determine_language_by_package_json(folder_path)
+
+
+def _determine_language_by_package_json(folder_path: str) -> ProgrammingLanguage:
+    """Determines project language by checking for presence of package.json.
+    Faster but less accurate than file count strategy.
+
+    Args:
+        folder_path (str): Path to the folder to analyze
+
+    Returns:
+        ProgrammingLanguage: TYPESCRIPT if package.json exists, otherwise PYTHON
+    """
+    package_json_path = Path(folder_path) / "package.json"
+    if package_json_path.exists():
+        return ProgrammingLanguage.TYPESCRIPT
+    else:
+        return ProgrammingLanguage.PYTHON
+
+
+def _determine_language_by_file_count(folder_path: str) -> ProgrammingLanguage:
+    """Analyzes a folder to determine the primary programming language based on file extensions.
+    Returns the language with the most matching files.
+
+    Args:
+        folder_path (str): Path to the folder to analyze
+
+    Returns:
+        ProgrammingLanguage: The dominant programming language, or UNSUPPORTED if no matching files found
+    """
+    from codegen.sdk.python import PyFile
+    from codegen.sdk.typescript.file import TSFile
+
+    EXTENSIONS = {
+        ProgrammingLanguage.PYTHON: PyFile.get_extensions(),
+        ProgrammingLanguage.TYPESCRIPT: TSFile.get_extensions(),
+    }
+
+    folder = Path(folder_path)
+    if not folder.exists() or not folder.is_dir():
+        msg = f"Invalid folder path: {folder_path}"
+        raise ValueError(msg)
+
+    # Initialize counters for each language
+    language_counts = Counter()
+
+    # Walk through the directory
+    for file_path in folder.rglob("*"):
+        # Skip directories and hidden files
+        if file_path.is_dir() or file_path.name.startswith("."):
+            continue
+
+        # Skip common directories to ignore
+        if any(ignore in str(file_path) for ignore in [".git", "node_modules", "__pycache__", "venv", ".env"]):
+            continue
+
+        # Count files for each language based on extensions
+        for language, exts in EXTENSIONS.items():
+            if file_path.suffix in exts:
+                language_counts[language] += 1
+
+    # If no files found, return None
+    if not language_counts:
+        return ProgrammingLanguage.UNSUPPORTED
+
+    # Return the language with the highest count
+    return language_counts.most_common(1)[0][0]
diff --git a/src/codegen/gscli/generate/runner_imports.py b/src/codegen/gscli/generate/runner_imports.py
index f06c2301a..d07b86062 100644
--- a/src/codegen/gscli/generate/runner_imports.py
+++ b/src/codegen/gscli/generate/runner_imports.py
@@ -4,8 +4,8 @@
 import tomlkit
 from termcolor import colored
 
+from codegen.git.utils.file_utils import split_git_path
 from codegen.sdk.code_generation.current_code_codebase import get_documented_objects
-from codegen.sdk.utils import split_git_path
 from codegen.shared.decorators.docs import DocumentedObject
 
 EXTERNAL_IMPORTS = """
diff --git a/src/codegen/runner/sandbox/ephemeral_server.py b/src/codegen/runner/sandbox/ephemeral_server.py
index 12af608df..1cfe8d248 100644
--- a/src/codegen/runner/sandbox/ephemeral_server.py
+++ b/src/codegen/runner/sandbox/ephemeral_server.py
@@ -13,8 +13,8 @@
 )
 from codegen.runner.sandbox.executor import SandboxExecutor
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.shared.compilation.string_to_code import create_execute_function_from_codeblock
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/codegen/runner/sandbox/runner.py b/src/codegen/runner/sandbox/runner.py
index 3b4492eeb..40340d47c 100644
--- a/src/codegen/runner/sandbox/runner.py
+++ b/src/codegen/runner/sandbox/runner.py
@@ -11,7 +11,6 @@
 from codegen.sdk.codebase.config import ProjectConfig, SessionOptions
 from codegen.sdk.codebase.factory.codebase_factory import CodebaseType
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.shared.compilation.string_to_code import create_execute_function_from_codeblock
 from codegen.shared.configs.config import config
 from codegen.shared.performance.stopwatch_utils import stopwatch
@@ -49,7 +48,7 @@ async def warmup(self) -> None:
 
     async def _build_graph(self) -> Codebase:
         logger.info("> Building graph...")
-        programming_language = ProgrammingLanguage(self.op.repo_config.language.upper())
+        programming_language = self.op.repo_config.language
         projects = [ProjectConfig(programming_language=programming_language, repo_operator=self.op, base_path=self.op.repo_config.base_path, subdirectories=self.op.repo_config.subdirectories)]
         return Codebase(projects=projects, config=get_codebase_config())
 
diff --git a/src/codegen/sdk/code_generation/current_code_codebase.py b/src/codegen/sdk/code_generation/current_code_codebase.py
index bd4229095..6d07588c9 100644
--- a/src/codegen/sdk/code_generation/current_code_codebase.py
+++ b/src/codegen/sdk/code_generation/current_code_codebase.py
@@ -8,8 +8,8 @@
 from codegen.git.schemas.repo_config import RepoConfig
 from codegen.sdk.codebase.config import CodebaseConfig, DefaultConfig, ProjectConfig
 from codegen.sdk.core.codebase import Codebase, CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.shared.decorators.docs import DocumentedObject, apidoc_objects, no_apidoc_objects, py_apidoc_objects, ts_apidoc_objects
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logger = logging.getLogger(__name__)
 
@@ -38,7 +38,8 @@ def get_current_code_codebase(config: CodebaseConfig = DefaultConfig, subdirecto
     base_dir = get_codegen_codebase_base_path()
     logger.info(f"Creating codebase from repo at: {codegen_repo_path} with base_path {base_dir}")
 
-    repo_config = RepoConfig.from_repo_path(codegen_repo_path, respect_gitignore=False)
+    repo_config = RepoConfig.from_repo_path(codegen_repo_path)
+    repo_config.respect_gitignore = False
     op = LocalRepoOperator(repo_config=repo_config, bot_commit=False)
 
     config = config.model_copy(update={"base_path": base_dir})
diff --git a/src/codegen/sdk/code_generation/doc_utils/utils.py b/src/codegen/sdk/code_generation/doc_utils/utils.py
index 10e690e2d..01e31d876 100644
--- a/src/codegen/sdk/code_generation/doc_utils/utils.py
+++ b/src/codegen/sdk/code_generation/doc_utils/utils.py
@@ -9,8 +9,8 @@
 from codegen.sdk.core.function import Function
 from codegen.sdk.core.interfaces.callable import Callable
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python.statements.attribute import PyAttribute
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/codegen/sdk/code_generation/prompts/api_docs.py b/src/codegen/sdk/code_generation/prompts/api_docs.py
index 6c12d513f..cde0ff257 100644
--- a/src/codegen/sdk/code_generation/prompts/api_docs.py
+++ b/src/codegen/sdk/code_generation/prompts/api_docs.py
@@ -3,7 +3,7 @@
 from codegen.sdk.code_generation.codegen_sdk_codebase import get_codegen_sdk_codebase
 from codegen.sdk.code_generation.prompts.utils import get_api_classes_by_decorator, get_codegen_sdk_class_docstring
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/codegen/sdk/code_generation/prompts/utils.py b/src/codegen/sdk/code_generation/prompts/utils.py
index bbf5cce3e..fc583c73b 100644
--- a/src/codegen/sdk/code_generation/prompts/utils.py
+++ b/src/codegen/sdk/code_generation/prompts/utils.py
@@ -1,7 +1,8 @@
 from codegen.sdk.code_generation.enums import DocumentationDecorators
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import NodeType, ProgrammingLanguage
+from codegen.sdk.enums import NodeType
 from codegen.sdk.python.class_definition import PyClass
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def get_decorator_for_language(
diff --git a/src/codegen/sdk/codebase/codebase_context.py b/src/codegen/sdk/codebase/codebase_context.py
index 806225f96..429270c7b 100644
--- a/src/codegen/sdk/codebase/codebase_context.py
+++ b/src/codegen/sdk/codebase/codebase_context.py
@@ -22,10 +22,11 @@
 from codegen.sdk.core.directory import Directory
 from codegen.sdk.core.external.dependency_manager import DependencyManager, get_dependency_manager
 from codegen.sdk.core.external.language_engine import LanguageEngine, get_language_engine
-from codegen.sdk.enums import Edge, EdgeType, NodeType, ProgrammingLanguage
+from codegen.sdk.enums import Edge, EdgeType, NodeType
 from codegen.sdk.extensions.sort import sort_editables
 from codegen.sdk.extensions.utils import uncache_all
 from codegen.sdk.typescript.external.ts_declassify.ts_declassify import TSDeclassify
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.shared.exceptions.control_flow import StopCodemodException
 from codegen.shared.performance.stopwatch_utils import stopwatch, stopwatch_with_sentry
 
diff --git a/src/codegen/sdk/codebase/config.py b/src/codegen/sdk/codebase/config.py
index 215582170..10d14cc00 100644
--- a/src/codegen/sdk/codebase/config.py
+++ b/src/codegen/sdk/codebase/config.py
@@ -8,9 +8,10 @@
 from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
 from codegen.git.repo_operator.repo_operator import RepoOperator
 from codegen.git.schemas.repo_config import RepoConfig
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.git.utils.file_utils import split_git_path
+from codegen.git.utils.language import determine_project_language
 from codegen.sdk.secrets import Secrets
-from codegen.sdk.utils import determine_project_language, split_git_path
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 HARD_MAX_AI_LIMIT = 500  # Global limit for AI requests
 
@@ -74,7 +75,9 @@ def from_path(cls, path: str, programming_language: ProgrammingLanguage | None =
         git_root, base_path = split_git_path(repo_path)
         subdirectories = [base_path] if base_path else None
         programming_language = programming_language or determine_project_language(repo_path)
-        repo_config = RepoConfig.from_repo_path(repo_path=git_root, language=programming_language, subdirectories=subdirectories)
+        repo_config = RepoConfig.from_repo_path(repo_path=git_root)
+        repo_config.language = programming_language
+        repo_config.subdirectories = subdirectories
         # Create main project
         return cls(
             repo_operator=LocalRepoOperator(repo_config=repo_config),
diff --git a/src/codegen/sdk/codebase/config_parser.py b/src/codegen/sdk/codebase/config_parser.py
index 8ab48bd7b..f6ee88238 100644
--- a/src/codegen/sdk/codebase/config_parser.py
+++ b/src/codegen/sdk/codebase/config_parser.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.codebase_context import CodebaseContext
diff --git a/src/codegen/sdk/codebase/factory/codebase_factory.py b/src/codegen/sdk/codebase/factory/codebase_factory.py
index 68039b2dc..1bf6d5b70 100644
--- a/src/codegen/sdk/codebase/factory/codebase_factory.py
+++ b/src/codegen/sdk/codebase/factory/codebase_factory.py
@@ -4,7 +4,7 @@
     Codebase,
     CodebaseType,
 )
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 class CodebaseFactory:
diff --git a/src/codegen/sdk/codebase/factory/get_session.py b/src/codegen/sdk/codebase/factory/get_session.py
index 818f32909..7444fd4c4 100644
--- a/src/codegen/sdk/codebase/factory/get_session.py
+++ b/src/codegen/sdk/codebase/factory/get_session.py
@@ -9,9 +9,9 @@
 from codegen.sdk.codebase.config import CodebaseConfig, GSFeatureFlags, ProjectConfig, SessionOptions, TestFlags
 from codegen.sdk.codebase.factory.codebase_factory import CodebaseFactory
 from codegen.sdk.core.codebase import Codebase, PyCodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.secrets import Secrets
 from codegen.sdk.tree_sitter_parser import print_errors
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @overload
diff --git a/src/codegen/sdk/core/codebase.py b/src/codegen/sdk/core/codebase.py
index d3b572043..455b36e07 100644
--- a/src/codegen/sdk/core/codebase.py
+++ b/src/codegen/sdk/core/codebase.py
@@ -52,7 +52,7 @@
 from codegen.sdk.core.interfaces.has_name import HasName
 from codegen.sdk.core.symbol import Symbol
 from codegen.sdk.core.type_alias import TypeAlias
-from codegen.sdk.enums import NodeType, ProgrammingLanguage, SymbolType
+from codegen.sdk.enums import NodeType, SymbolType
 from codegen.sdk.extensions.sort import sort_editables
 from codegen.sdk.extensions.utils import uncache_all
 from codegen.sdk.output.constants import ANGULAR_STYLE
@@ -78,6 +78,7 @@
 from codegen.sdk.typescript.symbol import TSSymbol
 from codegen.sdk.typescript.type_alias import TSTypeAlias
 from codegen.shared.decorators.docs import apidoc, noapidoc, py_noapidoc
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.shared.exceptions.control_flow import MaxAIRequestsError
 from codegen.shared.performance.stopwatch_utils import stopwatch
 from codegen.visualizations.visualization_manager import VisualizationManager
@@ -903,7 +904,7 @@ def create_pr(self, title: str, body: str) -> PullRequest:
             raise ValueError(msg)
         self._op.stage_and_commit_all_changes(message=title)
         self._op.push_changes()
-        return self._op.remote_git_repo.create_pull(head=self._op.git_cli.active_branch.name, base=self._op.default_branch, title=title, body=body)
+        return self._op.remote_git_repo.create_pull(head_branch_name=self._op.git_cli.active_branch.name, base_branch_name=self._op.default_branch, title=title, body=body)
 
     ####################################################################################################################
     # GRAPH VISUALIZATION
@@ -1242,10 +1243,10 @@ def from_repo(
             # Use LocalRepoOperator to fetch the repository
             logger.info("Cloning repository...")
             if commit is None:
-                repo_operator = LocalRepoOperator.create_from_repo(repo_path=repo_path, url=repo_url, github_api_key=config.secrets.github_api_key if config.secrets else None)
+                repo_operator = LocalRepoOperator.create_from_repo(repo_path=repo_path, url=repo_url, access_token=config.secrets.github_api_key if config.secrets else None)
             else:
                 # Ensure the operator can handle remote operations
-                repo_operator = LocalRepoOperator.create_from_commit(repo_path=repo_path, commit=commit, url=repo_url, github_api_key=config.secrets.github_api_key if config.secrets else None)
+                repo_operator = LocalRepoOperator.create_from_commit(repo_path=repo_path, commit=commit, url=repo_url, access_token=config.secrets.github_api_key if config.secrets else None)
             logger.info("Clone completed successfully")
 
             # Initialize and return codebase with proper context
diff --git a/src/codegen/sdk/core/detached_symbols/function_call.py b/src/codegen/sdk/core/detached_symbols/function_call.py
index ac25ccdab..272140544 100644
--- a/src/codegen/sdk/core/detached_symbols/function_call.py
+++ b/src/codegen/sdk/core/detached_symbols/function_call.py
@@ -13,12 +13,13 @@
 from codegen.sdk.core.interfaces.has_name import HasName
 from codegen.sdk.core.interfaces.resolvable import Resolvable
 from codegen.sdk.core.symbol_groups.collection import Collection
-from codegen.sdk.enums import NodeType, ProgrammingLanguage
+from codegen.sdk.enums import NodeType
 from codegen.sdk.extensions.sort import sort_editables
 from codegen.sdk.extensions.utils import cached_property, is_descendant_of
 from codegen.sdk.typescript.enums import TSFunctionTypeNames
 from codegen.sdk.utils import find_first_ancestor
 from codegen.shared.decorators.docs import apidoc, noapidoc
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from collections.abc import Generator
diff --git a/src/codegen/sdk/core/external/dependency_manager.py b/src/codegen/sdk/core/external/dependency_manager.py
index e067be9b6..8132bd028 100644
--- a/src/codegen/sdk/core/external/dependency_manager.py
+++ b/src/codegen/sdk/core/external/dependency_manager.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.external.external_process import ExternalProcess
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.codebase_context import CodebaseContext
diff --git a/src/codegen/sdk/core/external/language_engine.py b/src/codegen/sdk/core/external/language_engine.py
index 74564364f..5dad68381 100644
--- a/src/codegen/sdk/core/external/language_engine.py
+++ b/src/codegen/sdk/core/external/language_engine.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.external.external_process import ExternalProcess
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.codebase_context import CodebaseContext
diff --git a/src/codegen/sdk/core/plugins/axios.py b/src/codegen/sdk/core/plugins/axios.py
index 22a4de747..d4efc27ac 100644
--- a/src/codegen/sdk/core/plugins/axios.py
+++ b/src/codegen/sdk/core/plugins/axios.py
@@ -7,7 +7,7 @@
 from codegen.sdk.core.interfaces.editable import Editable
 from codegen.sdk.core.plugins.plugin import Plugin
 from codegen.sdk.core.symbol_groups.dict import Dict
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.codebase import TSCodebaseType
diff --git a/src/codegen/sdk/core/plugins/flask.py b/src/codegen/sdk/core/plugins/flask.py
index 1a399e6fd..783cd7f9c 100644
--- a/src/codegen/sdk/core/plugins/flask.py
+++ b/src/codegen/sdk/core/plugins/flask.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.plugins.plugin import Plugin
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.codebase import PyCodebaseType
diff --git a/src/codegen/sdk/core/plugins/modal.py b/src/codegen/sdk/core/plugins/modal.py
index d6edc2475..c81406df9 100644
--- a/src/codegen/sdk/core/plugins/modal.py
+++ b/src/codegen/sdk/core/plugins/modal.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.plugins.plugin import Plugin
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.codebase import PyCodebaseType
diff --git a/src/codegen/sdk/core/plugins/plugin.py b/src/codegen/sdk/core/plugins/plugin.py
index 79d9f6ed3..93c7f3ed5 100644
--- a/src/codegen/sdk/core/plugins/plugin.py
+++ b/src/codegen/sdk/core/plugins/plugin.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.interfaces.editable import Editable
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.codebase import Codebase
diff --git a/src/codegen/sdk/enums.py b/src/codegen/sdk/enums.py
index c2fe533af..b67c5bd81 100644
--- a/src/codegen/sdk/enums.py
+++ b/src/codegen/sdk/enums.py
@@ -1,4 +1,4 @@
-from enum import IntEnum, StrEnum, auto
+from enum import IntEnum, auto
 from typing import NamedTuple
 
 from codegen.sdk.core.dataclasses.usage import Usage
@@ -80,12 +80,6 @@ class ImportType(IntEnum):
     UNKNOWN = auto()  # TODO: get rid of this - mostly used to set default value. we should just set to None.
 
 
-class ProgrammingLanguage(StrEnum):
-    PYTHON = "PYTHON"
-    TYPESCRIPT = "TYPESCRIPT"
-    UNSUPPORTED = "UNSUPPORTED"
-
-
 class Edge(NamedTuple):
     type: EdgeType
     usage: Usage | None
diff --git a/src/codegen/sdk/python/file.py b/src/codegen/sdk/python/file.py
index 57e82bb6e..ecaa4da7b 100644
--- a/src/codegen/sdk/python/file.py
+++ b/src/codegen/sdk/python/file.py
@@ -5,7 +5,7 @@
 from codegen.sdk.core.autocommit import commiter, reader, writer
 from codegen.sdk.core.file import SourceFile
 from codegen.sdk.core.interface import Interface
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
 from codegen.sdk.extensions.utils import cached_property, iter_all_descendants
 from codegen.sdk.python import PyAssignment
 from codegen.sdk.python.class_definition import PyClass
@@ -17,6 +17,7 @@
 from codegen.sdk.python.statements.attribute import PyAttribute
 from codegen.sdk.python.statements.import_statement import PyImportStatement
 from codegen.shared.decorators.docs import noapidoc, py_apidoc
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.codebase_context import CodebaseContext
diff --git a/src/codegen/sdk/typescript/file.py b/src/codegen/sdk/typescript/file.py
index a132a125d..182e3294e 100644
--- a/src/codegen/sdk/typescript/file.py
+++ b/src/codegen/sdk/typescript/file.py
@@ -6,7 +6,7 @@
 from codegen.sdk.core.autocommit import commiter, mover, reader, writer
 from codegen.sdk.core.file import SourceFile
 from codegen.sdk.core.interfaces.exportable import Exportable
-from codegen.sdk.enums import ImportType, NodeType, ProgrammingLanguage, SymbolType
+from codegen.sdk.enums import ImportType, NodeType, SymbolType
 from codegen.sdk.extensions.sort import sort_editables
 from codegen.sdk.extensions.utils import cached_property
 from codegen.sdk.typescript.assignment import TSAssignment
@@ -21,6 +21,7 @@
 from codegen.sdk.typescript.statements.import_statement import TSImportStatement
 from codegen.sdk.utils import calculate_base_path, find_all_descendants
 from codegen.shared.decorators.docs import noapidoc, ts_apidoc
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.codebase_context import CodebaseContext
diff --git a/src/codegen/sdk/utils.py b/src/codegen/sdk/utils.py
index 113c3692e..9b551d5d5 100644
--- a/src/codegen/sdk/utils.py
+++ b/src/codegen/sdk/utils.py
@@ -1,20 +1,17 @@
 import os
 import re
 import shutil
-from collections import Counter
 from collections.abc import Iterable
 from contextlib import contextmanager
-from pathlib import Path
-from typing import Literal
 from xml.dom.minidom import parseString
 
 import dicttoxml
 import xmltodict
 from tree_sitter import Node as TSNode
 
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.extensions.utils import find_all_descendants, find_first_descendant, get_all_identifiers
 from codegen.sdk.typescript.enums import TSFunctionTypeNames
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 """
 Utility functions for traversing the tree sitter structure.
@@ -243,125 +240,6 @@ def get_language_file_extensions(language: ProgrammingLanguage):
         return set(TSFile.get_extensions())
 
 
-def determine_project_language(folder_path: str, strategy: Literal["most_common", "package_json"] = "package_json") -> ProgrammingLanguage:
-    """Determines the primary programming language of a project.
-
-    Args:
-        folder_path (str): Path to the folder to analyze
-        strategy (Literal["most_common", "package_json"]): Strategy to use for determining language.
-            "most_common" analyzes file extensions, "package_json" checks for package.json presence.
-
-    Returns:
-        ProgrammingLanguage: The determined programming language
-    """
-    # TODO: Create a new strategy that follows gitignore
-    if strategy == "most_common":
-        return _determine_language_by_file_count(folder_path)
-    elif strategy == "package_json":
-        return _determine_language_by_package_json(folder_path)
-
-
-def _determine_language_by_package_json(folder_path: str) -> ProgrammingLanguage:
-    """Determines project language by checking for presence of package.json.
-    Faster but less accurate than file count strategy.
-
-    Args:
-        folder_path (str): Path to the folder to analyze
-
-    Returns:
-        ProgrammingLanguage: TYPESCRIPT if package.json exists, otherwise PYTHON
-    """
-    package_json_path = Path(folder_path) / "package.json"
-    if package_json_path.exists():
-        return ProgrammingLanguage.TYPESCRIPT
-    else:
-        return ProgrammingLanguage.PYTHON
-
-
-def _determine_language_by_file_count(folder_path: str) -> ProgrammingLanguage:
-    """Analyzes a folder to determine the primary programming language based on file extensions.
-    Returns the language with the most matching files.
-
-    Args:
-        folder_path (str): Path to the folder to analyze
-
-    Returns:
-        ProgrammingLanguage: The dominant programming language, or UNSUPPORTED if no matching files found
-    """
-    from codegen.sdk.python import PyFile
-    from codegen.sdk.typescript.file import TSFile
-
-    EXTENSIONS = {
-        ProgrammingLanguage.PYTHON: PyFile.get_extensions(),
-        ProgrammingLanguage.TYPESCRIPT: TSFile.get_extensions(),
-    }
-
-    folder = Path(folder_path)
-    if not folder.exists() or not folder.is_dir():
-        msg = f"Invalid folder path: {folder_path}"
-        raise ValueError(msg)
-
-    # Initialize counters for each language
-    language_counts = Counter()
-
-    # Walk through the directory
-    for file_path in folder.rglob("*"):
-        # Skip directories and hidden files
-        if file_path.is_dir() or file_path.name.startswith("."):
-            continue
-
-        # Skip common directories to ignore
-        if any(ignore in str(file_path) for ignore in [".git", "node_modules", "__pycache__", "venv", ".env"]):
-            continue
-
-        # Count files for each language based on extensions
-        for language, exts in EXTENSIONS.items():
-            if file_path.suffix in exts:
-                language_counts[language] += 1
-
-    # If no files found, return None
-    if not language_counts:
-        return ProgrammingLanguage.UNSUPPORTED
-
-    # Return the language with the highest count
-    return language_counts.most_common(1)[0][0]
-
-
-def split_git_path(filepath: str) -> tuple[str, str | None]:
-    """Split a filepath into (git_root, base_path) tuple by finding .git directory.
-
-    Args:
-        filepath (str): The full path to split
-
-    Returns:
-        tuple: (git_root_path, relative_path)
-
-    Raises:
-        ValueError: If the path is not in a git repository
-    """
-    # Convert to absolute path and resolve any symlinks
-    path = Path(filepath).resolve()
-
-    # Start from the given path and traverse up until we find .git
-    current = path
-    while current != current.parent:
-        if (current / ".git").exists():
-            # Found the git root
-            git_root = str(current)
-            rel_path = str(path.relative_to(current))
-
-            # Handle the case where filepath is the git root itself
-            if rel_path == ".":
-                rel_path = None
-
-            return (git_root, rel_path)
-        current = current.parent
-
-    # If we get here, we didn't find a .git directory
-    msg = f"Path '{filepath}' is not in a git repository!"
-    raise ValueError(msg)
-
-
 def truncate_line(input: str, max_chars: int) -> str:
     input = str(input)
     if len(input) > max_chars:
diff --git a/src/codegen/sdk/writer_decorators.py b/src/codegen/sdk/writer_decorators.py
index d4ca3b72f..b92da3596 100644
--- a/src/codegen/sdk/writer_decorators.py
+++ b/src/codegen/sdk/writer_decorators.py
@@ -1,4 +1,4 @@
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def canonical(codemod):
diff --git a/src/codegen/shared/configs/config.py b/src/codegen/shared/configs/config.py
index 7b67dbc54..3bf6382d6 100644
--- a/src/codegen/shared/configs/config.py
+++ b/src/codegen/shared/configs/config.py
@@ -17,8 +17,6 @@ def load(config_path: Path | None = None) -> Config:
     # Merge configurations recursively
     config_dict = _merge_configs(env_config.model_dump(), toml_config.model_dump())
 
-    # Load from git
-
     return Config(**config_dict)
 
 
diff --git a/src/codegen/shared/configs/models.py b/src/codegen/shared/configs/models.py
index e635682c2..0d0ea3961 100644
--- a/src/codegen/shared/configs/models.py
+++ b/src/codegen/shared/configs/models.py
@@ -35,8 +35,10 @@ class RepositoryConfig(BaseModel):
 
     repo_path: str | None = None
     repo_name: str | None = None
-    organization_name: str | None = None
-    access_token: str | None = None
+    full_name: str | None = None
+    user_name: str | None = None
+    user_email: str | None = None
+    language: str | None = None
 
 
 class SecretsConfig(BaseSettings):
diff --git a/src/codegen/cli/utils/constants.py b/src/codegen/shared/enums/programming_language.py
similarity index 100%
rename from src/codegen/cli/utils/constants.py
rename to src/codegen/shared/enums/programming_language.py
index af39f5c1b..8f33ccec6 100644
--- a/src/codegen/cli/utils/constants.py
+++ b/src/codegen/shared/enums/programming_language.py
@@ -2,6 +2,6 @@
 
 
 class ProgrammingLanguage(StrEnum):
-    PYTHON = "PYTHON"
     TYPESCRIPT = "TYPESCRIPT"
+    PYTHON = "PYTHON"
     UNSUPPORTED = "UNSUPPORTED"
diff --git a/src/codemods/canonical/add_function_parameter_type_annotations/add_function_parameter_type_annotations.py b/src/codemods/canonical/add_function_parameter_type_annotations/add_function_parameter_type_annotations.py
index 0f15a6d4a..cfeb7ca5f 100644
--- a/src/codemods/canonical/add_function_parameter_type_annotations/add_function_parameter_type_annotations.py
+++ b/src/codemods/canonical/add_function_parameter_type_annotations/add_function_parameter_type_annotations.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/add_internal_to_non_exported_components/add_internal_to_non_exported_components.py b/src/codemods/canonical/add_internal_to_non_exported_components/add_internal_to_non_exported_components.py
index e6650dc7b..11a6ecc2c 100644
--- a/src/codemods/canonical/add_internal_to_non_exported_components/add_internal_to_non_exported_components.py
+++ b/src/codemods/canonical/add_internal_to_non_exported_components/add_internal_to_non_exported_components.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/bang_bang_to_boolean/bang_bang_to_boolean.py b/src/codemods/canonical/bang_bang_to_boolean/bang_bang_to_boolean.py
index 9de7c88fa..e7c769e9c 100644
--- a/src/codemods/canonical/bang_bang_to_boolean/bang_bang_to_boolean.py
+++ b/src/codemods/canonical/bang_bang_to_boolean/bang_bang_to_boolean.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/built_in_type_annotation/built_in_type_annotation.py b/src/codemods/canonical/built_in_type_annotation/built_in_type_annotation.py
index 433ed9608..e04461cfc 100644
--- a/src/codemods/canonical/built_in_type_annotation/built_in_type_annotation.py
+++ b/src/codemods/canonical/built_in_type_annotation/built_in_type_annotation.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/change_component_tag_names/change_component_tag_names.py b/src/codemods/canonical/change_component_tag_names/change_component_tag_names.py
index ab93b59ea..caa40b799 100644
--- a/src/codemods/canonical/change_component_tag_names/change_component_tag_names.py
+++ b/src/codemods/canonical/change_component_tag_names/change_component_tag_names.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/classnames_to_backtick.py b/src/codemods/canonical/classnames_to_backtick.py
index 7711faf20..62a28e95d 100644
--- a/src/codemods/canonical/classnames_to_backtick.py
+++ b/src/codemods/canonical/classnames_to_backtick.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/convert_array_type_to_square_bracket/convert_array_type_to_square_bracket.py b/src/codemods/canonical/convert_array_type_to_square_bracket/convert_array_type_to_square_bracket.py
index 4c449c7e2..8efd7debf 100644
--- a/src/codemods/canonical/convert_array_type_to_square_bracket/convert_array_type_to_square_bracket.py
+++ b/src/codemods/canonical/convert_array_type_to_square_bracket/convert_array_type_to_square_bracket.py
@@ -1,7 +1,7 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.expressions.generic_type import GenericType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/convert_attribute_to_decorator/convert_attribute_to_decorator.py b/src/codemods/canonical/convert_attribute_to_decorator/convert_attribute_to_decorator.py
index 6c0343479..afc67d40d 100644
--- a/src/codemods/canonical/convert_attribute_to_decorator/convert_attribute_to_decorator.py
+++ b/src/codemods/canonical/convert_attribute_to_decorator/convert_attribute_to_decorator.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/convert_comments_to_JSDoc_style/convert_comments_to_JSDoc_style.py b/src/codemods/canonical/convert_comments_to_JSDoc_style/convert_comments_to_JSDoc_style.py
index a4996fb17..1443aa8b5 100644
--- a/src/codemods/canonical/convert_comments_to_JSDoc_style/convert_comments_to_JSDoc_style.py
+++ b/src/codemods/canonical/convert_comments_to_JSDoc_style/convert_comments_to_JSDoc_style.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/convert_docstring_to_google_style/convert_docstring_to_google_style.py b/src/codemods/canonical/convert_docstring_to_google_style/convert_docstring_to_google_style.py
index d371893cf..ce7ba980f 100644
--- a/src/codemods/canonical/convert_docstring_to_google_style/convert_docstring_to_google_style.py
+++ b/src/codemods/canonical/convert_docstring_to_google_style/convert_docstring_to_google_style.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/delete_unused_functions/delete_unused_functions.py b/src/codemods/canonical/delete_unused_functions/delete_unused_functions.py
index 1d474a298..e396aa4fa 100644
--- a/src/codemods/canonical/delete_unused_functions/delete_unused_functions.py
+++ b/src/codemods/canonical/delete_unused_functions/delete_unused_functions.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/emojify_py_files_codemod/emojify_py_files_codemod.py b/src/codemods/canonical/emojify_py_files_codemod/emojify_py_files_codemod.py
index 11f3a5ef0..08336c629 100644
--- a/src/codemods/canonical/emojify_py_files_codemod/emojify_py_files_codemod.py
+++ b/src/codemods/canonical/emojify_py_files_codemod/emojify_py_files_codemod.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/enum_mover/enum_mover.py b/src/codemods/canonical/enum_mover/enum_mover.py
index 2a6522fa1..dae5ff394 100644
--- a/src/codemods/canonical/enum_mover/enum_mover.py
+++ b/src/codemods/canonical/enum_mover/enum_mover.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/insert_arguments_to_decorator/insert_arguments_to_decorator.py b/src/codemods/canonical/insert_arguments_to_decorator/insert_arguments_to_decorator.py
index f37c91122..24b6a55ce 100644
--- a/src/codemods/canonical/insert_arguments_to_decorator/insert_arguments_to_decorator.py
+++ b/src/codemods/canonical/insert_arguments_to_decorator/insert_arguments_to_decorator.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/invite_factory_create_params/invite_factory_create_params.py b/src/codemods/canonical/invite_factory_create_params/invite_factory_create_params.py
index a2c28e236..20d39396a 100644
--- a/src/codemods/canonical/invite_factory_create_params/invite_factory_create_params.py
+++ b/src/codemods/canonical/invite_factory_create_params/invite_factory_create_params.py
@@ -1,7 +1,7 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/js_to_esm_codemod/js_to_esm_codemod.py b/src/codemods/canonical/js_to_esm_codemod/js_to_esm_codemod.py
index 3ed266d64..9e4745ff0 100644
--- a/src/codemods/canonical/js_to_esm_codemod/js_to_esm_codemod.py
+++ b/src/codemods/canonical/js_to_esm_codemod/js_to_esm_codemod.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/mark_as_internal_codemod/mark_as_internal_codemod.py b/src/codemods/canonical/mark_as_internal_codemod/mark_as_internal_codemod.py
index 71d2bb456..c8fbd8dbc 100644
--- a/src/codemods/canonical/mark_as_internal_codemod/mark_as_internal_codemod.py
+++ b/src/codemods/canonical/mark_as_internal_codemod/mark_as_internal_codemod.py
@@ -1,8 +1,8 @@
 from pathlib import Path
 
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/mark_internal_to_module/mark_internal_to_module.py b/src/codemods/canonical/mark_internal_to_module/mark_internal_to_module.py
index 9de1e717a..220cf645c 100644
--- a/src/codemods/canonical/mark_internal_to_module/mark_internal_to_module.py
+++ b/src/codemods/canonical/mark_internal_to_module/mark_internal_to_module.py
@@ -1,7 +1,7 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.dataclasses.usage import UsageKind
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/mark_is_boolean/mark_is_boolean.py b/src/codemods/canonical/mark_is_boolean/mark_is_boolean.py
index f744304e9..e236dce67 100644
--- a/src/codemods/canonical/mark_is_boolean/mark_is_boolean.py
+++ b/src/codemods/canonical/mark_is_boolean/mark_is_boolean.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/migrate_class_attributes/migrate_class_attributes.py b/src/codemods/canonical/migrate_class_attributes/migrate_class_attributes.py
index 449db2168..51bd22fe8 100644
--- a/src/codemods/canonical/migrate_class_attributes/migrate_class_attributes.py
+++ b/src/codemods/canonical/migrate_class_attributes/migrate_class_attributes.py
@@ -2,8 +2,8 @@
 import textwrap
 
 from codegen.sdk.core.codebase import PyCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/move_enums_codemod/move_enums_codemod.py b/src/codemods/canonical/move_enums_codemod/move_enums_codemod.py
index 6d79b7b7c..07e406916 100644
--- a/src/codemods/canonical/move_enums_codemod/move_enums_codemod.py
+++ b/src/codemods/canonical/move_enums_codemod/move_enums_codemod.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/move_functions_to_new_file/move_functions_to_new_file.py b/src/codemods/canonical/move_functions_to_new_file/move_functions_to_new_file.py
index 7ac12fed6..c91d46962 100644
--- a/src/codemods/canonical/move_functions_to_new_file/move_functions_to_new_file.py
+++ b/src/codemods/canonical/move_functions_to_new_file/move_functions_to_new_file.py
@@ -1,8 +1,8 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/openapi_add_response_none/openapi_add_response_none.py b/src/codemods/canonical/openapi_add_response_none/openapi_add_response_none.py
index 945f316c5..cd3eb8809 100644
--- a/src/codemods/canonical/openapi_add_response_none/openapi_add_response_none.py
+++ b/src/codemods/canonical/openapi_add_response_none/openapi_add_response_none.py
@@ -1,8 +1,8 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.detached_symbols.decorator import Decorator
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/openapi_no_reference_request/openapi_no_reference_request.py b/src/codemods/canonical/openapi_no_reference_request/openapi_no_reference_request.py
index f7247f439..0849c840f 100644
--- a/src/codemods/canonical/openapi_no_reference_request/openapi_no_reference_request.py
+++ b/src/codemods/canonical/openapi_no_reference_request/openapi_no_reference_request.py
@@ -1,8 +1,8 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.detached_symbols.decorator import Decorator
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/pascal_case_symbols/pascal_case_symbols.py b/src/codemods/canonical/pascal_case_symbols/pascal_case_symbols.py
index 6375b956f..5ff9dbea8 100644
--- a/src/codemods/canonical/pascal_case_symbols/pascal_case_symbols.py
+++ b/src/codemods/canonical/pascal_case_symbols/pascal_case_symbols.py
@@ -2,8 +2,8 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.interface import Interface
 from codegen.sdk.core.type_alias import TypeAlias
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/pivot_return_types/pivot_return_types.py b/src/codemods/canonical/pivot_return_types/pivot_return_types.py
index 25804921a..367e40ad2 100644
--- a/src/codemods/canonical/pivot_return_types/pivot_return_types.py
+++ b/src/codemods/canonical/pivot_return_types/pivot_return_types.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/refactor_react_components_into_separate_files/refactor_react_components_into_separate_files.py b/src/codemods/canonical/refactor_react_components_into_separate_files/refactor_react_components_into_separate_files.py
index 48806687e..bb03666a9 100644
--- a/src/codemods/canonical/refactor_react_components_into_separate_files/refactor_react_components_into_separate_files.py
+++ b/src/codemods/canonical/refactor_react_components_into_separate_files/refactor_react_components_into_separate_files.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/remove_indirect_imports/remove_indirect_imports.py b/src/codemods/canonical/remove_indirect_imports/remove_indirect_imports.py
index 18c08e72d..ffd866851 100644
--- a/src/codemods/canonical/remove_indirect_imports/remove_indirect_imports.py
+++ b/src/codemods/canonical/remove_indirect_imports/remove_indirect_imports.py
@@ -2,8 +2,8 @@
 from codegen.sdk.core.external_module import ExternalModule
 from codegen.sdk.core.import_resolution import Import
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/rename_function_parameters/rename_function_parameters.py b/src/codemods/canonical/rename_function_parameters/rename_function_parameters.py
index a538c3628..2779453ac 100644
--- a/src/codemods/canonical/rename_function_parameters/rename_function_parameters.py
+++ b/src/codemods/canonical/rename_function_parameters/rename_function_parameters.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/rename_local_variables/rename_local_variables.py b/src/codemods/canonical/rename_local_variables/rename_local_variables.py
index 5689f2186..8ce143ac5 100644
--- a/src/codemods/canonical/rename_local_variables/rename_local_variables.py
+++ b/src/codemods/canonical/rename_local_variables/rename_local_variables.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/replace_prop_values/replace_prop_values.py b/src/codemods/canonical/replace_prop_values/replace_prop_values.py
index 3fe1c5f00..0609d9e13 100644
--- a/src/codemods/canonical/replace_prop_values/replace_prop_values.py
+++ b/src/codemods/canonical/replace_prop_values/replace_prop_values.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/return_none_type_annotation/return_none_type_annotation.py b/src/codemods/canonical/return_none_type_annotation/return_none_type_annotation.py
index 8ace2d728..d5adb15cb 100644
--- a/src/codemods/canonical/return_none_type_annotation/return_none_type_annotation.py
+++ b/src/codemods/canonical/return_none_type_annotation/return_none_type_annotation.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/split_decorators/split_decorators.py b/src/codemods/canonical/split_decorators/split_decorators.py
index a1122b2b8..8c8b7fc59 100644
--- a/src/codemods/canonical/split_decorators/split_decorators.py
+++ b/src/codemods/canonical/split_decorators/split_decorators.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/split_file/split_file.py b/src/codemods/canonical/split_file/split_file.py
index a61dc6401..180f62131 100644
--- a/src/codemods/canonical/split_file/split_file.py
+++ b/src/codemods/canonical/split_file/split_file.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/split_file_and_rename_symbols/split_file_and_rename_symbols.py b/src/codemods/canonical/split_file_and_rename_symbols/split_file_and_rename_symbols.py
index 85e757dba..80d7f8263 100644
--- a/src/codemods/canonical/split_file_and_rename_symbols/split_file_and_rename_symbols.py
+++ b/src/codemods/canonical/split_file_and_rename_symbols/split_file_and_rename_symbols.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/split_large_files/split_large_files.py b/src/codemods/canonical/split_large_files/split_large_files.py
index 6ec618ac2..c1e3e295e 100644
--- a/src/codemods/canonical/split_large_files/split_large_files.py
+++ b/src/codemods/canonical/split_large_files/split_large_files.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/swap_call_site_imports/swap_call_site_imports.py b/src/codemods/canonical/swap_call_site_imports/swap_call_site_imports.py
index 3378ae9b6..ce4d8235f 100644
--- a/src/codemods/canonical/swap_call_site_imports/swap_call_site_imports.py
+++ b/src/codemods/canonical/swap_call_site_imports/swap_call_site_imports.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/swap_class_attribute_usages/swap_class_attribute_usages.py b/src/codemods/canonical/swap_class_attribute_usages/swap_class_attribute_usages.py
index 2fb7c5283..1a9bcb8bf 100644
--- a/src/codemods/canonical/swap_class_attribute_usages/swap_class_attribute_usages.py
+++ b/src/codemods/canonical/swap_class_attribute_usages/swap_class_attribute_usages.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/update_optional_type_annotations/update_optional_type_annotations.py b/src/codemods/canonical/update_optional_type_annotations/update_optional_type_annotations.py
index 3c4b718ab..2a7699df0 100644
--- a/src/codemods/canonical/update_optional_type_annotations/update_optional_type_annotations.py
+++ b/src/codemods/canonical/update_optional_type_annotations/update_optional_type_annotations.py
@@ -2,8 +2,8 @@
 from codegen.sdk.core.expressions import Type
 from codegen.sdk.core.expressions.generic_type import GenericType
 from codegen.sdk.core.expressions.union_type import UnionType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/update_union_types/update_union_types.py b/src/codemods/canonical/update_union_types/update_union_types.py
index dbba3a004..98f7085c9 100644
--- a/src/codemods/canonical/update_union_types/update_union_types.py
+++ b/src/codemods/canonical/update_union_types/update_union_types.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/use_named_kwargs/use_named_kwargs.py b/src/codemods/canonical/use_named_kwargs/use_named_kwargs.py
index e68a3b567..ed886aff3 100644
--- a/src/codemods/canonical/use_named_kwargs/use_named_kwargs.py
+++ b/src/codemods/canonical/use_named_kwargs/use_named_kwargs.py
@@ -1,8 +1,8 @@
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.core.external_module import ExternalModule
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python.class_definition import PyClass
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/wrap_with_component/wrap_with_component.py b/src/codemods/canonical/wrap_with_component/wrap_with_component.py
index f0ae9c2d6..715b98216 100644
--- a/src/codemods/canonical/wrap_with_component/wrap_with_component.py
+++ b/src/codemods/canonical/wrap_with_component/wrap_with_component.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/src/codemods/canonical/wrap_with_statement/wrap_with_statement.py b/src/codemods/canonical/wrap_with_statement/wrap_with_statement.py
index 1fb015e34..263411d63 100644
--- a/src/codemods/canonical/wrap_with_statement/wrap_with_statement.py
+++ b/src/codemods/canonical/wrap_with_statement/wrap_with_statement.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import canonical
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
diff --git a/tests/integration/codegen/cli/commands/conftest.py b/tests/integration/codegen/cli/commands/conftest.py
index 021975826..a89528bde 100644
--- a/tests/integration/codegen/cli/commands/conftest.py
+++ b/tests/integration/codegen/cli/commands/conftest.py
@@ -37,7 +37,5 @@ def initialized_repo(sample_repository: Path, runner: CliRunner):
 
     with patch.object(VenvManager, "is_initialized", return_value=True):
         runner.invoke(init_command)
-    subprocess.run(["git", "add", "."], cwd=sample_repository, check=True)
-    subprocess.run(["git", "commit", "-m", "Initialize codegen"], cwd=sample_repository, check=True)
 
     return sample_repository
diff --git a/tests/integration/codegen/git/codebase/conftest.py b/tests/integration/codegen/git/codebase/conftest.py
index bc07e28d9..35678ea04 100644
--- a/tests/integration/codegen/git/codebase/conftest.py
+++ b/tests/integration/codegen/git/codebase/conftest.py
@@ -26,7 +26,7 @@ def repo_config(tmpdir):
 def op(repo_config):
     os.chdir(repo_config.base_dir)
     GitRepo.clone_from(url=get_authenticated_clone_url_for_repo_config(repo_config, token=config.secrets.github_token), to_path=os.path.join(repo_config.base_dir, repo_config.name), depth=1)
-    op = LocalRepoOperator(repo_config=repo_config, github_api_key=config.secrets.github_token)
+    op = LocalRepoOperator(repo_config=repo_config, access_token=config.secrets.github_token)
     yield op
 
 
diff --git a/tests/integration/codegen/git/codebase/test_codebase_create_pr.py b/tests/integration/codegen/git/codebase/test_codebase_create_pr.py
index 7de389201..f27c105fd 100644
--- a/tests/integration/codegen/git/codebase/test_codebase_create_pr.py
+++ b/tests/integration/codegen/git/codebase/test_codebase_create_pr.py
@@ -13,7 +13,7 @@ def test_codebase_create_pr_active_branch(codebase: Codebase):
     pr = codebase.create_pr(title="test-create-pr title", body="test-create-pr body")
     assert pr.title == "test-create-pr title"
     assert pr.body == "test-create-pr body"
-    assert pr.draft is False
+    assert pr.draft is True
     assert pr.state == "open"
     assert pr.head.ref == head
     assert pr.base.ref == "main"
diff --git a/tests/integration/codegen/runner/conftest.py b/tests/integration/codegen/runner/conftest.py
index c2d93954b..d91fa2da3 100644
--- a/tests/integration/codegen/runner/conftest.py
+++ b/tests/integration/codegen/runner/conftest.py
@@ -10,6 +10,7 @@
 from codegen.git.schemas.repo_config import RepoConfig
 from codegen.runner.clients.sandbox_client import SandboxClient
 from codegen.shared.configs.config import config
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture
@@ -28,7 +29,7 @@ def repo_config(tmpdir) -> Generator[RepoConfig, None, None]:
         name="Kevin-s-Adventure-Game",
         full_name="codegen-sh/Kevin-s-Adventure-Game",
         organization_name="codegen-sh",
-        language="PYTHON",
+        language=ProgrammingLanguage.PYTHON,
         base_dir=str(tmpdir),
     )
 
diff --git a/tests/integration/codegen/sdk/code_generation/test_api_doc_generation.py b/tests/integration/codegen/sdk/code_generation/test_api_doc_generation.py
index c60d59eba..5dd16e709 100644
--- a/tests/integration/codegen/sdk/code_generation/test_api_doc_generation.py
+++ b/tests/integration/codegen/sdk/code_generation/test_api_doc_generation.py
@@ -4,7 +4,7 @@
 from codegen.sdk.code_generation.doc_utils.generate_docs_json import generate_docs_json
 from codegen.sdk.code_generation.prompts.api_docs import get_codegen_sdk_codebase, get_codegen_sdk_docs
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/codegen/sdk/typescript/language_engine/test_node_engine.py b/tests/integration/codegen/sdk/typescript/language_engine/test_node_engine.py
index 7a23d7144..601f536f0 100644
--- a/tests/integration/codegen/sdk/typescript/language_engine/test_node_engine.py
+++ b/tests/integration/codegen/sdk/typescript/language_engine/test_node_engine.py
@@ -1,7 +1,7 @@
 import os
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_node_engine(tmpdir) -> None:
diff --git a/tests/integration/codegen/sdk/typescript/react/test_ts_declassify.py b/tests/integration/codegen/sdk/typescript/react/test_ts_declassify.py
index 0b7acbd89..ad271925f 100644
--- a/tests/integration/codegen/sdk/typescript/react/test_ts_declassify.py
+++ b/tests/integration/codegen/sdk/typescript/react/test_ts_declassify.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/shared/codemod/commands.py b/tests/shared/codemod/commands.py
index b7d2984dc..6601e07bf 100644
--- a/tests/shared/codemod/commands.py
+++ b/tests/shared/codemod/commands.py
@@ -9,7 +9,7 @@
 from rich.console import Console
 from rich.table import Table
 
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.codemod.models import BASE_TMP_DIR, REPO_ID_TO_URL, VERIFIED_CODEMOD_DATA_DIR, ClonedRepoTestCase, Size
 from tests.shared.codemod.test_discovery import filter_repos, find_codemod_test_cases, find_codemods, find_repos, find_verified_codemod_repos
 from tests.shared.codemod.verified_codemod_utils import CodemodAPI, RepoCodemodMetadata
diff --git a/tests/shared/codemod/models.py b/tests/shared/codemod/models.py
index 247b06193..6aa1e3a43 100644
--- a/tests/shared/codemod/models.py
+++ b/tests/shared/codemod/models.py
@@ -11,7 +11,7 @@
 
 from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
 from codegen.sdk.codebase.config import GSFeatureFlags
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.codemod.constants import DIFF_FILEPATH
 from tests.shared.codemod.verified_codemod_utils import CodemodAPI
 
diff --git a/tests/shared/codemod/test_discovery.py b/tests/shared/codemod/test_discovery.py
index f5fdf2039..d11223cab 100644
--- a/tests/shared/codemod/test_discovery.py
+++ b/tests/shared/codemod/test_discovery.py
@@ -10,7 +10,7 @@
 from loguru import logger
 
 from codegen.gscli.generate.runner_imports import get_runner_imports
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codemods.codemod import Codemod
 from tests.shared.codemod.constants import DIFF_FILEPATH
 from tests.shared.codemod.models import BASE_PATH, CODEMOD_PATH, REPO_ID_TO_URL, TEST_DIR, VERIFIED_CODEMOD_DATA_DIR, VERIFIED_CODEMOD_DIFFS, ClonedRepoTestCase, CodemodMetadata, Repo, Size
diff --git a/tests/shared/codemod/verified_codemod_utils.py b/tests/shared/codemod/verified_codemod_utils.py
index af5984158..fba1dabaf 100644
--- a/tests/shared/codemod/verified_codemod_utils.py
+++ b/tests/shared/codemod/verified_codemod_utils.py
@@ -8,7 +8,7 @@
 import requests
 from pydantic import BaseModel
 
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.codemod.constants import GET_CODEMODS_URL_SUFFIX, UPDATE_CODEMOD_DIFF_URL_SUFFIX
 
 logger = logging.getLogger(__name__)
diff --git a/tests/shared/skills/decorators.py b/tests/shared/skills/decorators.py
index c6acec556..8bfd138dc 100644
--- a/tests/shared/skills/decorators.py
+++ b/tests/shared/skills/decorators.py
@@ -5,7 +5,7 @@
 import inflection
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.skill_implementation import SkillImplementation
 from tests.shared.skills.skill_test import SkillTestCase
 from tests.shared.skills.utils import skill_name_to_skill_implementations, skills
diff --git a/tests/shared/skills/skill.py b/tests/shared/skills/skill.py
index 17b695faa..65dc5558a 100644
--- a/tests/shared/skills/skill.py
+++ b/tests/shared/skills/skill.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.codebase import Codebase, CodebaseType, PyCodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from tests.shared.skills.skill_implementation import SkillImplementation
diff --git a/tests/shared/skills/skill_implementation.py b/tests/shared/skills/skill_implementation.py
index bb6a0ab10..252a1e3c2 100644
--- a/tests/shared/skills/skill_implementation.py
+++ b/tests/shared/skills/skill_implementation.py
@@ -5,8 +5,8 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.shared.compilation.string_to_code import create_execute_function_from_codeblock
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.skill_test import SkillTestCase
 from tests.shared.skills.verify_skill_output import verify_skill_output
 
diff --git a/tests/shared/skills/verify_skill_output.py b/tests/shared/skills/verify_skill_output.py
index c043de7c0..00e30c3e0 100644
--- a/tests/shared/skills/verify_skill_output.py
+++ b/tests/shared/skills/verify_skill_output.py
@@ -7,7 +7,7 @@
 import jsbeautifier
 
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def get_jsbeautifier_options() -> jsbeautifier.default_options:
diff --git a/tests/unit/codegen/conftest.py b/tests/unit/codegen/conftest.py
index 3877426ae..f27c3a12a 100644
--- a/tests/unit/codegen/conftest.py
+++ b/tests/unit/codegen/conftest.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture
diff --git a/tests/unit/codegen/runner/sandbox/conftest.py b/tests/unit/codegen/runner/sandbox/conftest.py
index f4b8cce8e..f8a7eceeb 100644
--- a/tests/unit/codegen/runner/sandbox/conftest.py
+++ b/tests/unit/codegen/runner/sandbox/conftest.py
@@ -9,8 +9,8 @@
 from codegen.runner.sandbox.runner import SandboxRunner
 from codegen.sdk.codebase.config import CodebaseConfig, GSFeatureFlags, ProjectConfig
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.secrets import Secrets
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture
diff --git a/tests/unit/codegen/sdk/benchmark/codebase/test_codebase_reset.py b/tests/unit/codegen/sdk/benchmark/codebase/test_codebase_reset.py
index 317b3b2c8..553d740bf 100644
--- a/tests/unit/codegen/sdk/benchmark/codebase/test_codebase_reset.py
+++ b/tests/unit/codegen/sdk/benchmark/codebase/test_codebase_reset.py
@@ -4,7 +4,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.codebase import Codebase
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def generate_files(num_files: int, extension: str = "py") -> dict[str, str]:
diff --git a/tests/unit/codegen/sdk/codebase/transaction_manager/test_transaction_mangager_checks.py b/tests/unit/codegen/sdk/codebase/transaction_manager/test_transaction_mangager_checks.py
index 556cb019b..960efb747 100644
--- a/tests/unit/codegen/sdk/codebase/transaction_manager/test_transaction_mangager_checks.py
+++ b/tests/unit/codegen/sdk/codebase/transaction_manager/test_transaction_mangager_checks.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.config import SessionOptions
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.shared.exceptions.control_flow import MaxPreviewTimeExceeded, MaxTransactionsExceeded
 
 
diff --git a/tests/unit/codegen/sdk/core/interfaces/test_importable_dependencies.py b/tests/unit/codegen/sdk/core/interfaces/test_importable_dependencies.py
index ad86cbc70..ecb8947a2 100644
--- a/tests/unit/codegen/sdk/core/interfaces/test_importable_dependencies.py
+++ b/tests/unit/codegen/sdk/core/interfaces/test_importable_dependencies.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_dependencies_max_depth_python(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/class_definition/test_class_constructor_usages.py b/tests/unit/codegen/sdk/python/class_definition/test_class_constructor_usages.py
index fe4a07dac..01f7e6944 100644
--- a/tests/unit/codegen/sdk/python/class_definition/test_class_constructor_usages.py
+++ b/tests/unit/codegen/sdk/python/class_definition/test_class_constructor_usages.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.class_definition import Class
diff --git a/tests/unit/codegen/sdk/python/class_definition/test_class_method_usages.py b/tests/unit/codegen/sdk/python/class_definition/test_class_method_usages.py
index 5ccd9b152..216cafe92 100644
--- a/tests/unit/codegen/sdk/python/class_definition/test_class_method_usages.py
+++ b/tests/unit/codegen/sdk/python/class_definition/test_class_method_usages.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parent_class_names_single(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/class_definition/test_class_parent_classes.py b/tests/unit/codegen/sdk/python/class_definition/test_class_parent_classes.py
index e606617e7..02ee69c45 100644
--- a/tests/unit/codegen/sdk/python/class_definition/test_class_parent_classes.py
+++ b/tests/unit/codegen/sdk/python/class_definition/test_class_parent_classes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parent_classes_single(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_auto_commit.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_auto_commit.py
index 533e82fde..62eed68b9 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_auto_commit.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_auto_commit.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.skip(reason="We are disabling auto commit for performance reasons")
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_git.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_git.py
index 1c4d72c03..70b908e08 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_git.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_git.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.parametrize("commit, sync", [(True, True), (True, False), (False, False)])
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_log.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_log.py
index 29e1edeb2..651409858 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_log.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_log.py
@@ -4,7 +4,7 @@
 
 from codegen.sdk.codebase.config import SessionOptions
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from codegen.shared.exceptions.control_flow import MaxPreviewTimeExceeded
 
 
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_meta.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_meta.py
index 76b0d2d83..212753123 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_meta.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_meta.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_meta(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_raise_error.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_raise_error.py
index a183ea2ef..989b5dc07 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_raise_error.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_raise_error.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_python_exports_not_supported(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_reset.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_reset.py
index 1aa1c9665..9f49f7f42 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_reset.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_reset.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.codebase.validation import get_edges
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_reset_exception(tmpdir, caplog) -> None:
diff --git a/tests/unit/codegen/sdk/python/codebase/test_codebase_resolution.py b/tests/unit/codegen/sdk/python/codebase/test_codebase_resolution.py
index bab4a2f8f..4f068e4b1 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_codebase_resolution.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_codebase_resolution.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_resolution(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/codebase/test_control_flow.py b/tests/unit/codegen/sdk/python/codebase/test_control_flow.py
index 589f2a2fd..b99cf0246 100644
--- a/tests/unit/codegen/sdk/python/codebase/test_control_flow.py
+++ b/tests/unit/codegen/sdk/python/codebase/test_control_flow.py
@@ -4,7 +4,7 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.codebase.transaction_manager import MaxPreviewTimeExceeded, MaxTransactionsExceeded
 from codegen.sdk.core.codebase import MaxAIRequestsError
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_max_transactions_exceeded_reached_set_threshold(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/code_block/test_code_block.py b/tests/unit/codegen/sdk/python/detached_symbols/code_block/test_code_block.py
index 98591442a..5bbc50392 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/code_block/test_code_block.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/code_block/test_code_block.py
@@ -3,7 +3,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.python import PyFile
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/decorator/test_insert_argument.py b/tests/unit/codegen/sdk/python/detached_symbols/decorator/test_insert_argument.py
index c07f256a5..98a5eb0be 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/decorator/test_insert_argument.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/decorator/test_insert_argument.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_insert_single_arg(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_function_call_is_awaited.py b/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_function_call_is_awaited.py
index b6d81f3ae..0617c1630 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_function_call_is_awaited.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_function_call_is_awaited.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_is_awaited_basic(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_manipulations_function_call.py b/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_manipulations_function_call.py
index 969162444..13876e8b1 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_manipulations_function_call.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/function_call/test_manipulations_function_call.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.file import SourceFile
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_edit.py b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_edit.py
index 5ee686918..cd4a43143 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_edit.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_edit.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_optional.py b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_optional.py
index ac4f99862..79dee559a 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_optional.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_optional.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_variadic.py b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_variadic.py
index 4e4950551..409b8c899 100644
--- a/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_variadic.py
+++ b/tests/unit/codegen/sdk/python/detached_symbols/parameter/test_parameter_is_variadic.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/python/editable/test_replace.py b/tests/unit/codegen/sdk/python/editable/test_replace.py
index 6a6c8a8e2..402e215d7 100644
--- a/tests/unit/codegen/sdk/python/editable/test_replace.py
+++ b/tests/unit/codegen/sdk/python/editable/test_replace.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_replace_all(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/expressions/test_binary_reduce_condition.py b/tests/unit/codegen/sdk/python/expressions/test_binary_reduce_condition.py
index 1e63e0fd1..0d63bfceb 100644
--- a/tests/unit/codegen/sdk/python/expressions/test_binary_reduce_condition.py
+++ b/tests/unit/codegen/sdk/python/expressions/test_binary_reduce_condition.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.python.file import PyFile
diff --git a/tests/unit/codegen/sdk/python/expressions/test_boolean.py b/tests/unit/codegen/sdk/python/expressions/test_boolean.py
index 51ac48ecb..3264894b5 100644
--- a/tests/unit/codegen/sdk/python/expressions/test_boolean.py
+++ b/tests/unit/codegen/sdk/python/expressions/test_boolean.py
@@ -1,8 +1,8 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.binary_expression import BinaryExpression
 from codegen.sdk.core.expressions.boolean import Boolean
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python.assignment import PyAssignment
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_boolean_parse(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/expressions/test_builtin_types.py b/tests/unit/codegen/sdk/python/expressions/test_builtin_types.py
index 74204a171..6ed7a1e22 100644
--- a/tests/unit/codegen/sdk/python/expressions/test_builtin_types.py
+++ b/tests/unit/codegen/sdk/python/expressions/test_builtin_types.py
@@ -5,7 +5,7 @@
 from codegen.sdk.core.symbol_groups.dict import Dict
 from codegen.sdk.core.symbol_groups.list import List
 from codegen.sdk.core.symbol_groups.tuple import Tuple
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_builtin_types(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/expressions/test_conditional_properties.py b/tests/unit/codegen/sdk/python/expressions/test_conditional_properties.py
index 7eefc78a4..3be7f4310 100644
--- a/tests/unit/codegen/sdk/python/expressions/test_conditional_properties.py
+++ b/tests/unit/codegen/sdk/python/expressions/test_conditional_properties.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.python.file import PyFile
diff --git a/tests/unit/codegen/sdk/python/expressions/test_conditional_reduce_condition.py b/tests/unit/codegen/sdk/python/expressions/test_conditional_reduce_condition.py
index 6aae29192..e6601d034 100644
--- a/tests/unit/codegen/sdk/python/expressions/test_conditional_reduce_condition.py
+++ b/tests/unit/codegen/sdk/python/expressions/test_conditional_reduce_condition.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING, Any
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.python.file import PyFile
diff --git a/tests/unit/codegen/sdk/python/file/test_file_get_import_string.py b/tests/unit/codegen/sdk/python/file/test_file_get_import_string.py
index 77e3fb4bd..94c511d9e 100644
--- a/tests/unit/codegen/sdk/python/file/test_file_get_import_string.py
+++ b/tests/unit/codegen/sdk/python/file/test_file_get_import_string.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_get_import_string_no_params(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/function/test_function_async.py b/tests/unit/codegen/sdk/python/function/test_function_async.py
index 796b323b7..c5b1272bc 100644
--- a/tests/unit/codegen/sdk/python/function/test_function_async.py
+++ b/tests/unit/codegen/sdk/python/function/test_function_async.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_is_async_basic(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/function/test_function_flag.py b/tests/unit/codegen/sdk/python/function/test_function_flag.py
index ccc340803..00b3efec3 100644
--- a/tests/unit/codegen/sdk/python/function/test_function_flag.py
+++ b/tests/unit/codegen/sdk/python/function/test_function_flag.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_flag_with_message(tmpdir):
diff --git a/tests/unit/codegen/sdk/python/function/test_function_set_docstring.py b/tests/unit/codegen/sdk/python/function/test_function_set_docstring.py
index 07482e846..24d30ce08 100644
--- a/tests/unit/codegen/sdk/python/function/test_function_set_docstring.py
+++ b/tests/unit/codegen/sdk/python/function/test_function_set_docstring.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/python/function/test_manipulations_function.py b/tests/unit/codegen/sdk/python/function/test_manipulations_function.py
index 48094053f..4146fb3df 100644
--- a/tests/unit/codegen/sdk/python/function/test_manipulations_function.py
+++ b/tests/unit/codegen/sdk/python/function/test_manipulations_function.py
@@ -1,7 +1,7 @@
 # TODO: break-up these tests into API specific tests, ex: one test file for set_return_type
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_prepend_to_function_body_with_docstring(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/python/import_resolution/test_is_dynamic.py b/tests/unit/codegen/sdk/python/import_resolution/test_is_dynamic.py
index c31f55f22..f8625ee7c 100644
--- a/tests/unit/codegen/sdk/python/import_resolution/test_is_dynamic.py
+++ b/tests/unit/codegen/sdk/python/import_resolution/test_is_dynamic.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_py_import_is_dynamic_in_function(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/autocommit/test_autocommit.py b/tests/unit/codegen/sdk/typescript/autocommit/test_autocommit.py
index 3dc575e8d..5170032ba 100644
--- a/tests/unit/codegen/sdk/typescript/autocommit/test_autocommit.py
+++ b/tests/unit/codegen/sdk/typescript/autocommit/test_autocommit.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.skip("No Autocommit")
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_abstract_class.py b/tests/unit/codegen/sdk/typescript/class_definition/test_abstract_class.py
index fb01fb24c..bae163e07 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_abstract_class.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_abstract_class.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_abstract_class_inheritance(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_attribute.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_attribute.py
index 5862eb858..7d0f2b456 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_attribute.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_attribute.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_add_attribute_from_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_decorator.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_decorator.py
index ede79ac5c..8da4796f2 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_decorator.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_decorator.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_add_decorator_to_class(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_method.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_method.py
index 51f75d5cc..fc23b5c89 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_method.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_add_method.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.class_definition import TSClass
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_attributes.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_attributes.py
index 9db3c429c..835aa080d 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_attributes.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_attributes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_attributes_finds_correct_number(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_code_block.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_code_block.py
index 4b029e67c..875c1b217 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_code_block.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_code_block.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_code_block_returns_non_empty(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_comment.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_comment.py
index fdae5e973..0d1c0249b 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_comment.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_single_line(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_constructor_usages.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_constructor_usages.py
index abe2bc405..40063a64a 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_constructor_usages.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_constructor_usages.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.class_definition import Class
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_definition_is_jsx.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_definition_is_jsx.py
index e11b2138b..56937af04 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_definition_is_jsx.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_definition_is_jsx.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_without_parents(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_dependencies.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_dependencies.py
index a5da206a8..5d9103eb4 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_dependencies.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_dependencies.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.skip(reason="CG-9539 TODO @caroljung")
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_filter.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_filter.py
index d90c5ac08..a741c0c48 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_filter.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_filter.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_filter(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_is_exported.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_is_exported.py
index 4f169fedd..69930dbb9 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_is_exported.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_is_exported.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_export_function_is_exported(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_method_usages.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_method_usages.py
index 979e98c28..205a492f0 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_method_usages.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_method_usages.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parent_class_names_single(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parameters.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parameters.py
index 7f841fba9..6c3389a54 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parameters.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parameters.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parameters_gets_non_empty(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_class_names.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_class_names.py
index b3b57f83d..ae455378a 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_class_names.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_class_names.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.interfaces.editable import Editable
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parent_class_names_single(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_classes.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_classes.py
index bcb39521c..352746c0f 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_classes.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_parent_classes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_parent_classes_single(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename.py
index 54fc0478c..0afc98cfc 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_rename(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename_class_attributes.py b/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename_class_attributes.py
index 54a9a33e1..3262fe427 100644
--- a/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename_class_attributes.py
+++ b/tests/unit/codegen/sdk/typescript/class_definition/test_class_rename_class_attributes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_class_definition_rename_class_attribute_throws(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/codebase/test_codebase_exports.py b/tests/unit/codegen/sdk/typescript/codebase/test_codebase_exports.py
index b6ef55d21..834fae7d9 100644
--- a/tests/unit/codegen/sdk/typescript/codebase/test_codebase_exports.py
+++ b/tests/unit/codegen/sdk/typescript/codebase/test_codebase_exports.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_exports(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/codebase/test_codebase_resolution.py b/tests/unit/codegen/sdk/typescript/codebase/test_codebase_resolution.py
index 196f43c15..666c83f4a 100644
--- a/tests/unit/codegen/sdk/typescript/codebase/test_codebase_resolution.py
+++ b/tests/unit/codegen/sdk/typescript/codebase/test_codebase_resolution.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_resolution(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment.py
index 023af08c6..537e50381 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_basic(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_edit.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_edit.py
index f3c8b9786..fda968cdb 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_edit.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_edit.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_basic(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_insert_add.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_insert_add.py
index 1bd0b62af..80628c0f1 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_insert_add.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_comment_insert_add.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_comment(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring.py
index 30bc5ecef..6d199f215 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_docstring_no_docstring(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_edit.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_edit.py
index 875d2c488..e56812a52 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_edit.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_edit.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_docstring_block(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_insert_add.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_insert_add.py
index 106e70ef8..352eea18d 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_insert_add.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_docstring_insert_add.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_docstring(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment.py
index f532614c1..89e5ce508 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_inline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_edit.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_edit.py
index 49c7e0536..564e0cd47 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_edit.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_edit.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_inline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_insert_add.py b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_insert_add.py
index 597c3ce46..e64fcd7f6 100644
--- a/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_insert_add.py
+++ b/tests/unit/codegen/sdk/typescript/comment_docstring/test_inline_comment_insert_add.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_comment_inline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_argument_edit.py b/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_argument_edit.py
index 1bbfe3028..69644d9aa 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_argument_edit.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_argument_edit.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.file import SourceFile
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_fetch_parametes.py b/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_fetch_parametes.py
index 7dc4d3997..5f29db690 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_fetch_parametes.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/argument/test_fetch_parametes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_destructured_parameters(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignment.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignment.py
index 346caa7d0..2df9ec7e5 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignment.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_local_var_assignment_primitive(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignments.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignments.py
index 0b7fb785b..302887287 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignments.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_local_var_assignments.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_and_rename_get_local_var_assignments(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_variable_usages.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_variable_usages.py
index 09884d461..9af77c76f 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_variable_usages.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_get_variable_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_and_edit_variable_usages(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_indent.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_indent.py
index 35e7622be..4ffd4756e 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_indent.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_indent.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_indent_once_to_left(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_local_var_assignments.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_local_var_assignments.py
index 2822a25d2..bd69e66be 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_local_var_assignments.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_local_var_assignments.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_local_var_assignments_try_catch(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_unwrap.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_unwrap.py
index 0ebccc5b5..0938b7b60 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_unwrap.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_unwrap.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_wrap.py b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_wrap.py
index 0a52dece6..c2e5bbebc 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_wrap.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/code_block/test_code_block_wrap.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_wrap_with_if_statement(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_call.py b/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_call.py
index ea63c50d5..1ff461200 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_call.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_call.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_decorator_call_should_find_expression(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_name.py b/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_name.py
index 2f448e855..6415527d7 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_name.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/decorator/test_decorator_name.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_decorator_name_returns_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_extended_source.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_extended_source.py
index fbfd3cd36..7467f4410 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_extended_source.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_extended_source.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_extended_source_in_chain(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_get_function_definition.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_get_function_definition.py
index de498afcd..c35f8875d 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_get_function_definition.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_get_function_definition.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 # ED_TODO: Requires fix to get_function_definition. Check if that is possible
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_is_awaited.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_is_awaited.py
index ab4c0784f..9f93b5494 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_is_awaited.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_is_awaited.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_is_awaited_basic(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_predecessor.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_predecessor.py
index 9f1e1d64a..fd35dd3fc 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_predecessor.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_predecessor.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_predecessor_single_line(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_rename.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_rename.py
index 77c5fe4b1..7e808bae9 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_rename.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_rename_updates_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_type_resolution.py b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_type_resolution.py
index f6b51998a..4b8223ca9 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_type_resolution.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/function_call/test_function_call_type_resolution.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_name_resolution_unary_expression(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_deconstructed.py b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_deconstructed.py
index 0276072d5..b64182bdc 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_deconstructed.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_deconstructed.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_edit.py b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_edit.py
index bfda50e1d..92f37e1c1 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_edit.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_edit.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_optional.py b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_optional.py
index 09d686796..ed9a1edad 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_optional.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_optional.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_variadic.py b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_variadic.py
index fa9fd5d47..b05541e2a 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_variadic.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_is_variadic.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.function import Function
diff --git a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_value.py b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_value.py
index 142f60cc6..961a66bc6 100644
--- a/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_value.py
+++ b/tests/unit/codegen/sdk/typescript/detached_symbols/parameter/test_parameter_value.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_parameter_default_value(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/export/test_directory_exports.py b/tests/unit/codegen/sdk/typescript/export/test_directory_exports.py
index b6ef55d21..834fae7d9 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_directory_exports.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_directory_exports.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_codebase_exports(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_aliased.py b/tests/unit/codegen/sdk/typescript/export/test_export_aliased.py
index 48bc5a502..4940b4b05 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_aliased.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_aliased.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_export_statement.py b/tests/unit/codegen/sdk/typescript/export/test_export_export_statement.py
index c9ae8a410..9db60ada2 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_export_statement.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_export_statement.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_get_import_string.py b/tests/unit/codegen/sdk/typescript/export/test_export_get_import_string.py
index c9b1e8fce..22d6f243c 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_get_import_string.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_get_import_string.py
@@ -1,5 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_export_get_import_string(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_get_reexport_source.py b/tests/unit/codegen/sdk/typescript/export/test_export_get_reexport_source.py
index a520f0e1f..ee437fbc9 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_get_reexport_source.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_get_reexport_source.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_reexport_symbol(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_rename.py b/tests/unit/codegen/sdk/typescript/export/test_export_rename.py
index 61d579bbc..fa40c5963 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_rename.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_rename.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/export/test_export_resolve_export.py b/tests/unit/codegen/sdk/typescript/export/test_export_resolve_export.py
index bc15c442c..1b6147548 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_export_resolve_export.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_export_resolve_export.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/export/test_exportable_usages.py b/tests/unit/codegen/sdk/typescript/export/test_exportable_usages.py
index 8543710c1..d60dda69c 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_exportable_usages.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_exportable_usages.py
@@ -1,6 +1,7 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_exportable_usage_symbol_export(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/export/test_external_export.py b/tests/unit/codegen/sdk/typescript/export/test_external_export.py
index 56c169aeb..1f16d80d8 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_external_export.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_external_export.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/export/test_get_reexported_exports.py b/tests/unit/codegen/sdk/typescript/export/test_get_reexported_exports.py
index e035e2030..80377e575 100644
--- a/tests/unit/codegen/sdk/typescript/export/test_get_reexported_exports.py
+++ b/tests/unit/codegen/sdk/typescript/export/test_get_reexported_exports.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_properties.py b/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_properties.py
index af534e6d6..612db7897 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_properties.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_properties.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_reduce_condition.py b/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_reduce_condition.py
index 356c92a11..5b0496e77 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_reduce_condition.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/ternary_expression/test_ternary_reduce_condition.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_binary_expression.py b/tests/unit/codegen/sdk/typescript/expressions/test_binary_expression.py
index 9d4f26f75..082e9d02c 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_binary_expression.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_binary_expression.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.binary_expression import BinaryExpression
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_binary_reduce_condition.py b/tests/unit/codegen/sdk/typescript/expressions/test_binary_reduce_condition.py
index b21ef842b..ba4777d18 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_binary_reduce_condition.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_binary_reduce_condition.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_boolean.py b/tests/unit/codegen/sdk/typescript/expressions/test_boolean.py
index 7ce20bc67..d6193c719 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_boolean.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_boolean.py
@@ -1,8 +1,8 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.binary_expression import BinaryExpression
 from codegen.sdk.core.expressions.boolean import Boolean
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.assignment import TSAssignment
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_boolean_parse(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_builtin_types.py b/tests/unit/codegen/sdk/typescript/expressions/test_builtin_types.py
index 524741bbd..758e17319 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_builtin_types.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_builtin_types.py
@@ -4,7 +4,7 @@
 from codegen.sdk.core.expressions.string import String
 from codegen.sdk.core.symbol_groups.dict import Dict
 from codegen.sdk.core.symbol_groups.list import List
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_builtin_types(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_chained_attribute_attribute_chain.py b/tests/unit/codegen/sdk/typescript/expressions/test_chained_attribute_attribute_chain.py
index b4c7b36b5..7a9209eb7 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_chained_attribute_attribute_chain.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_chained_attribute_attribute_chain.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_attribute_chain_query_builder(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_dict.py b/tests/unit/codegen/sdk/typescript/expressions/test_dict.py
index 4478340dc..91b97f1ab 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_dict.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_dict.py
@@ -5,8 +5,8 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.unpack import Unpack
 from codegen.sdk.core.symbol_groups.dict import Dict
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.function import TSFunction
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_dict_basic(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_expression.py b/tests/unit/codegen/sdk/typescript/expressions/test_expression.py
index 3e66e8711..518a56836 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_expression.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_expression.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_calls_from_function_call(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_list.py b/tests/unit/codegen/sdk/typescript/expressions/test_list.py
index f446a3ff3..17b3d06b8 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_list.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_list.py
@@ -4,7 +4,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.symbol_groups.list import List
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_number.py b/tests/unit/codegen/sdk/typescript/expressions/test_number.py
index a191ff95b..d88e22c59 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_number.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_number.py
@@ -1,7 +1,7 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.binary_expression import BinaryExpression
 from codegen.sdk.core.expressions.number import Number
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_number_parse(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_string.py b/tests/unit/codegen/sdk/typescript/expressions/test_string.py
index c6237c0a8..3b2db79ea 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_string.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_string.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions import String
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_string_edit(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/expressions/test_type.py b/tests/unit/codegen/sdk/typescript/expressions/test_type.py
index 84fb2fc55..822750ace 100644
--- a/tests/unit/codegen/sdk/typescript/expressions/test_type.py
+++ b/tests/unit/codegen/sdk/typescript/expressions/test_type.py
@@ -1,8 +1,8 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
 from codegen.sdk.core.expressions import String
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.expressions.undefined_type import TSUndefinedType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_type_basic(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol.py b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol.py
index 6d14d8f86..63c544610 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol.py
@@ -1,7 +1,7 @@
 import os
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_add_symbol_to_file_with_comments(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_from_source.py b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_from_source.py
index f43642dad..92d936d05 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_from_source.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_from_source.py
@@ -1,7 +1,7 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.assignment import Assignment
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.function import TSFunction
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_add_symbol_from_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_import.py b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_import.py
index 21532a7c8..81115ce0b 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_import.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_add_symbol_import.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_add_symbol_import_updates_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_editable.py b/tests/unit/codegen/sdk/typescript/file/test_file_editable.py
index bba435880..e61c17365 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_editable.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_editable.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_add_symbol_arrow_function(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_export_statements.py b/tests/unit/codegen/sdk/typescript/file/test_file_export_statements.py
index adaa00922..1d3e387db 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_export_statements.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_export_statements.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_config.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_config.py
index 5ba3c8195..6d07b0e42 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_config.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_config.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_function.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_function.py
index c339efab0..e45454818 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_function.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_function.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_get_function_async_star_function(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_function_calls.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_function_calls.py
index 7ed5e3780..610ece39b 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_function_calls.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_function_calls.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_get_function_calls(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_global_var.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_global_var.py
index 9ac0ab377..761ce12b1 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_global_var.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_global_var.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_global_var_excludes_component_var(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_import_string.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_import_string.py
index 6e7eb5806..e2776604c 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_import_string.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_import_string.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_get_import_string_no_params(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_get_symbol.py b/tests/unit/codegen/sdk/typescript/file/test_file_get_symbol.py
index 4cee2819f..69a10f6f1 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_get_symbol.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_get_symbol.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_symbol_in_tsx(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_global_call.py b/tests/unit/codegen/sdk/typescript/file/test_file_global_call.py
index 6ce4a8d20..cb89dd5b1 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_global_call.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_global_call.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_global_call(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_global_vars.py b/tests/unit/codegen/sdk/typescript/file/test_file_global_vars.py
index 10cb763eb..8c47ea430 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_global_vars.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_global_vars.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_global_vars_gets_exported_global_vars(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_graph.py b/tests/unit/codegen/sdk/typescript/file/test_file_graph.py
index 25529f71e..3f8f94370 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_graph.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_graph.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_graph_has_node_for_existing_file(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_import_statemets.py b/tests/unit/codegen/sdk/typescript/file/test_file_import_statemets.py
index 47819cb42..210d29114 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_import_statemets.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_import_statemets.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_import_statements_includes_require_statements(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_imports.py b/tests/unit/codegen/sdk/typescript/file/test_file_imports.py
index 01f87bab0..8bdb3d1bf 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_imports.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_imports.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_file_imports_default_import(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_remove.py b/tests/unit/codegen/sdk/typescript/file/test_file_remove.py
index 1b8aaba53..cca4fabcd 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_remove.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_remove.py
@@ -1,7 +1,7 @@
 import os
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def tets_remove_existing_file(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_statements.py b/tests/unit/codegen/sdk/typescript/file/test_file_statements.py
index d7039e8df..4f58441fc 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_statements.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_statements.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.skip("TODO: @caroljung fix once file and symbol code block parse is unified")
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_symbols.py b/tests/unit/codegen/sdk/typescript/file/test_file_symbols.py
index 5656c9da4..cc3e28f09 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_symbols.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_symbols.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.class_definition import TSClass
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_unicode.py b/tests/unit/codegen/sdk/typescript/file/test_file_unicode.py
index b3fadee28..8beab6133 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_unicode.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_unicode.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_unicode_move_symbol(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_file_update_filepath.py b/tests/unit/codegen/sdk/typescript/file/test_file_update_filepath.py
index 3a7bc487c..7b1f0b6f1 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_file_update_filepath.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_file_update_filepath.py
@@ -3,7 +3,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_rename_file(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/file/test_ts_config_properties.py b/tests/unit/codegen/sdk/typescript/file/test_ts_config_properties.py
index a5a2bde10..8d9acd1ad 100644
--- a/tests/unit/codegen/sdk/typescript/file/test_ts_config_properties.py
+++ b/tests/unit/codegen/sdk/typescript/file/test_ts_config_properties.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.ts_config import TSConfig
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_arrow.py b/tests/unit/codegen/sdk/typescript/function/test_function_arrow.py
index 9169d6134..dc9dfead0 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_arrow.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_arrow.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_assignments.py b/tests/unit/codegen/sdk/typescript/function/test_function_assignments.py
index 1d73ce754..ddc86f843 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_assignments.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_assignments.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_object_unpack(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_async.py b/tests/unit/codegen/sdk/typescript/function/test_function_async.py
index 12ce5da0f..25192705c 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_async.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_async.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.placeholder.placeholder_return_type import TSReturnTypePlaceholder
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_is_async_basic(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_call_sites.py b/tests/unit/codegen/sdk/typescript/function/test_function_call_sites.py
index 526c5cd91..e199a3c15 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_call_sites.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_call_sites.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_sites_in_symbols(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_calls_from_symbol.py b/tests/unit/codegen/sdk/typescript/function/test_function_calls_from_symbol.py
index 871518f3a..f978488d4 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_calls_from_symbol.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_calls_from_symbol.py
@@ -7,10 +7,10 @@
 from codegen.sdk.core.statements.expression_statement import ExpressionStatement
 from codegen.sdk.core.statements.return_statement import ReturnStatement
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.detached_symbols.decorator import TSDecorator
 from codegen.sdk.typescript.expressions.chained_attribute import TSChainedAttribute
 from codegen.sdk.typescript.statements.assignment_statement import TSAssignmentStatement
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_calls_from_file(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_code_block.py b/tests/unit/codegen/sdk/typescript/function/test_function_code_block.py
index 6d461faf6..e0e9049bf 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_code_block.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_code_block.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_code_block_all_statement_types(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_comment.py b/tests/unit/codegen/sdk/typescript/function/test_function_comment.py
index 00405680a..78b1cf53a 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_comment.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_single_line(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_decorators.py b/tests/unit/codegen/sdk/typescript/function/test_function_decorators.py
index afa7a1805..7f6bd0b7b 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_decorators.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_decorators.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_decorators_get_multiple_decorators(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_dependencies.py b/tests/unit/codegen/sdk/typescript/function/test_function_dependencies.py
index 52e799452..4cd7ba4e4 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_dependencies.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_dependencies.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_functions_dependencies_async_function_finds_deps(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_docstring.py b/tests/unit/codegen/sdk/typescript/function/test_function_docstring.py
index 405bd4f5d..4e7f68b2d 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_docstring.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_docstring.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_docstring_multiline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_flag.py b/tests/unit/codegen/sdk/typescript/function/test_function_flag.py
index 1bacd008f..6ac03cd05 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_flag.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_flag.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_flag_with_message(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_function_calls.py b/tests/unit/codegen/sdk/typescript/function/test_function_function_calls.py
index 20d7fa7d5..c4c8a1503 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_function_calls.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_function_calls.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_function_calls_gets_calls_in_return_statement(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_function_declaration_docstring.py b/tests/unit/codegen/sdk/typescript/function/test_function_function_declaration_docstring.py
index aa83691a4..7796309b6 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_function_declaration_docstring.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_function_declaration_docstring.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_signature(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_get_import_string.py b/tests/unit/codegen/sdk/typescript/function/test_function_get_import_string.py
index e99d364ce..dfe3b42d5 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_get_import_string.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_get_import_string.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_get_import_string_with_alias(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_get_parameter_by_index.py b/tests/unit/codegen/sdk/typescript/function/test_function_get_parameter_by_index.py
index e5247e7b2..13b04d0e7 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_get_parameter_by_index.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_get_parameter_by_index.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_get_parameter_by_index(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_is_exported.py b/tests/unit/codegen/sdk/typescript/function/test_function_is_exported.py
index eccd04f68..a5b49a6b4 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_is_exported.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_is_exported.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_named_function_is_exported_should_return_true(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_is_reexported.py b/tests/unit/codegen/sdk/typescript/function/test_function_is_reexported.py
index 98c30f9bd..ebcd0cada 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_is_reexported.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_is_reexported.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_is_reexported_from_separate_file(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_jsx.py b/tests/unit/codegen/sdk/typescript/function/test_function_jsx.py
index 313026bfc..5ce7b5dc0 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_jsx.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_jsx.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_is_jsx(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_level.py b/tests/unit/codegen/sdk/typescript/function/test_function_level.py
index c07eca9e5..f20561146 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_level.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_level.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_level_gets_nested_function(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_move_to_file.py b/tests/unit/codegen/sdk/typescript/function/test_function_move_to_file.py
index 2c8431919..db1b87275 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_move_to_file.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_move_to_file.py
@@ -4,7 +4,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.function import Function
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.utils.normalize import normalize_imports
 
 # All the diff types of JS/TS imports:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_nested_functions.py b/tests/unit/codegen/sdk/typescript/function/test_function_nested_functions.py
index 5ec6b6f72..bb16b78a0 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_nested_functions.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_nested_functions.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_nested_base(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_parameter_to_interface.py b/tests/unit/codegen/sdk/typescript/function/test_function_parameter_to_interface.py
index 13b2100bf..528315b48 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_parameter_to_interface.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_parameter_to_interface.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_parameters.py b/tests/unit/codegen/sdk/typescript/function/test_function_parameters.py
index 391c6352b..aa647c080 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_parameters.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_parameters.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session, get_codebase_session
 from codegen.sdk.core.function import Function
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_parameters_multiline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_prepend_statements.py b/tests/unit/codegen/sdk/typescript/function/test_function_prepend_statements.py
index 0f33a16d7..3d3aa3004 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_prepend_statements.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_prepend_statements.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_call_without_docstring_prepend_statements(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_rename.py b/tests/unit/codegen/sdk/typescript/function/test_function_rename.py
index f1ed8ca02..34456ebe8 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_rename.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_rename_function_updates_file_content(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_return_statements.py b/tests/unit/codegen/sdk/typescript/function/test_function_return_statements.py
index 548ff22a1..4d0b11abb 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_return_statements.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_return_statements.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_function_return_statements_includes_in_if_else_bocks(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_return_type_annotation.py b/tests/unit/codegen/sdk/typescript/function/test_function_return_type_annotation.py
index 674af10aa..f9c0796da 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_return_type_annotation.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_return_type_annotation.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.expressions.generic_type import GenericType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_return_type_annotation(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_set_docstring.py b/tests/unit/codegen/sdk/typescript/function/test_function_set_docstring.py
index ed2930b12..bcad8edd8 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_set_docstring.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_set_docstring.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_docstring_multiline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_set_return_type.py b/tests/unit/codegen/sdk/typescript/function/test_function_set_return_type.py
index a7a7a7237..0dbc17c4f 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_set_return_type.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_set_return_type.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_return_type(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/function/test_function_usages.py b/tests/unit/codegen/sdk/typescript/function/test_function_usages.py
index 38e3e5598..f5e9c48f5 100644
--- a/tests/unit/codegen/sdk/typescript/function/test_function_usages.py
+++ b/tests/unit/codegen/sdk/typescript/function/test_function_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_usages_unpack(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_comment.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_comment.py
index ab1aa580b..ccc07fdcf 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_comment.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_comment_single_line(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_dependencies.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_dependencies.py
index 6c5f248f5..a6bde182f 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_dependencies.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_dependencies.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
 from codegen.sdk.core.import_resolution import Import
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.assignment import TSAssignment
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_get_import_string.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_get_import_string.py
index 724fda32d..eeb464d24 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_get_import_string.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_get_import_string.py
@@ -1,5 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_global_var_get_import_string_import_type_star(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_has_value.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_has_value.py
index 068e91515..708989bcc 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_has_value.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_has_value.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_global_var_single_var(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_inline_comment.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_inline_comment.py
index c81c52ee8..da12afe82 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_inline_comment.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_inline_comment.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_inline_comment_includes_inline(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_is_exported.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_is_exported.py
index 208ac0b79..fedefdd38 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_is_exported.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_is_exported.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_is_exported_should_return_true(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_parsing.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_parsing.py
index d3c44a985..397db8572 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_parsing.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_parsing.py
@@ -1,7 +1,7 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
 from codegen.sdk.core.assignment import Assignment
 from codegen.sdk.core.function import Function
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_parse_global_vars(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_rename.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_rename.py
index 3213b92fc..92592e0a9 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_rename.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_rename_global_var_excludes_class_and_function_matches(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_special.py b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_special.py
index 3a1e79887..6864e8376 100644
--- a/tests/unit/codegen/sdk/typescript/global_var/test_global_var_special.py
+++ b/tests/unit/codegen/sdk/typescript/global_var/test_global_var_special.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_global_var_attribute(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_directory_import.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_directory_import.py
index 50d6349b4..533cad78c 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_directory_import.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_directory_import.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_directory_imports(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_edge_case.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_edge_case.py
index e85c3d9d3..0260fdad8 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_edge_case.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_edge_case.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_has_import.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_has_import.py
index 9c54ed0d0..c959d0c84 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_has_import.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_has_import.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_import_rename_usage_with_alias(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_from_export_statement.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_from_export_statement.py
index 7bf3aea3c..c5ee504e5 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_from_export_statement.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_from_export_statement.py
@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_get_import_string.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_get_import_string.py
index dce87217d..660c6e7bb 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_get_import_string.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_get_import_string.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_remove_import_removes_from_file_imports(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_remove.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_remove.py
index 764e38450..4f9b47fa9 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_remove.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_remove.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_remove_import_removes_from_file_imports(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_rename.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_rename.py
index 165ed5915..2f61f7c91 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_rename.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_rename_import_updates_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_resolve_import.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_resolve_import.py
index 8e7c83b15..8855e531b 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_resolve_import.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_resolve_import.py
@@ -2,7 +2,8 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.dataclasses.usage import UsageType
-from codegen.sdk.enums import ImportType, ProgrammingLanguage
+from codegen.sdk.enums import ImportType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.file import SourceFile
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_module.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_module.py
index 5bcc23137..ec29c9a9a 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_module.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_module.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_import_module_updates_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_symbol_alias.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_symbol_alias.py
index 5fc9f3d24..fdc6fd72b 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_symbol_alias.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_import_resolution_set_import_symbol_alias.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_set_import_symbol_alias_updates_source(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/import_resolution/test_is_dynamic.py b/tests/unit/codegen/sdk/typescript/import_resolution/test_is_dynamic.py
index 33527dab5..3c221bfe4 100644
--- a/tests/unit/codegen/sdk/typescript/import_resolution/test_is_dynamic.py
+++ b/tests/unit/codegen/sdk/typescript/import_resolution/test_is_dynamic.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_ts_import_is_dynamic_in_function_declaration(tmpdir):
diff --git a/tests/unit/codegen/sdk/typescript/interface/test_interface_attributes.py b/tests/unit/codegen/sdk/typescript/interface/test_interface_attributes.py
index 8da1cb31c..206735d4f 100644
--- a/tests/unit/codegen/sdk/typescript/interface/test_interface_attributes.py
+++ b/tests/unit/codegen/sdk/typescript/interface/test_interface_attributes.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session, get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.core.statements.attribute import Attribute
diff --git a/tests/unit/codegen/sdk/typescript/interface/test_interface_dependencies.py b/tests/unit/codegen/sdk/typescript/interface/test_interface_dependencies.py
index 8fd536b67..eab723330 100644
--- a/tests/unit/codegen/sdk/typescript/interface/test_interface_dependencies.py
+++ b/tests/unit/codegen/sdk/typescript/interface/test_interface_dependencies.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_interface_dependencies_includes_extends(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/interface/test_interface_get_attribute.py b/tests/unit/codegen/sdk/typescript/interface/test_interface_get_attribute.py
index 53edf1696..e0a179c56 100644
--- a/tests/unit/codegen/sdk/typescript/interface/test_interface_get_attribute.py
+++ b/tests/unit/codegen/sdk/typescript/interface/test_interface_get_attribute.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_interface_get_attribute_finds_match(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/interface/test_interface_parents.py b/tests/unit/codegen/sdk/typescript/interface/test_interface_parents.py
index 9ce406b15..ecc02b014 100644
--- a/tests/unit/codegen/sdk/typescript/interface/test_interface_parents.py
+++ b/tests/unit/codegen/sdk/typescript/interface/test_interface_parents.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_interfaces_inheritance(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/language_engine/test_v8_engine.py b/tests/unit/codegen/sdk/typescript/language_engine/test_v8_engine.py
index 9497de1d4..c2f77c926 100644
--- a/tests/unit/codegen/sdk/typescript/language_engine/test_v8_engine.py
+++ b/tests/unit/codegen/sdk/typescript/language_engine/test_v8_engine.py
@@ -1,7 +1,7 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.mark.skip(reason="V8 engine is not yet fully supported")
diff --git a/tests/unit/codegen/sdk/typescript/move_symbol_to_file/test_move_tsx_to_file.py b/tests/unit/codegen/sdk/typescript/move_symbol_to_file/test_move_tsx_to_file.py
index 450b85fa5..d2c3e8484 100644
--- a/tests/unit/codegen/sdk/typescript/move_symbol_to_file/test_move_tsx_to_file.py
+++ b/tests/unit/codegen/sdk/typescript/move_symbol_to_file/test_move_tsx_to_file.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_move_component_with_dependencies(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/namespace/test_namespace.py b/tests/unit/codegen/sdk/typescript/namespace/test_namespace.py
index a08142148..aed6271b9 100644
--- a/tests/unit/codegen/sdk/typescript/namespace/test_namespace.py
+++ b/tests/unit/codegen/sdk/typescript/namespace/test_namespace.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.namespace import TSNamespace
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_empty_namespace(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/namespace/test_namespace_complex_examples.py b/tests/unit/codegen/sdk/typescript/namespace/test_namespace_complex_examples.py
index 0efd56d53..3dfa77e28 100644
--- a/tests/unit/codegen/sdk/typescript/namespace/test_namespace_complex_examples.py
+++ b/tests/unit/codegen/sdk/typescript/namespace/test_namespace_complex_examples.py
@@ -1,8 +1,8 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.function import TSFunction
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.namespace import TSNamespace
diff --git a/tests/unit/codegen/sdk/typescript/react/test_interface_props.py b/tests/unit/codegen/sdk/typescript/react/test_interface_props.py
index 8afaa33c3..8a7a9b255 100644
--- a/tests/unit/codegen/sdk/typescript/react/test_interface_props.py
+++ b/tests/unit/codegen/sdk/typescript/react/test_interface_props.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_local_usages.py b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_local_usages.py
index d1d5c3bf8..9ede757f7 100644
--- a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_local_usages.py
+++ b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_local_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_assignment_statement_get_local_usages(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_variable_usages.py b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_variable_usages.py
index 2f64cb526..68075feba 100644
--- a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_variable_usages.py
+++ b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_get_variable_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_get_and_edit_variable_usages(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_annotation.py b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_annotation.py
index 449cb5efb..6f1383e25 100644
--- a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_annotation.py
+++ b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_annotation.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_assignment_statement_type_annotation_returns_none_if_missing(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_resolution.py b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_resolution.py
index 77201c028..a8a092681 100644
--- a/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_resolution.py
+++ b/tests/unit/codegen/sdk/typescript/statements/assignment_statement/test_assignment_statement_type_resolution.py
@@ -1,8 +1,8 @@
 import pytest
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.expressions.object_type import TSObjectType
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_assignment_statement_type_resolution_simple(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_get_local_usages.py b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_get_local_usages.py
index c5b9d3b25..da420cdc6 100644
--- a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_get_local_usages.py
+++ b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_get_local_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_attribute_get_local_usages(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_properties.py b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_properties.py
index 008cf08f2..e13f879a8 100644
--- a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_properties.py
+++ b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_properties.py
@@ -1,9 +1,9 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
 from codegen.sdk.core.expressions.number import Number
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.statements.assignment_statement import TSAssignmentStatement
 from codegen.sdk.typescript.statements.attribute import TSAttribute
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_attribute(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_rename.py b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_rename.py
index 0e8954a70..37384bc57 100644
--- a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_rename.py
+++ b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_rename.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_attribute_rename(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_set_type_annotation.py b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_set_type_annotation.py
index ac2ef29de..c5dd8575a 100644
--- a/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_set_type_annotation.py
+++ b/tests/unit/codegen/sdk/typescript/statements/attribute/test_attribute_set_type_annotation.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_attribute_set_type_annotation_from_none(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/for_loop_statement/test_for_loop_statement.py b/tests/unit/codegen/sdk/typescript/statements/for_loop_statement/test_for_loop_statement.py
index a5219a172..f8ae68acd 100644
--- a/tests/unit/codegen/sdk/typescript/statements/for_loop_statement/test_for_loop_statement.py
+++ b/tests/unit/codegen/sdk/typescript/statements/for_loop_statement/test_for_loop_statement.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_for_loop_statement_parse(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_reduce_block.py b/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_reduce_block.py
index 8cc9b1ee7..1089d8a77 100644
--- a/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_reduce_block.py
+++ b/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_reduce_block.py
@@ -4,7 +4,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_statement_properties.py b/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_statement_properties.py
index d9dcd122c..216741d61 100644
--- a/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_statement_properties.py
+++ b/tests/unit/codegen/sdk/typescript/statements/if_block_statement/test_if_block_statement_properties.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 if TYPE_CHECKING:
     from codegen.sdk.typescript.file import TSFile
diff --git a/tests/unit/codegen/sdk/typescript/statements/statement/test_statement_get_variable_usages.py b/tests/unit/codegen/sdk/typescript/statements/statement/test_statement_get_variable_usages.py
index e5268848c..ab512dd40 100644
--- a/tests/unit/codegen/sdk/typescript/statements/statement/test_statement_get_variable_usages.py
+++ b/tests/unit/codegen/sdk/typescript/statements/statement/test_statement_get_variable_usages.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_if_statement_edit_variable_usages(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/switch_statement/test_switch_statement.py b/tests/unit/codegen/sdk/typescript/statements/switch_statement/test_switch_statement.py
index 37033ffd9..6ac3a94af 100644
--- a/tests/unit/codegen/sdk/typescript/statements/switch_statement/test_switch_statement.py
+++ b/tests/unit/codegen/sdk/typescript/statements/switch_statement/test_switch_statement.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_switch_statement_parse(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/try_catch_statement/test_try_catch_statement.py b/tests/unit/codegen/sdk/typescript/statements/try_catch_statement/test_try_catch_statement.py
index 48d7a59c1..b7ddfa236 100644
--- a/tests/unit/codegen/sdk/typescript/statements/try_catch_statement/test_try_catch_statement.py
+++ b/tests/unit/codegen/sdk/typescript/statements/try_catch_statement/test_try_catch_statement.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.statements.statement import StatementType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_try_catch_statement_parse(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/statements/while_statement/test_while_statement.py b/tests/unit/codegen/sdk/typescript/statements/while_statement/test_while_statement.py
index b1269e24d..56090fdbf 100644
--- a/tests/unit/codegen/sdk/typescript/statements/while_statement/test_while_statement.py
+++ b/tests/unit/codegen/sdk/typescript/statements/while_statement/test_while_statement.py
@@ -3,7 +3,7 @@
 from codegen.sdk.core.expressions.boolean import Boolean
 from codegen.sdk.core.statements.statement import StatementType
 from codegen.sdk.core.statements.while_statement import WhileStatement
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_while_statement_parse(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/test_print.py b/tests/unit/codegen/sdk/typescript/test_print.py
index dbe6ff2dc..b6eb9f81c 100644
--- a/tests/unit/codegen/sdk/typescript/test_print.py
+++ b/tests/unit/codegen/sdk/typescript/test_print.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
 from codegen.sdk.core.class_definition import Class
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_import_rename_usage_with_alias(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/tsx/test_tsx_edit.py b/tests/unit/codegen/sdk/typescript/tsx/test_tsx_edit.py
index 3ae453ced..6f21af839 100644
--- a/tests/unit/codegen/sdk/typescript/tsx/test_tsx_edit.py
+++ b/tests/unit/codegen/sdk/typescript/tsx/test_tsx_edit.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_tsx_component_edit(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/tsx/test_tsx_parsing.py b/tests/unit/codegen/sdk/typescript/tsx/test_tsx_parsing.py
index 0387e5885..af2f32446 100644
--- a/tests/unit/codegen/sdk/typescript/tsx/test_tsx_parsing.py
+++ b/tests/unit/codegen/sdk/typescript/tsx/test_tsx_parsing.py
@@ -1,6 +1,6 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.detached_symbols.jsx.element import JSXElement
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_basic_component_parsing(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/type/test_type_attributes.py b/tests/unit/codegen/sdk/typescript/type/test_type_attributes.py
index f4a843fb5..9114572c5 100644
--- a/tests/unit/codegen/sdk/typescript/type/test_type_attributes.py
+++ b/tests/unit/codegen/sdk/typescript/type/test_type_attributes.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_type_attributes_primitives(tmpdir) -> None:
diff --git a/tests/unit/codegen/sdk/typescript/type/test_type_dependencies.py b/tests/unit/codegen/sdk/typescript/type/test_type_dependencies.py
index 434668805..cde89ca03 100644
--- a/tests/unit/codegen/sdk/typescript/type/test_type_dependencies.py
+++ b/tests/unit/codegen/sdk/typescript/type/test_type_dependencies.py
@@ -1,5 +1,5 @@
 from codegen.sdk.codebase.factory.get_session import get_codebase_graph_session
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 def test_type_dependencies(tmpdir) -> None:
diff --git a/tests/unit/skills/implementations/ai_skills.py b/tests/unit/skills/implementations/ai_skills.py
index 16829b5df..2ca2ffb30 100644
--- a/tests/unit/skills/implementations/ai_skills.py
+++ b/tests/unit/skills/implementations/ai_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/asyncify_skills.py b/tests/unit/skills/implementations/asyncify_skills.py
index d6640adae..c27dbfca9 100644
--- a/tests/unit/skills/implementations/asyncify_skills.py
+++ b/tests/unit/skills/implementations/asyncify_skills.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.core.codebase import CodebaseType, PyCodebaseType, TSCodebaseType
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/code_block_skills.py b/tests/unit/skills/implementations/code_block_skills.py
index 1001bb7bb..feccbf464 100644
--- a/tests/unit/skills/implementations/code_block_skills.py
+++ b/tests/unit/skills/implementations/code_block_skills.py
@@ -4,7 +4,7 @@
 from codegen.sdk.core.detached_symbols.function_call import FunctionCall
 from codegen.sdk.core.expressions.chained_attribute import ChainedAttribute
 from codegen.sdk.core.statements.expression_statement import ExpressionStatement
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/comment_skills.py b/tests/unit/skills/implementations/comment_skills.py
index 917662a27..ad4664f65 100644
--- a/tests/unit/skills/implementations/comment_skills.py
+++ b/tests/unit/skills/implementations/comment_skills.py
@@ -1,7 +1,7 @@
 import re
 
 from codegen.sdk.core.codebase import TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/decorator_skills.py b/tests/unit/skills/implementations/decorator_skills.py
index 549101580..d586b0464 100644
--- a/tests/unit/skills/implementations/decorator_skills.py
+++ b/tests/unit/skills/implementations/decorator_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/eval_skills.py b/tests/unit/skills/implementations/eval_skills.py
index 7e4a6b38e..0a25fa376 100644
--- a/tests/unit/skills/implementations/eval_skills.py
+++ b/tests/unit/skills/implementations/eval_skills.py
@@ -3,8 +3,8 @@
 from pathlib import Path
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python import PyFunction
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase
diff --git a/tests/unit/skills/implementations/example_skills.py b/tests/unit/skills/implementations/example_skills.py
index 1951a4419..aa122000e 100644
--- a/tests/unit/skills/implementations/example_skills.py
+++ b/tests/unit/skills/implementations/example_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/export_skills.py b/tests/unit/skills/implementations/export_skills.py
index a30fea49c..afbf9fea9 100644
--- a/tests/unit/skills/implementations/export_skills.py
+++ b/tests/unit/skills/implementations/export_skills.py
@@ -1,5 +1,5 @@
 from codegen.sdk.core.codebase import TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/expressions/dict.py b/tests/unit/skills/implementations/expressions/dict.py
index f8e38bbbb..45ecfa9c3 100644
--- a/tests/unit/skills/implementations/expressions/dict.py
+++ b/tests/unit/skills/implementations/expressions/dict.py
@@ -1,6 +1,6 @@
 from codegen.sdk.core.codebase import PyCodebaseType
 from codegen.sdk.core.symbol_groups.dict import Dict
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/expressions/list.py b/tests/unit/skills/implementations/expressions/list.py
index 8852e6a92..87b5dc354 100644
--- a/tests/unit/skills/implementations/expressions/list.py
+++ b/tests/unit/skills/implementations/expressions/list.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/expressions/type.py b/tests/unit/skills/implementations/expressions/type.py
index fb9eecd67..9140900c2 100644
--- a/tests/unit/skills/implementations/expressions/type.py
+++ b/tests/unit/skills/implementations/expressions/type.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.core.codebase import CodebaseType
 from codegen.sdk.core.expressions.union_type import UnionType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/feature_flag_deletion_skill.py b/tests/unit/skills/implementations/feature_flag_deletion_skill.py
index 17744025f..47431304d 100644
--- a/tests/unit/skills/implementations/feature_flag_deletion_skill.py
+++ b/tests/unit/skills/implementations/feature_flag_deletion_skill.py
@@ -4,8 +4,8 @@
 from codegen.sdk.core.function import Function
 from codegen.sdk.core.import_resolution import Import
 from codegen.sdk.core.statements.if_block_statement import IfBlockStatement
-from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python.statements.with_statement import WithStatement
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/function_skills.py b/tests/unit/skills/implementations/function_skills.py
index 0168af72a..b17404aea 100644
--- a/tests/unit/skills/implementations/function_skills.py
+++ b/tests/unit/skills/implementations/function_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import PyCodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/global_var_skills.py b/tests/unit/skills/implementations/global_var_skills.py
index bf38f9873..5e46dfcc3 100644
--- a/tests/unit/skills/implementations/global_var_skills.py
+++ b/tests/unit/skills/implementations/global_var_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import PyCodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/graph_viz/graph_viz_app_imports.py b/tests/unit/skills/implementations/graph_viz/graph_viz_app_imports.py
index 4d4a4c11e..610196a02 100644
--- a/tests/unit/skills/implementations/graph_viz/graph_viz_app_imports.py
+++ b/tests/unit/skills/implementations/graph_viz/graph_viz_app_imports.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/graph_viz/graph_viz_call_graph.py b/tests/unit/skills/implementations/graph_viz/graph_viz_call_graph.py
index 21bbd1a6f..aaeed644c 100644
--- a/tests/unit/skills/implementations/graph_viz/graph_viz_call_graph.py
+++ b/tests/unit/skills/implementations/graph_viz/graph_viz_call_graph.py
@@ -8,7 +8,7 @@
 from codegen.sdk.core.external_module import ExternalModule
 from codegen.sdk.core.function import Function
 from codegen.sdk.core.interfaces.callable import Callable
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/graph_viz/graph_viz_dead_code.py b/tests/unit/skills/implementations/graph_viz/graph_viz_dead_code.py
index 27b8ed1c3..fe663d432 100644
--- a/tests/unit/skills/implementations/graph_viz/graph_viz_dead_code.py
+++ b/tests/unit/skills/implementations/graph_viz/graph_viz_dead_code.py
@@ -6,7 +6,7 @@
 from codegen.sdk.core.function import Function
 from codegen.sdk.core.import_resolution import Import
 from codegen.sdk.core.symbol import Symbol
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/graph_viz/graph_viz_dir_tree.py b/tests/unit/skills/implementations/graph_viz/graph_viz_dir_tree.py
index b5fec176b..00c337922 100644
--- a/tests/unit/skills/implementations/graph_viz/graph_viz_dir_tree.py
+++ b/tests/unit/skills/implementations/graph_viz/graph_viz_dir_tree.py
@@ -3,7 +3,7 @@
 import networkx as nx
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/graph_viz/graph_viz_foreign_key.py b/tests/unit/skills/implementations/graph_viz/graph_viz_foreign_key.py
index 608487257..6522dcf49 100644
--- a/tests/unit/skills/implementations/graph_viz/graph_viz_foreign_key.py
+++ b/tests/unit/skills/implementations/graph_viz/graph_viz_foreign_key.py
@@ -3,7 +3,7 @@
 import networkx as nx
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/import-loops.py b/tests/unit/skills/implementations/guides/code-quality-metrics/import-loops.py
index 517909a0f..840da05c1 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/import-loops.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/import-loops.py
@@ -4,7 +4,7 @@
 from networkx import DiGraph
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/large-files.py b/tests/unit/skills/implementations/guides/code-quality-metrics/large-files.py
index e8f6eb3b4..195e5f786 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/large-files.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/large-files.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/missing-documentation.py b/tests/unit/skills/implementations/guides/code-quality-metrics/missing-documentation.py
index a16dbe70c..519e30fa5 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/missing-documentation.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/missing-documentation.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/unnamed-kwargs.py b/tests/unit/skills/implementations/guides/code-quality-metrics/unnamed-kwargs.py
index a918c0ac7..0ced97936 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/unnamed-kwargs.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/unnamed-kwargs.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-attributes.py b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-attributes.py
index b728735bc..2edee0639 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-attributes.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-attributes.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.core.codebase import CodebaseType
 from codegen.sdk.core.placeholder.placeholder_type import TypePlaceholder
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-parameters.py b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-parameters.py
index b179f7599..40e06c63a 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-parameters.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-parameters.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-return-types.py b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-return-types.py
index 82b492792..47eb39837 100644
--- a/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-return-types.py
+++ b/tests/unit/skills/implementations/guides/code-quality-metrics/untyped-return-types.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.core.codebase import CodebaseType
 from codegen.sdk.core.placeholder.placeholder import Placeholder
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/codebase-ai.py b/tests/unit/skills/implementations/guides/codebase-ai.py
index 4140257bc..1cd0ff4e4 100644
--- a/tests/unit/skills/implementations/guides/codebase-ai.py
+++ b/tests/unit/skills/implementations/guides/codebase-ai.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/guides/complex-renaming.py b/tests/unit/skills/implementations/guides/complex-renaming.py
index b3694b2aa..f303742d5 100644
--- a/tests/unit/skills/implementations/guides/complex-renaming.py
+++ b/tests/unit/skills/implementations/guides/complex-renaming.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/creating-documentation.py b/tests/unit/skills/implementations/guides/creating-documentation.py
index c7fa4cf3e..39073e0db 100644
--- a/tests/unit/skills/implementations/guides/creating-documentation.py
+++ b/tests/unit/skills/implementations/guides/creating-documentation.py
@@ -2,7 +2,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/deleting-dead-code.py b/tests/unit/skills/implementations/guides/deleting-dead-code.py
index c6f7a99c4..0fe7cc348 100644
--- a/tests/unit/skills/implementations/guides/deleting-dead-code.py
+++ b/tests/unit/skills/implementations/guides/deleting-dead-code.py
@@ -2,7 +2,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/increase-type-coverage.py b/tests/unit/skills/implementations/guides/increase-type-coverage.py
index 52bf3a854..a84b09b74 100644
--- a/tests/unit/skills/implementations/guides/increase-type-coverage.py
+++ b/tests/unit/skills/implementations/guides/increase-type-coverage.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/manipulating-collections.py b/tests/unit/skills/implementations/guides/manipulating-collections.py
index d95c24bd7..96661efe0 100644
--- a/tests/unit/skills/implementations/guides/manipulating-collections.py
+++ b/tests/unit/skills/implementations/guides/manipulating-collections.py
@@ -2,7 +2,7 @@
 
 from codegen.sdk.core.codebase import CodebaseType
 from codegen.sdk.core.symbol_groups.list import List
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/guides/organize-your-codebase.py b/tests/unit/skills/implementations/guides/organize-your-codebase.py
index b78330b51..5827d2ca5 100644
--- a/tests/unit/skills/implementations/guides/organize-your-codebase.py
+++ b/tests/unit/skills/implementations/guides/organize-your-codebase.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import CodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/if_statement_skills.py b/tests/unit/skills/implementations/if_statement_skills.py
index aeb3b1991..c41d30d05 100644
--- a/tests/unit/skills/implementations/if_statement_skills.py
+++ b/tests/unit/skills/implementations/if_statement_skills.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 from codegen.sdk.core.codebase import PyCodebaseType, TSCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile, SkillTestCaseTSFile
diff --git a/tests/unit/skills/implementations/move_symbols_skills.py b/tests/unit/skills/implementations/move_symbols_skills.py
index a68b48eec..f76c1e4c8 100644
--- a/tests/unit/skills/implementations/move_symbols_skills.py
+++ b/tests/unit/skills/implementations/move_symbols_skills.py
@@ -1,5 +1,5 @@
 from codegen.sdk.core.codebase import CodebaseType, PyCodebaseType
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCasePyFile
diff --git a/tests/unit/skills/implementations/type_inheritance_skills.py b/tests/unit/skills/implementations/type_inheritance_skills.py
index e6c3f54df..df3f689e4 100644
--- a/tests/unit/skills/implementations/type_inheritance_skills.py
+++ b/tests/unit/skills/implementations/type_inheritance_skills.py
@@ -5,7 +5,7 @@
 from codegen.sdk.core.codebase import CodebaseType, PyCodebaseType, TSCodebaseType
 from codegen.sdk.core.function import Function
 from codegen.sdk.core.symbol_groups.dict import Dict
-from codegen.sdk.enums import ProgrammingLanguage
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 from tests.shared.skills.decorators import skill, skill_impl
 from tests.shared.skills.skill import Skill
 from tests.shared.skills.skill_test import SkillTestCase, SkillTestCaseTSFile