diff --git a/toolchain/__init__.py b/llama_toolchain/__init__.py
similarity index 100%
rename from toolchain/__init__.py
rename to llama_toolchain/__init__.py
diff --git a/toolchain/cli/__init__.py b/llama_toolchain/cli/__init__.py
similarity index 100%
rename from toolchain/cli/__init__.py
rename to llama_toolchain/cli/__init__.py
diff --git a/toolchain/cli/download.py b/llama_toolchain/cli/download.py
similarity index 97%
rename from toolchain/cli/download.py
rename to llama_toolchain/cli/download.py
index ab8e96b7f..ba5262c59 100644
--- a/toolchain/cli/download.py
+++ b/llama_toolchain/cli/download.py
@@ -6,8 +6,8 @@ from pathlib import Path
 from huggingface_hub import snapshot_download
 from huggingface_hub.utils import GatedRepoError, RepositoryNotFoundError
 
-from toolchain.cli.subcommand import Subcommand
-from toolchain.utils import DEFAULT_DUMP_DIR
+from llama_toolchain.cli.subcommand import Subcommand
+from llama_toolchain.utils import DEFAULT_DUMP_DIR
 
 
 DEFAULT_CHECKPOINT_DIR = os.path.join(DEFAULT_DUMP_DIR, "checkpoints")
diff --git a/toolchain/cli/inference/configure.py b/llama_toolchain/cli/inference/configure.py
similarity index 96%
rename from toolchain/cli/inference/configure.py
rename to llama_toolchain/cli/inference/configure.py
index c802bd8f8..33e3c658a 100644
--- a/toolchain/cli/inference/configure.py
+++ b/llama_toolchain/cli/inference/configure.py
@@ -4,8 +4,8 @@ import textwrap
 
 from pathlib import Path
 
-from toolchain.cli.subcommand import Subcommand
-from toolchain.utils import DEFAULT_DUMP_DIR
+from llama_toolchain.cli.subcommand import Subcommand
+from llama_toolchain.utils import DEFAULT_DUMP_DIR
 
 
 CONFIGS_BASE_DIR = os.path.join(DEFAULT_DUMP_DIR, "configs")
diff --git a/toolchain/cli/inference/default_configuration.yaml b/llama_toolchain/cli/inference/default_configuration.yaml
similarity index 100%
rename from toolchain/cli/inference/default_configuration.yaml
rename to llama_toolchain/cli/inference/default_configuration.yaml
diff --git a/toolchain/cli/inference/inference.py b/llama_toolchain/cli/inference/inference.py
similarity index 79%
rename from toolchain/cli/inference/inference.py
rename to llama_toolchain/cli/inference/inference.py
index b3713b4af..b83cd5da8 100644
--- a/toolchain/cli/inference/inference.py
+++ b/llama_toolchain/cli/inference/inference.py
@@ -1,9 +1,9 @@
 import argparse
 import textwrap
 
-from toolchain.cli.inference.configure import InferenceConfigure
-from toolchain.cli.inference.start import InferenceStart
-from toolchain.cli.subcommand import Subcommand
+from llama_toolchain.cli.inference.configure import InferenceConfigure
+from llama_toolchain.cli.inference.start import InferenceStart
+from llama_toolchain.cli.subcommand import Subcommand
 
 
 class InferenceParser(Subcommand):
diff --git a/toolchain/cli/inference/start.py b/llama_toolchain/cli/inference/start.py
similarity index 92%
rename from toolchain/cli/inference/start.py
rename to llama_toolchain/cli/inference/start.py
index c105d4198..f14d4b7be 100644
--- a/toolchain/cli/inference/start.py
+++ b/llama_toolchain/cli/inference/start.py
@@ -1,9 +1,9 @@
 import argparse
 import textwrap
 
-from toolchain.cli.subcommand import Subcommand
+from llama_toolchain.cli.subcommand import Subcommand
 
-from toolchain.inference.server import main as inference_server_init
+from llama_toolchain.inference.server import main as inference_server_init
 
 
 class InferenceStart(Subcommand):
diff --git a/toolchain/cli/llama.py b/llama_toolchain/cli/llama.py
similarity index 91%
rename from toolchain/cli/llama.py
rename to llama_toolchain/cli/llama.py
index 65363d659..ff3df1c05 100644
--- a/toolchain/cli/llama.py
+++ b/llama_toolchain/cli/llama.py
@@ -1,7 +1,7 @@
 import argparse
 
-from toolchain.cli.download import Download
-from toolchain.cli.inference.inference import InferenceParser
+from llama_toolchain.cli.download import Download
+from llama_toolchain.cli.inference.inference import InferenceParser
 
 
 class LlamaCLIParser:
diff --git a/toolchain/cli/subcommand.py b/llama_toolchain/cli/subcommand.py
similarity index 100%
rename from toolchain/cli/subcommand.py
rename to llama_toolchain/cli/subcommand.py
diff --git a/toolchain/common/deployment_types.py b/llama_toolchain/common/deployment_types.py
similarity index 100%
rename from toolchain/common/deployment_types.py
rename to llama_toolchain/common/deployment_types.py
diff --git a/toolchain/common/training_types.py b/llama_toolchain/common/training_types.py
similarity index 100%
rename from toolchain/common/training_types.py
rename to llama_toolchain/common/training_types.py
diff --git a/toolchain/configs/ashwin.yaml b/llama_toolchain/configs/ashwin.yaml
similarity index 100%
rename from toolchain/configs/ashwin.yaml
rename to llama_toolchain/configs/ashwin.yaml
diff --git a/toolchain/configs/chrisluc.yaml b/llama_toolchain/configs/chrisluc.yaml
similarity index 100%
rename from toolchain/configs/chrisluc.yaml
rename to llama_toolchain/configs/chrisluc.yaml
diff --git a/toolchain/configs/cyni.yaml b/llama_toolchain/configs/cyni.yaml
similarity index 100%
rename from toolchain/configs/cyni.yaml
rename to llama_toolchain/configs/cyni.yaml
diff --git a/toolchain/configs/default.yaml b/llama_toolchain/configs/default.yaml
similarity index 100%
rename from toolchain/configs/default.yaml
rename to llama_toolchain/configs/default.yaml
diff --git a/toolchain/configs/hjshah.yaml b/llama_toolchain/configs/hjshah.yaml
similarity index 100%
rename from toolchain/configs/hjshah.yaml
rename to llama_toolchain/configs/hjshah.yaml
diff --git a/toolchain/configs/long_seqlen.yaml b/llama_toolchain/configs/long_seqlen.yaml
similarity index 100%
rename from toolchain/configs/long_seqlen.yaml
rename to llama_toolchain/configs/long_seqlen.yaml
diff --git a/toolchain/dataset/api/__init__.py b/llama_toolchain/dataset/api/__init__.py
similarity index 100%
rename from toolchain/dataset/api/__init__.py
rename to llama_toolchain/dataset/api/__init__.py
diff --git a/toolchain/dataset/api/datatypes.py b/llama_toolchain/dataset/api/datatypes.py
similarity index 100%
rename from toolchain/dataset/api/datatypes.py
rename to llama_toolchain/dataset/api/datatypes.py
diff --git a/toolchain/dataset/api/endpoints.py b/llama_toolchain/dataset/api/endpoints.py
similarity index 100%
rename from toolchain/dataset/api/endpoints.py
rename to llama_toolchain/dataset/api/endpoints.py
diff --git a/toolchain/evaluations/api/__init__.py b/llama_toolchain/evaluations/api/__init__.py
similarity index 100%
rename from toolchain/evaluations/api/__init__.py
rename to llama_toolchain/evaluations/api/__init__.py
diff --git a/toolchain/evaluations/api/datatypes.py b/llama_toolchain/evaluations/api/datatypes.py
similarity index 100%
rename from toolchain/evaluations/api/datatypes.py
rename to llama_toolchain/evaluations/api/datatypes.py
diff --git a/toolchain/evaluations/api/endpoints.py b/llama_toolchain/evaluations/api/endpoints.py
similarity index 94%
rename from toolchain/evaluations/api/endpoints.py
rename to llama_toolchain/evaluations/api/endpoints.py
index bf3012635..b9b592313 100644
--- a/toolchain/evaluations/api/endpoints.py
+++ b/llama_toolchain/evaluations/api/endpoints.py
@@ -6,8 +6,8 @@ from pyopenapi import webmethod
 
 from llama_models.llama3_1.api.datatypes import *  # noqa: F403
 from .datatypes import *  # noqa: F403
-from toolchain.dataset.api.datatypes import *  # noqa: F403
-from toolchain.common.training_types import *  # noqa: F403
+from llama_toolchain.dataset.api.datatypes import *  # noqa: F403
+from llama_toolchain.common.training_types import *  # noqa: F403
 
 
 class EvaluateTaskRequestCommon(BaseModel):
diff --git a/toolchain/inference/__init__.py b/llama_toolchain/inference/__init__.py
similarity index 100%
rename from toolchain/inference/__init__.py
rename to llama_toolchain/inference/__init__.py
diff --git a/toolchain/inference/api/__init__.py b/llama_toolchain/inference/api/__init__.py
similarity index 100%
rename from toolchain/inference/api/__init__.py
rename to llama_toolchain/inference/api/__init__.py
diff --git a/toolchain/inference/api/config.py b/llama_toolchain/inference/api/config.py
similarity index 100%
rename from toolchain/inference/api/config.py
rename to llama_toolchain/inference/api/config.py
diff --git a/toolchain/inference/api/datatypes.py b/llama_toolchain/inference/api/datatypes.py
similarity index 100%
rename from toolchain/inference/api/datatypes.py
rename to llama_toolchain/inference/api/datatypes.py
diff --git a/toolchain/inference/api/endpoints.py b/llama_toolchain/inference/api/endpoints.py
similarity index 100%
rename from toolchain/inference/api/endpoints.py
rename to llama_toolchain/inference/api/endpoints.py
diff --git a/toolchain/inference/api_instance.py b/llama_toolchain/inference/api_instance.py
similarity index 100%
rename from toolchain/inference/api_instance.py
rename to llama_toolchain/inference/api_instance.py
diff --git a/toolchain/inference/client.py b/llama_toolchain/inference/client.py
similarity index 100%
rename from toolchain/inference/client.py
rename to llama_toolchain/inference/client.py
diff --git a/toolchain/inference/generation.py b/llama_toolchain/inference/generation.py
similarity index 100%
rename from toolchain/inference/generation.py
rename to llama_toolchain/inference/generation.py
diff --git a/toolchain/inference/inference.py b/llama_toolchain/inference/inference.py
similarity index 100%
rename from toolchain/inference/inference.py
rename to llama_toolchain/inference/inference.py
diff --git a/toolchain/inference/model_parallel.py b/llama_toolchain/inference/model_parallel.py
similarity index 100%
rename from toolchain/inference/model_parallel.py
rename to llama_toolchain/inference/model_parallel.py
diff --git a/toolchain/inference/parallel_utils.py b/llama_toolchain/inference/parallel_utils.py
similarity index 100%
rename from toolchain/inference/parallel_utils.py
rename to llama_toolchain/inference/parallel_utils.py
diff --git a/toolchain/inference/quantization/fp8_impls.py b/llama_toolchain/inference/quantization/fp8_impls.py
similarity index 100%
rename from toolchain/inference/quantization/fp8_impls.py
rename to llama_toolchain/inference/quantization/fp8_impls.py
diff --git a/toolchain/inference/quantization/loader.py b/llama_toolchain/inference/quantization/loader.py
similarity index 96%
rename from toolchain/inference/quantization/loader.py
rename to llama_toolchain/inference/quantization/loader.py
index d6d9fc89f..f1eccf79e 100644
--- a/toolchain/inference/quantization/loader.py
+++ b/llama_toolchain/inference/quantization/loader.py
@@ -11,11 +11,11 @@ from llama_models.llama3_1.api.model import Transformer, TransformerBlock
 
 from termcolor import cprint
 
-from toolchain.inference.api.config import (
+from llama_toolchain.inference.api.config import (
     CheckpointQuantizationFormat,
     InlineImplConfig,
 )
-from toolchain.inference.api.datatypes import QuantizationType
+from llama_toolchain.inference.api.datatypes import QuantizationType
 from torch import Tensor
 
 
diff --git a/toolchain/inference/quantization/scripts/build_conda.sh b/llama_toolchain/inference/quantization/scripts/build_conda.sh
similarity index 100%
rename from toolchain/inference/quantization/scripts/build_conda.sh
rename to llama_toolchain/inference/quantization/scripts/build_conda.sh
diff --git a/toolchain/inference/quantization/scripts/quantize_checkpoint.py b/llama_toolchain/inference/quantization/scripts/quantize_checkpoint.py
similarity index 100%
rename from toolchain/inference/quantization/scripts/quantize_checkpoint.py
rename to llama_toolchain/inference/quantization/scripts/quantize_checkpoint.py
diff --git a/toolchain/inference/quantization/scripts/run_quantize_checkpoint.sh b/llama_toolchain/inference/quantization/scripts/run_quantize_checkpoint.sh
similarity index 100%
rename from toolchain/inference/quantization/scripts/run_quantize_checkpoint.sh
rename to llama_toolchain/inference/quantization/scripts/run_quantize_checkpoint.sh
diff --git a/toolchain/inference/quantization/test_fp8.py b/llama_toolchain/inference/quantization/test_fp8.py
similarity index 100%
rename from toolchain/inference/quantization/test_fp8.py
rename to llama_toolchain/inference/quantization/test_fp8.py
diff --git a/toolchain/inference/server.py b/llama_toolchain/inference/server.py
similarity index 97%
rename from toolchain/inference/server.py
rename to llama_toolchain/inference/server.py
index 01a905b2a..fcef995f1 100644
--- a/toolchain/inference/server.py
+++ b/llama_toolchain/inference/server.py
@@ -10,7 +10,7 @@ from fastapi.responses import StreamingResponse
 
 from omegaconf import OmegaConf
 
-from toolchain.utils import get_default_config_dir, parse_config
+from llama_toolchain.utils import get_default_config_dir, parse_config
 from .api.config import InferenceHydraConfig
 from .api.endpoints import ChatCompletionRequest, ChatCompletionResponseStreamChunk
 
diff --git a/toolchain/memory/api/__init__.py b/llama_toolchain/memory/api/__init__.py
similarity index 100%
rename from toolchain/memory/api/__init__.py
rename to llama_toolchain/memory/api/__init__.py
diff --git a/toolchain/memory/api/datatypes.py b/llama_toolchain/memory/api/datatypes.py
similarity index 100%
rename from toolchain/memory/api/datatypes.py
rename to llama_toolchain/memory/api/datatypes.py
diff --git a/toolchain/memory/api/endpoints.py b/llama_toolchain/memory/api/endpoints.py
similarity index 100%
rename from toolchain/memory/api/endpoints.py
rename to llama_toolchain/memory/api/endpoints.py
diff --git a/toolchain/post_training/api/__init__.py b/llama_toolchain/post_training/api/__init__.py
similarity index 100%
rename from toolchain/post_training/api/__init__.py
rename to llama_toolchain/post_training/api/__init__.py
diff --git a/toolchain/post_training/api/datatypes.py b/llama_toolchain/post_training/api/datatypes.py
similarity index 100%
rename from toolchain/post_training/api/datatypes.py
rename to llama_toolchain/post_training/api/datatypes.py
diff --git a/toolchain/post_training/api/endpoints.py b/llama_toolchain/post_training/api/endpoints.py
similarity index 95%
rename from toolchain/post_training/api/endpoints.py
rename to llama_toolchain/post_training/api/endpoints.py
index 443a8027f..3ec17e01f 100644
--- a/toolchain/post_training/api/endpoints.py
+++ b/llama_toolchain/post_training/api/endpoints.py
@@ -8,8 +8,8 @@ from pyopenapi import webmethod
 from strong_typing.schema import json_schema_type
 
 from llama_models.llama3_1.api.datatypes import *  # noqa: F403
-from toolchain.dataset.api.datatypes import *  # noqa: F403
-from toolchain.common.training_types import *  # noqa: F403
+from llama_toolchain.dataset.api.datatypes import *  # noqa: F403
+from llama_toolchain.common.training_types import *  # noqa: F403
 from .datatypes import *  # noqa: F403
 
 
diff --git a/toolchain/reward_scoring/api/__init__.py b/llama_toolchain/reward_scoring/api/__init__.py
similarity index 100%
rename from toolchain/reward_scoring/api/__init__.py
rename to llama_toolchain/reward_scoring/api/__init__.py
diff --git a/toolchain/reward_scoring/api/datatypes.py b/llama_toolchain/reward_scoring/api/datatypes.py
similarity index 100%
rename from toolchain/reward_scoring/api/datatypes.py
rename to llama_toolchain/reward_scoring/api/datatypes.py
diff --git a/toolchain/reward_scoring/api/endpoints.py b/llama_toolchain/reward_scoring/api/endpoints.py
similarity index 100%
rename from toolchain/reward_scoring/api/endpoints.py
rename to llama_toolchain/reward_scoring/api/endpoints.py
diff --git a/toolchain/safety/__init__.py b/llama_toolchain/safety/__init__.py
similarity index 100%
rename from toolchain/safety/__init__.py
rename to llama_toolchain/safety/__init__.py
diff --git a/toolchain/safety/api/__init__.py b/llama_toolchain/safety/api/__init__.py
similarity index 100%
rename from toolchain/safety/api/__init__.py
rename to llama_toolchain/safety/api/__init__.py
diff --git a/toolchain/safety/api/config.py b/llama_toolchain/safety/api/config.py
similarity index 100%
rename from toolchain/safety/api/config.py
rename to llama_toolchain/safety/api/config.py
diff --git a/toolchain/safety/api/datatypes.py b/llama_toolchain/safety/api/datatypes.py
similarity index 94%
rename from toolchain/safety/api/datatypes.py
rename to llama_toolchain/safety/api/datatypes.py
index fcb665aa3..27c52337c 100644
--- a/toolchain/safety/api/datatypes.py
+++ b/llama_toolchain/safety/api/datatypes.py
@@ -7,7 +7,7 @@ from pydantic import BaseModel
 
 from strong_typing.schema import json_schema_type
 
-from toolchain.common.deployment_types import RestAPIExecutionConfig
+from llama_toolchain.common.deployment_types import RestAPIExecutionConfig
 
 
 @json_schema_type
diff --git a/toolchain/safety/shields/__init__.py b/llama_toolchain/safety/shields/__init__.py
similarity index 100%
rename from toolchain/safety/shields/__init__.py
rename to llama_toolchain/safety/shields/__init__.py
diff --git a/toolchain/safety/shields/base.py b/llama_toolchain/safety/shields/base.py
similarity index 96%
rename from toolchain/safety/shields/base.py
rename to llama_toolchain/safety/shields/base.py
index 33b5ba94c..f3fb49bc7 100644
--- a/toolchain/safety/shields/base.py
+++ b/llama_toolchain/safety/shields/base.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import List, Union
 
 from llama_models.llama3_1.api.datatypes import Attachment, Message
-from toolchain.safety.api.datatypes import *  # noqa: F403
+from llama_toolchain.safety.api.datatypes import *  # noqa: F403
 
 CANNED_RESPONSE_TEXT = "I can't answer that. Can I help with something else?"
 
diff --git a/toolchain/safety/shields/code_scanner.py b/llama_toolchain/safety/shields/code_scanner.py
similarity index 93%
rename from toolchain/safety/shields/code_scanner.py
rename to llama_toolchain/safety/shields/code_scanner.py
index aa877da68..8e220b017 100644
--- a/toolchain/safety/shields/code_scanner.py
+++ b/llama_toolchain/safety/shields/code_scanner.py
@@ -2,7 +2,7 @@ from codeshield.cs import CodeShield
 from termcolor import cprint
 
 from .base import ShieldResponse, TextShield
-from toolchain.safety.api.datatypes import *  # noqa: F403
+from llama_toolchain.safety.api.datatypes import *  # noqa: F403
 
 
 class CodeScannerShield(TextShield):
diff --git a/toolchain/safety/shields/contrib/__init__.py b/llama_toolchain/safety/shields/contrib/__init__.py
similarity index 100%
rename from toolchain/safety/shields/contrib/__init__.py
rename to llama_toolchain/safety/shields/contrib/__init__.py
diff --git a/toolchain/safety/shields/contrib/third_party_shield.py b/llama_toolchain/safety/shields/contrib/third_party_shield.py
similarity index 88%
rename from toolchain/safety/shields/contrib/third_party_shield.py
rename to llama_toolchain/safety/shields/contrib/third_party_shield.py
index 48e7414c5..29e65dce8 100644
--- a/toolchain/safety/shields/contrib/third_party_shield.py
+++ b/llama_toolchain/safety/shields/contrib/third_party_shield.py
@@ -5,7 +5,7 @@ from llama_models.llama3_1.api.datatypes import Message
 
 parent_dir = "../.."
 sys.path.append(parent_dir)
-from toolchain.safety.shields.base import OnViolationAction, ShieldBase, ShieldResponse
+from llama_toolchain.safety.shields.base import OnViolationAction, ShieldBase, ShieldResponse
 
 _INSTANCE = None
 
diff --git a/toolchain/safety/shields/llama_guard.py b/llama_toolchain/safety/shields/llama_guard.py
similarity index 99%
rename from toolchain/safety/shields/llama_guard.py
rename to llama_toolchain/safety/shields/llama_guard.py
index 8a6866601..94be0e06c 100644
--- a/toolchain/safety/shields/llama_guard.py
+++ b/llama_toolchain/safety/shields/llama_guard.py
@@ -9,7 +9,7 @@ from termcolor import cprint
 from transformers import AutoModelForCausalLM, AutoTokenizer
 
 from .base import CANNED_RESPONSE_TEXT, OnViolationAction, ShieldBase, ShieldResponse
-from toolchain.safety.api.datatypes import *  # noqa: F403
+from llama_toolchain.safety.api.datatypes import *  # noqa: F403
 
 SAFE_RESPONSE = "safe"
 _INSTANCE = None
diff --git a/toolchain/safety/shields/prompt_guard.py b/llama_toolchain/safety/shields/prompt_guard.py
similarity index 98%
rename from toolchain/safety/shields/prompt_guard.py
rename to llama_toolchain/safety/shields/prompt_guard.py
index ddb539688..ff720da89 100644
--- a/toolchain/safety/shields/prompt_guard.py
+++ b/llama_toolchain/safety/shields/prompt_guard.py
@@ -8,7 +8,7 @@ from termcolor import cprint
 from transformers import AutoModelForSequenceClassification, AutoTokenizer
 
 from .base import message_content_as_str, OnViolationAction, ShieldResponse, TextShield
-from toolchain.safety.api.datatypes import *  # noqa: F403
+from llama_toolchain.safety.api.datatypes import *  # noqa: F403
 
 
 class PromptGuardShield(TextShield):
diff --git a/toolchain/safety/shields/shield_runner.py b/llama_toolchain/safety/shields/shield_runner.py
similarity index 100%
rename from toolchain/safety/shields/shield_runner.py
rename to llama_toolchain/safety/shields/shield_runner.py
diff --git a/toolchain/spec/generate.py b/llama_toolchain/spec/generate.py
similarity index 76%
rename from toolchain/spec/generate.py
rename to llama_toolchain/spec/generate.py
index 6d5952038..5f7095017 100644
--- a/toolchain/spec/generate.py
+++ b/llama_toolchain/spec/generate.py
@@ -5,13 +5,13 @@ import yaml
 from pyopenapi import Info, Options, Server, Specification
 
 from llama_models.llama3_1.api.datatypes import *  # noqa: F403
-from toolchain.dataset.api import *  # noqa: F403
-from toolchain.evaluations.api import *  # noqa: F403
-from toolchain.inference.api import *  # noqa: F403
-from toolchain.memory.api import *  # noqa: F403
-from toolchain.post_training.api import *  # noqa: F403
-from toolchain.reward_scoring.api import *  # noqa: F403
-from toolchain.synthetic_data_generation.api import *  # noqa: F403
+from llama_toolchain.dataset.api import *  # noqa: F403
+from llama_toolchain.evaluations.api import *  # noqa: F403
+from llama_toolchain.inference.api import *  # noqa: F403
+from llama_toolchain.memory.api import *  # noqa: F403
+from llama_toolchain.post_training.api import *  # noqa: F403
+from llama_toolchain.reward_scoring.api import *  # noqa: F403
+from llama_toolchain.synthetic_data_generation.api import *  # noqa: F403
 from agentic_system.api import *  # noqa: F403
 
 
diff --git a/toolchain/spec/openapi.html b/llama_toolchain/spec/openapi.html
similarity index 100%
rename from toolchain/spec/openapi.html
rename to llama_toolchain/spec/openapi.html
diff --git a/toolchain/spec/openapi.yaml b/llama_toolchain/spec/openapi.yaml
similarity index 100%
rename from toolchain/spec/openapi.yaml
rename to llama_toolchain/spec/openapi.yaml
diff --git a/toolchain/spec/package.sh b/llama_toolchain/spec/package.sh
similarity index 100%
rename from toolchain/spec/package.sh
rename to llama_toolchain/spec/package.sh
diff --git a/toolchain/spec/post_training_types.py b/llama_toolchain/spec/post_training_types.py
similarity index 100%
rename from toolchain/spec/post_training_types.py
rename to llama_toolchain/spec/post_training_types.py
diff --git a/toolchain/spec/run_openapi_generator.sh b/llama_toolchain/spec/run_openapi_generator.sh
similarity index 100%
rename from toolchain/spec/run_openapi_generator.sh
rename to llama_toolchain/spec/run_openapi_generator.sh
diff --git a/toolchain/synthetic_data_generation/api/__init__.py b/llama_toolchain/synthetic_data_generation/api/__init__.py
similarity index 100%
rename from toolchain/synthetic_data_generation/api/__init__.py
rename to llama_toolchain/synthetic_data_generation/api/__init__.py
diff --git a/toolchain/synthetic_data_generation/api/datatypes.py b/llama_toolchain/synthetic_data_generation/api/datatypes.py
similarity index 100%
rename from toolchain/synthetic_data_generation/api/datatypes.py
rename to llama_toolchain/synthetic_data_generation/api/datatypes.py
diff --git a/toolchain/synthetic_data_generation/api/endpoints.py b/llama_toolchain/synthetic_data_generation/api/endpoints.py
similarity index 93%
rename from toolchain/synthetic_data_generation/api/endpoints.py
rename to llama_toolchain/synthetic_data_generation/api/endpoints.py
index 9c3c5cccc..1fbec024a 100644
--- a/toolchain/synthetic_data_generation/api/endpoints.py
+++ b/llama_toolchain/synthetic_data_generation/api/endpoints.py
@@ -6,7 +6,7 @@ from pyopenapi import webmethod
 from strong_typing.schema import json_schema_type
 
 from llama_models.llama3_1.api.datatypes import *  # noqa: F403
-from toolchain.reward_scoring.api.datatypes import *  # noqa: F403
+from llama_toolchain.reward_scoring.api.datatypes import *  # noqa: F403
 from .datatypes import *  # noqa: F403
 
 
diff --git a/toolchain/utils.py b/llama_toolchain/utils.py
similarity index 100%
rename from toolchain/utils.py
rename to llama_toolchain/utils.py
diff --git a/setup.py b/setup.py
index 3efa16af7..a2fdd040f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
 # Function to read the requirements.txt file
@@ -16,15 +16,14 @@ setup(
     description="Llama toolchain",
     entry_points={
         "console_scripts": [
-            'llama = toolchain.cli.llama:main'
+            'llama = llama_toolchain.cli.llama:main'
         ]
     },
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     url="https://github.com/meta-llama/llama-toolchain",
-    package_dir={ "llama_toolchain": "toolchain"},
-    classifiers=[
-    ],
+    packages=find_packages(),
+    classifiers=[],
     python_requires=">=3.10",
     install_requires=read_requirements(),
     include_package_data=True