diff --git a/README.md b/README.md
index 2e46860..0cf7e37 100644
--- a/README.md
+++ b/README.md
@@ -415,7 +415,6 @@ These packages are automatically installed when you set up AniWorld Downloader u
   - [x] Fix mpv auto download on Windows 10
 
 ### Upcoming Tasks
-- [ ] Organize extractors by site
 - [ ] Syncplay support for other sites
 - [ ] Fix --only-direct-link language error
 - [ ] Sort argument help section
diff --git a/src/aniworld/common/adventure.py b/src/aniworld/common/adventure.py
index 7b6e4bf..42a5040 100644
--- a/src/aniworld/common/adventure.py
+++ b/src/aniworld/common/adventure.py
@@ -74,8 +74,6 @@ def display_ascii_art():
 
 
 def adventure():
-    from ollama import ResponseError
-
     try:
         import ollama
     except ModuleNotFoundError:
diff --git a/src/aniworld/extractors/__init__.py b/src/aniworld/extractors/__init__.py
index 6dc69c5..b095248 100644
--- a/src/aniworld/extractors/__init__.py
+++ b/src/aniworld/extractors/__init__.py
@@ -1,6 +1,4 @@
-from .doodstream import doodstream_get_direct_link
-from .streamtape import streamtape_get_direct_link
-from .vidoza import vidoza_get_direct_link
-from .voe import voe_get_direct_link
-
-from .streamkiste import streamkiste_get_direct_link
+from .aniworld.doodstream import doodstream_get_direct_link
+from .aniworld.streamtape import streamtape_get_direct_link
+from .aniworld.vidoza import vidoza_get_direct_link
+from .aniworld.voe import voe_get_direct_link
diff --git a/src/aniworld/extractors/doodstream.py b/src/aniworld/extractors/aniworld/doodstream.py
similarity index 100%
rename from src/aniworld/extractors/doodstream.py
rename to src/aniworld/extractors/aniworld/doodstream.py
diff --git a/src/aniworld/extractors/streamtape.py b/src/aniworld/extractors/aniworld/streamtape.py
similarity index 100%
rename from src/aniworld/extractors/streamtape.py
rename to src/aniworld/extractors/aniworld/streamtape.py
diff --git a/src/aniworld/extractors/vidoza.py b/src/aniworld/extractors/aniworld/vidoza.py
similarity index 100%
rename from src/aniworld/extractors/vidoza.py
rename to src/aniworld/extractors/aniworld/vidoza.py
diff --git a/src/aniworld/extractors/voe.py b/src/aniworld/extractors/aniworld/voe.py
similarity index 100%
rename from src/aniworld/extractors/voe.py
rename to src/aniworld/extractors/aniworld/voe.py
diff --git a/src/aniworld/extractors/nhentai.py b/src/aniworld/extractors/nhentai/nhentai.py
similarity index 100%
rename from src/aniworld/extractors/nhentai.py
rename to src/aniworld/extractors/nhentai/nhentai.py
diff --git a/src/aniworld/extractors/streamkiste.py b/src/aniworld/extractors/streamkistetv/streamkiste.py
similarity index 100%
rename from src/aniworld/extractors/streamkiste.py
rename to src/aniworld/extractors/streamkistetv/streamkiste.py