diff --git a/src/you_get/__init__.py b/src/you_get/__init__.py
index ecca35d2..7cae2415 100644
--- a/src/you_get/__init__.py
+++ b/src/you_get/__init__.py
@@ -6,4 +6,5 @@ from .version import *
 # Easy import
 #from .cli_wrapper.converter import *
 #from .cli_wrapper.player import *
-from .downloader import *
+from .cli_wrapper import *
+from .extractor import *
diff --git a/src/you_get/downloader/__init__.py b/src/you_get/extractor/__init__.py
similarity index 100%
rename from src/you_get/downloader/__init__.py
rename to src/you_get/extractor/__init__.py
diff --git a/src/you_get/downloader/__main__.py b/src/you_get/extractor/__main__.py
similarity index 98%
rename from src/you_get/downloader/__main__.py
rename to src/you_get/extractor/__main__.py
index ed07f702..d5d88d04 100644
--- a/src/you_get/downloader/__main__.py
+++ b/src/you_get/extractor/__main__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 __all__ = ['main', 'any_download', 'any_download_playlist']
 
-from ..downloader import *
+from ..extractor import *
 from ..common import *
 
 def url_to_module(url):
diff --git a/src/you_get/downloader/acfun.py b/src/you_get/extractor/acfun.py
similarity index 100%
rename from src/you_get/downloader/acfun.py
rename to src/you_get/extractor/acfun.py
diff --git a/src/you_get/downloader/alive.py b/src/you_get/extractor/alive.py
similarity index 100%
rename from src/you_get/downloader/alive.py
rename to src/you_get/extractor/alive.py
diff --git a/src/you_get/downloader/baidu.py b/src/you_get/extractor/baidu.py
similarity index 100%
rename from src/you_get/downloader/baidu.py
rename to src/you_get/extractor/baidu.py
diff --git a/src/you_get/downloader/bilibili.py b/src/you_get/extractor/bilibili.py
similarity index 100%
rename from src/you_get/downloader/bilibili.py
rename to src/you_get/extractor/bilibili.py
diff --git a/src/you_get/downloader/blip.py b/src/you_get/extractor/blip.py
similarity index 100%
rename from src/you_get/downloader/blip.py
rename to src/you_get/extractor/blip.py
diff --git a/src/you_get/downloader/cntv.py b/src/you_get/extractor/cntv.py
similarity index 100%
rename from src/you_get/downloader/cntv.py
rename to src/you_get/extractor/cntv.py
diff --git a/src/you_get/downloader/coursera.py b/src/you_get/extractor/coursera.py
similarity index 100%
rename from src/you_get/downloader/coursera.py
rename to src/you_get/extractor/coursera.py
diff --git a/src/you_get/downloader/dailymotion.py b/src/you_get/extractor/dailymotion.py
similarity index 100%
rename from src/you_get/downloader/dailymotion.py
rename to src/you_get/extractor/dailymotion.py
diff --git a/src/you_get/downloader/douban.py b/src/you_get/extractor/douban.py
similarity index 100%
rename from src/you_get/downloader/douban.py
rename to src/you_get/extractor/douban.py
diff --git a/src/you_get/downloader/ehow.py b/src/you_get/extractor/ehow.py
similarity index 100%
rename from src/you_get/downloader/ehow.py
rename to src/you_get/extractor/ehow.py
diff --git a/src/you_get/downloader/facebook.py b/src/you_get/extractor/facebook.py
similarity index 100%
rename from src/you_get/downloader/facebook.py
rename to src/you_get/extractor/facebook.py
diff --git a/src/you_get/downloader/fivesing.py b/src/you_get/extractor/fivesing.py
similarity index 100%
rename from src/you_get/downloader/fivesing.py
rename to src/you_get/extractor/fivesing.py
diff --git a/src/you_get/downloader/freesound.py b/src/you_get/extractor/freesound.py
similarity index 100%
rename from src/you_get/downloader/freesound.py
rename to src/you_get/extractor/freesound.py
diff --git a/src/you_get/downloader/google.py b/src/you_get/extractor/google.py
similarity index 100%
rename from src/you_get/downloader/google.py
rename to src/you_get/extractor/google.py
diff --git a/src/you_get/downloader/ifeng.py b/src/you_get/extractor/ifeng.py
similarity index 100%
rename from src/you_get/downloader/ifeng.py
rename to src/you_get/extractor/ifeng.py
diff --git a/src/you_get/downloader/instagram.py b/src/you_get/extractor/instagram.py
similarity index 100%
rename from src/you_get/downloader/instagram.py
rename to src/you_get/extractor/instagram.py
diff --git a/src/you_get/downloader/iqiyi.py b/src/you_get/extractor/iqiyi.py
similarity index 100%
rename from src/you_get/downloader/iqiyi.py
rename to src/you_get/extractor/iqiyi.py
diff --git a/src/you_get/downloader/joy.py b/src/you_get/extractor/joy.py
similarity index 100%
rename from src/you_get/downloader/joy.py
rename to src/you_get/extractor/joy.py
diff --git a/src/you_get/downloader/khan.py b/src/you_get/extractor/khan.py
similarity index 100%
rename from src/you_get/downloader/khan.py
rename to src/you_get/extractor/khan.py
diff --git a/src/you_get/downloader/ku6.py b/src/you_get/extractor/ku6.py
similarity index 100%
rename from src/you_get/downloader/ku6.py
rename to src/you_get/extractor/ku6.py
diff --git a/src/you_get/downloader/miomio.py b/src/you_get/extractor/miomio.py
similarity index 100%
rename from src/you_get/downloader/miomio.py
rename to src/you_get/extractor/miomio.py
diff --git a/src/you_get/downloader/mixcloud.py b/src/you_get/extractor/mixcloud.py
similarity index 100%
rename from src/you_get/downloader/mixcloud.py
rename to src/you_get/extractor/mixcloud.py
diff --git a/src/you_get/downloader/netease.py b/src/you_get/extractor/netease.py
similarity index 100%
rename from src/you_get/downloader/netease.py
rename to src/you_get/extractor/netease.py
diff --git a/src/you_get/downloader/nicovideo.py b/src/you_get/extractor/nicovideo.py
similarity index 100%
rename from src/you_get/downloader/nicovideo.py
rename to src/you_get/extractor/nicovideo.py
diff --git a/src/you_get/downloader/pptv.py b/src/you_get/extractor/pptv.py
similarity index 100%
rename from src/you_get/downloader/pptv.py
rename to src/you_get/extractor/pptv.py
diff --git a/src/you_get/downloader/qq.py b/src/you_get/extractor/qq.py
similarity index 100%
rename from src/you_get/downloader/qq.py
rename to src/you_get/extractor/qq.py
diff --git a/src/you_get/downloader/sina.py b/src/you_get/extractor/sina.py
similarity index 100%
rename from src/you_get/downloader/sina.py
rename to src/you_get/extractor/sina.py
diff --git a/src/you_get/downloader/sohu.py b/src/you_get/extractor/sohu.py
similarity index 100%
rename from src/you_get/downloader/sohu.py
rename to src/you_get/extractor/sohu.py
diff --git a/src/you_get/downloader/songtaste.py b/src/you_get/extractor/songtaste.py
similarity index 100%
rename from src/you_get/downloader/songtaste.py
rename to src/you_get/extractor/songtaste.py
diff --git a/src/you_get/downloader/soundcloud.py b/src/you_get/extractor/soundcloud.py
similarity index 100%
rename from src/you_get/downloader/soundcloud.py
rename to src/you_get/extractor/soundcloud.py
diff --git a/src/you_get/downloader/ted.py b/src/you_get/extractor/ted.py
similarity index 100%
rename from src/you_get/downloader/ted.py
rename to src/you_get/extractor/ted.py
diff --git a/src/you_get/downloader/tudou.py b/src/you_get/extractor/tudou.py
similarity index 100%
rename from src/you_get/downloader/tudou.py
rename to src/you_get/extractor/tudou.py
diff --git a/src/you_get/downloader/tumblr.py b/src/you_get/extractor/tumblr.py
similarity index 100%
rename from src/you_get/downloader/tumblr.py
rename to src/you_get/extractor/tumblr.py
diff --git a/src/you_get/downloader/vid48.py b/src/you_get/extractor/vid48.py
similarity index 100%
rename from src/you_get/downloader/vid48.py
rename to src/you_get/extractor/vid48.py
diff --git a/src/you_get/downloader/vimeo.py b/src/you_get/extractor/vimeo.py
similarity index 100%
rename from src/you_get/downloader/vimeo.py
rename to src/you_get/extractor/vimeo.py
diff --git a/src/you_get/downloader/vine.py b/src/you_get/extractor/vine.py
similarity index 100%
rename from src/you_get/downloader/vine.py
rename to src/you_get/extractor/vine.py
diff --git a/src/you_get/downloader/w56.py b/src/you_get/extractor/w56.py
similarity index 100%
rename from src/you_get/downloader/w56.py
rename to src/you_get/extractor/w56.py
diff --git a/src/you_get/downloader/xiami.py b/src/you_get/extractor/xiami.py
similarity index 100%
rename from src/you_get/downloader/xiami.py
rename to src/you_get/extractor/xiami.py
diff --git a/src/you_get/downloader/yinyuetai.py b/src/you_get/extractor/yinyuetai.py
similarity index 100%
rename from src/you_get/downloader/yinyuetai.py
rename to src/you_get/extractor/yinyuetai.py
diff --git a/src/you_get/downloader/youku.py b/src/you_get/extractor/youku.py
similarity index 100%
rename from src/you_get/downloader/youku.py
rename to src/you_get/extractor/youku.py
diff --git a/src/you_get/downloader/youtube.py b/src/you_get/extractor/youtube.py
similarity index 100%
rename from src/you_get/downloader/youtube.py
rename to src/you_get/extractor/youtube.py
diff --git a/tests/test.py b/tests/test.py
index 641878ef..5d21da2d 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -4,7 +4,7 @@
 import unittest
 
 from you_get import *
-from you_get.downloader.__main__ import url_to_module
+from you_get.extractor.__main__ import url_to_module
 
 def test_urls(urls):
     for url in urls:
diff --git a/you-get b/you-get
index 86b44109..8bdc77c7 100755
--- a/you-get
+++ b/you-get
@@ -4,7 +4,7 @@ import os, sys
 __path__ = os.path.dirname(os.path.realpath(__file__))
 __srcdir__ = 'src'
 sys.path.insert(1, os.path.join(__path__, __srcdir__))
-from you_get.downloader import main
+from you_get.extractor import main
 
 if __name__ == '__main__':
     main()
diff --git a/you-get.json b/you-get.json
index 92114cff..dc988868 100644
--- a/you-get.json
+++ b/you-get.json
@@ -31,6 +31,6 @@
         ],
     
     "console_scripts": [
-        "you-get = you_get.downloader.__main__:main"
+        "you-get = you_get.extractor.__main__:main"
         ]
 }