diff --git a/src/book_solver.py b/src/book_solver.py
index 26b61c2..d6baaf1 100644
--- a/src/book_solver.py
+++ b/src/book_solver.py
@@ -13,8 +13,8 @@ import os
 import pathlib
 from abc import abstractmethod, ABCMeta
 
-from livecarta_config import LiveCartaConfig
-from util.helpers import BookLogger, BookStatusWrapper
+from src.livecarta_config import LiveCartaConfig
+from src.util.helpers import BookLogger, BookStatusWrapper
 
 
 class BookSolver:
diff --git a/src/consumer.py b/src/consumer.py
index 240b832..99ea3c8 100644
--- a/src/consumer.py
+++ b/src/consumer.py
@@ -10,8 +10,8 @@ from threading import Event
 import pika
 
 from access import Access
-from docx_solver import DocxBook
-from epub_solver import EpubBook
+from src.docx_converter.docx_solver import DocxBook
+from src.epub_converter.epub_solver import EpubBook
 
 
 def configure_file_logger(name, filename='logs/converter_log.log', filemode='w+',
diff --git a/src/data_objects.py b/src/data_objects.py
index fd0f2e5..6e6cfab 100644
--- a/src/data_objects.py
+++ b/src/data_objects.py
@@ -2,7 +2,7 @@ import re
 from typing import Union
 
 from ebooklib.epub import Section, Link
-from livecarta_config import LiveCartaConfig
+from src.livecarta_config import LiveCartaConfig
 
 """
 These are data structures which form mapping from NCX to python data structures.
diff --git a/src/docx_solver.py b/src/docx_converter/docx_solver.py
similarity index 99%
rename from src/docx_solver.py
rename to src/docx_converter/docx_solver.py
index 5f3a13d..296dc4e 100644
--- a/src/docx_solver.py
+++ b/src/docx_converter/docx_solver.py
@@ -8,7 +8,8 @@ from threading import Event
 from bs4 import BeautifulSoup
 from html_docx_preprocessor import HTMLDocxPreprocessor
 from libra_html2json_converter import LibraHTML2JSONConverter
-from book_solver import BookSolver
+
+from src.book_solver import BookSolver
 
 
 class DocxBook(BookSolver):
diff --git a/src/html_docx_preprocessor.py b/src/docx_converter/html_docx_preprocessor.py
similarity index 99%
rename from src/html_docx_preprocessor.py
rename to src/docx_converter/html_docx_preprocessor.py
index 56d3a50..904a30d 100644
--- a/src/html_docx_preprocessor.py
+++ b/src/docx_converter/html_docx_preprocessor.py
@@ -7,8 +7,8 @@ from typing import List
 
 from bs4 import BeautifulSoup, NavigableString, Tag
 
-from livecarta_config import LiveCartaConfig
-from util.helpers import BookLogger, BookStatusWrapper
+from src.livecarta_config import LiveCartaConfig
+from src.util.helpers import BookLogger, BookStatusWrapper
 
 
 class HTMLDocxPreprocessor:
diff --git a/src/libra_html2json_converter.py b/src/docx_converter/libra_html2json_converter.py
similarity index 99%
rename from src/libra_html2json_converter.py
rename to src/docx_converter/libra_html2json_converter.py
index 9a39b93..91747eb 100644
--- a/src/libra_html2json_converter.py
+++ b/src/docx_converter/libra_html2json_converter.py
@@ -2,7 +2,7 @@ import logging
 import re
 from copy import copy
 
-from livecarta_config import LiveCartaConfig
+from src.livecarta_config import LiveCartaConfig
 
 
 class LibraHTML2JSONConverter: