diff --git a/MANIFEST.in b/MANIFEST.in
index 74215c3..ec446fc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include README.md
-include LICENSE
\ No newline at end of file
+include LICENSE
+recursive-include src/openai_batch_sdk *.py
\ No newline at end of file
diff --git a/src/__init__.py b/src/__init__.py
index fdb9666..a89ef07 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,5 +1,5 @@
 from .advanced_batch_processor import init_monitoring
-from .event_handler import EventHandler
+from .openai_batch_sdk.event_handler import EventHandler
 from .notifier import send_notification
 from .result_handler import retrieve_batch_results
 
diff --git a/src/advanced_batch_processor.py b/src/advanced_batch_processor.py
index 44db29d..6ce6a4a 100644
--- a/src/advanced_batch_processor.py
+++ b/src/advanced_batch_processor.py
@@ -14,14 +14,14 @@
                                           retrieve_batch_result,
                                           retrieve_batches_results,
                                           submit_batch_job)
-from event_handler import EventHandler
+from src.openai_batch_sdk.event_handler import EventHandler
 from gpt_conversation_handler import Role, create_message
 from jsonl_handler import create_json_line, write_jsonl_file
 from utils.env import load_environment
 from utils.logging import logger, setup_logging
 from utils.project import get_project_root
 
-from .core_batch_processor import (check_batches_results, gen_submit_batch_job,
+from .openai_batch_sdk.core import (check_batches_results, gen_submit_batch_job,
                                    init_monitoring,
                                    retrieve_batches_results_handler)
 
diff --git a/src/main_l1.py b/src/main_l1.py
index ad01b4d..d34ca67 100644
--- a/src/main_l1.py
+++ b/src/main_l1.py
@@ -16,7 +16,7 @@
 import time
 from datetime import datetime
 
-from event_handler import EventHandler
+from src.openai_batch_sdk.event_handler import EventHandler
 from utils.env import load_environment
 from utils.logging import logger, setup_logging
 from utils.project import get_project_root
@@ -24,7 +24,7 @@
 from jsonl_handler import create_json_line, write_jsonl_file
 from gpt_conversation_handler import Role, create_message
 
-from core_batch_processor import (init_monitoring, retrieve_batches_results_handler, retrieve_batches_results, graceful_shutdown)
+from src.openai_batch_sdk.core import (init_monitoring, retrieve_batches_results_handler, retrieve_batches_results, graceful_shutdown)
 
 async def shutdown(signal, loop, executor):
     print(f"\nReceived exit signal {signal.name}...")
diff --git a/src/main_l2.py b/src/main_l2.py
index 2d1ea0f..0bf68f0 100644
--- a/src/main_l2.py
+++ b/src/main_l2.py
@@ -19,7 +19,7 @@
 from deps.oai.batch_api.batch_api import (check_batch_status,
                                              retrieve_batch_result,
                                              submit_batch_job)
-from event_handler import EventHandler
+from src.openai_batch_sdk.event_handler import EventHandler
 from utils.env import load_environment
 from utils.logging import logger, setup_logging
 from utils.project import get_project_root
diff --git a/src/openai_batch_sdk/__init__.py b/src/openai_batch_sdk/__init__.py
new file mode 100644
index 0000000..f05ce50
--- /dev/null
+++ b/src/openai_batch_sdk/__init__.py
@@ -0,0 +1,4 @@
+from .core import init_monitoring, graceful_shutdown, retrieve_batches_results_handler, retrieve_batches_results
+from event_handler import EventHandler
+
+__all__ = ["init_monitoring", "EventHandler", "graceful_shutdown", "retrieve_batches_results_handler", "retrieve_batches_results"]
diff --git a/src/core_batch_processor.py b/src/openai_batch_sdk/core.py
similarity index 100%
rename from src/core_batch_processor.py
rename to src/openai_batch_sdk/core.py
diff --git a/src/event_handler.py b/src/openai_batch_sdk/event_handler.py
similarity index 100%
rename from src/event_handler.py
rename to src/openai_batch_sdk/event_handler.py
diff --git a/tests/test_batch_processor.py b/tests/test_batch_processor.py
index 904e8bb..b198ca2 100644
--- a/tests/test_batch_processor.py
+++ b/tests/test_batch_processor.py
@@ -8,7 +8,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../src')))
 
 from src.advanced_batch_processor import init_monitoring
-from src.event_handler import EventHandler
+from src.openai_batch_sdk.event_handler import EventHandler
 
 
 class TestBatchProcessor(unittest.TestCase):