diff --git a/fleabay/extractors/__init__.py b/fleabay/extractors/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/fleabay/api_extractor.py b/fleabay/extractors/ebay_api_extractor.py
similarity index 100%
rename from fleabay/api_extractor.py
rename to fleabay/extractors/ebay_api_extractor.py
diff --git a/fleabay/extractor.py b/fleabay/extractors/ebay_raw_extractor.py
similarity index 100%
rename from fleabay/extractor.py
rename to fleabay/extractors/ebay_raw_extractor.py
diff --git a/fleabay/webapp.py b/fleabay/webapp.py
index 5c06142..447ba90 100644
--- a/fleabay/webapp.py
+++ b/fleabay/webapp.py
@@ -1,17 +1,14 @@
 import asyncio
 import os
 from concurrent.futures.thread import ThreadPoolExecutor
-from pprint import pprint
 from typing import Dict, Any, Tuple
 
-import quart
 from quart import Quart, render_template, request
 from wtforms_async import Form, StringField, BooleanField, SelectField
-from wtforms_async.widgets import CheckboxInput
 
-from fleabay.api_extractor import EbayApiExtractor
-from fleabay.definitions import EbayItemSummary, EbayItemDetails
-from fleabay.extractor import EbayExtractor
+from fleabay.extractors.ebay_api_extractor import EbayApiExtractor
+from fleabay.definitions import EbayItemDetails
+from fleabay.extractors.ebay_raw_extractor import EbayExtractor
 
 app = Quart(__name__)