diff --git a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
similarity index 94%
rename from app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java
rename to app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
index dfd9fef23..b6fa10fcf 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
@@ -2,9 +2,9 @@ package org.schabi.newpipe.services.youtube;
 
 import android.test.AndroidTestCase;
 
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
-import org.schabi.newpipe.crawler.SearchEngine;
-import org.schabi.newpipe.crawler.services.youtube.YoutubeSearchEngine;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.SearchEngine;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeSearchEngine;
 import org.schabi.newpipe.Downloader;
 
 import java.util.ArrayList;
diff --git a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorDefaultTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
similarity index 94%
rename from app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorDefaultTest.java
rename to app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
index 45752082a..3c7b3e720 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorDefaultTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -3,10 +3,10 @@ package org.schabi.newpipe.services.youtube;
 import android.test.AndroidTestCase;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.crawler.CrawlingException;
-import org.schabi.newpipe.crawler.ParsingException;
-import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
-import org.schabi.newpipe.crawler.VideoInfo;
+import org.schabi.newpipe.extractor.CrawlingException;
+import org.schabi.newpipe.extractor.ParsingException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.VideoInfo;
 
 import java.io.IOException;
 
diff --git a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorGemaTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java
similarity index 92%
rename from app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorGemaTest.java
rename to app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java
index 9d3bf376a..cf8dd3104 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorGemaTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java
@@ -3,8 +3,8 @@ package org.schabi.newpipe.services.youtube;
 import android.test.AndroidTestCase;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.crawler.CrawlingException;
-import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.CrawlingException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
index 4f55f1bf6..5123f494b 100644
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
@@ -1,24 +1,18 @@
 package org.schabi.newpipe;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
-import android.widget.Toast;
 
-import org.schabi.newpipe.crawler.MediaFormat;
-import org.schabi.newpipe.crawler.VideoInfo;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.VideoInfo;
 
 import java.util.List;
 
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 80f1d0dd3..607eafb6e 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -30,7 +30,7 @@ import info.guardianproject.netcipher.NetCipher;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader implements org.schabi.newpipe.crawler.Downloader {
+public class Downloader implements org.schabi.newpipe.extractor.Downloader {
     
     private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index 07f631146..0cf8645d0 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
index 21b5bf326..a273cd896 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -11,8 +11,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import org.schabi.newpipe.crawler.ServiceList;
-import org.schabi.newpipe.crawler.StreamingService;
+import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.StreamingService;
 
 
 /**
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index d831d8770..44ef65e5d 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -46,14 +46,14 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import java.util.ArrayList;
 import java.util.Vector;
 
-import org.schabi.newpipe.crawler.MediaFormat;
-import org.schabi.newpipe.crawler.ParsingException;
-import org.schabi.newpipe.crawler.ServiceList;
-import org.schabi.newpipe.crawler.StreamExtractor;
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
-import org.schabi.newpipe.crawler.StreamingService;
-import org.schabi.newpipe.crawler.VideoInfo;
-import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.ParsingException;
+import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 
 
 /**
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index b40afa549..f6c8938a8 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 import android.content.Intent;
-import android.media.AudioManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
@@ -17,8 +16,8 @@ import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
-import org.schabi.newpipe.crawler.ServiceList;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.ServiceList;
 
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index cf8a5a08c..8384a738f 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -2,8 +2,6 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -16,14 +14,12 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.List;
-import java.util.Vector;
 
-import org.schabi.newpipe.crawler.CrawlingException;
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
-import org.schabi.newpipe.crawler.SearchEngine;
-import org.schabi.newpipe.crawler.StreamingService;
+import org.schabi.newpipe.extractor.CrawlingException;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.SearchEngine;
+import org.schabi.newpipe.extractor.StreamingService;
 
 
 /**
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index 7077810ad..702e2cfdd 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/AbstractVideoInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/crawler/AbstractVideoInfo.java
rename to app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
index 7a15a8af2..1fe776e5e 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/AbstractVideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/CrawlingException.java b/app/src/main/java/org/schabi/newpipe/extractor/CrawlingException.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/crawler/CrawlingException.java
rename to app/src/main/java/org/schabi/newpipe/extractor/CrawlingException.java
index 291670953..02b0edbc9 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/CrawlingException.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/CrawlingException.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Christian Schabesberger on 30.01.16.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/DashMpdParser.java b/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
similarity index 99%
rename from app/src/main/java/org/schabi/newpipe/crawler/DashMpdParser.java
rename to app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
index 7758a24ee..9dfbe8d14 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/DashMpdParser.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import android.util.Xml;
 
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/Downloader.java b/app/src/main/java/org/schabi/newpipe/extractor/Downloader.java
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/crawler/Downloader.java
rename to app/src/main/java/org/schabi/newpipe/extractor/Downloader.java
index 8732c0372..a4cde400d 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/Downloader.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/MediaFormat.java b/app/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/crawler/MediaFormat.java
rename to app/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java
index 938c6310b..1455fe396 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/MediaFormat.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Adam Howard on 08/11/15.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/Parser.java b/app/src/main/java/org/schabi/newpipe/extractor/Parser.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/crawler/Parser.java
rename to app/src/main/java/org/schabi/newpipe/extractor/Parser.java
index 56eec5c62..6b86b3dcf 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/Parser.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/Parser.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/ParsingException.java b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/crawler/ParsingException.java
rename to app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
index 25d46b119..54d8cd615 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/ParsingException.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Christian Schabesberger on 31.01.16.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/crawler/SearchEngine.java
rename to app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
index 845c78926..c292048d1 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/ServiceList.java b/app/src/main/java/org/schabi/newpipe/extractor/ServiceList.java
similarity index 94%
rename from app/src/main/java/org/schabi/newpipe/crawler/ServiceList.java
rename to app/src/main/java/org/schabi/newpipe/extractor/ServiceList.java
index b1d98a73f..0d5bce51e 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/ServiceList.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/ServiceList.java
@@ -1,8 +1,8 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import android.util.Log;
 
-import org.schabi.newpipe.crawler.services.youtube.YoutubeService;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
 /**
  * Created by Christian Schabesberger on 23.08.15.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/StreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/crawler/StreamExtractor.java
rename to app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
index a363269cb..89feed401 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/StreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Christian Schabesberger on 10.08.15.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/StreamingService.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/crawler/StreamingService.java
rename to app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
index 6c87a5c7b..d9ac2922c 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/StreamingService.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
similarity index 99%
rename from app/src/main/java/org/schabi/newpipe/crawler/VideoInfo.java
rename to app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
index 12449ccbf..9d79a48a0 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/VideoPreviewInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/crawler/VideoPreviewInfo.java
rename to app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java
index bca13a208..de29e9f5b 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/VideoPreviewInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java
@@ -1,11 +1,9 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.schabi.newpipe.crawler.AbstractVideoInfo;
-
 /**
  * Created by Christian Schabesberger on 26.08.15.
  *
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/VideoUrlIdHandler.java b/app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/crawler/VideoUrlIdHandler.java
rename to app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java
index 66d8c3cd8..88736896f 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/VideoUrlIdHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Christian Schabesberger on 02.02.16.
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeSearchEngine.java
rename to app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index a5a547706..be64fc00d 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.crawler.services.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
 import android.net.Uri;
 import android.util.Log;
@@ -6,10 +6,10 @@ import android.util.Log;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.schabi.newpipe.crawler.Downloader;
-import org.schabi.newpipe.crawler.ParsingException;
-import org.schabi.newpipe.crawler.SearchEngine;
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.ParsingException;
+import org.schabi.newpipe.extractor.SearchEngine;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeService.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
similarity index 82%
rename from app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeService.java
rename to app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
index 43f673c63..fd7be7cf9 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
@@ -1,11 +1,11 @@
-package org.schabi.newpipe.crawler.services.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
-import org.schabi.newpipe.crawler.CrawlingException;
-import org.schabi.newpipe.crawler.Downloader;
-import org.schabi.newpipe.crawler.StreamExtractor;
-import org.schabi.newpipe.crawler.StreamingService;
-import org.schabi.newpipe.crawler.VideoUrlIdHandler;
-import org.schabi.newpipe.crawler.SearchEngine;
+import org.schabi.newpipe.extractor.CrawlingException;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.SearchEngine;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeStreamExtractor.java
rename to app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 291244f37..efb1ac329 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -1,6 +1,5 @@
-package org.schabi.newpipe.crawler.services.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
-import android.provider.MediaStore;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -11,19 +10,17 @@ import org.jsoup.nodes.Element;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.crawler.CrawlingException;
-import org.schabi.newpipe.crawler.Downloader;
-import org.schabi.newpipe.crawler.Parser;
-import org.schabi.newpipe.crawler.ParsingException;
-import org.schabi.newpipe.crawler.VideoUrlIdHandler;
-import org.schabi.newpipe.crawler.StreamExtractor;
-import org.schabi.newpipe.crawler.MediaFormat;
-import org.schabi.newpipe.crawler.VideoInfo;
-import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.CrawlingException;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.ParsingException;
+import org.schabi.newpipe.extractor.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.VideoPreviewInfo;
 
 import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
diff --git a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeVideoUrlIdHandler.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java
similarity index 91%
rename from app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeVideoUrlIdHandler.java
rename to app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java
index 64b72d08c..591d981c7 100644
--- a/app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeVideoUrlIdHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java
@@ -1,14 +1,11 @@
-package org.schabi.newpipe.crawler.services.youtube;
+package org.schabi.newpipe.extractor.services.youtube;
 
-import android.util.Log;
-
-import org.schabi.newpipe.crawler.Parser;
-import org.schabi.newpipe.crawler.ParsingException;
-import org.schabi.newpipe.crawler.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.ParsingException;
+import org.schabi.newpipe.extractor.VideoUrlIdHandler;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Map;
 
 /**
  * Created by Christian Schabesberger on 02.02.16.