diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bffefd177..8a2f38540 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,7 +129,7 @@
             android:name=".ExitActivity"
             android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".ErrorActivity" />
+        <activity android:name=".report.ErrorActivity" />
 
         <!-- giga get related -->
         <activity
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 81555d979..6b51c6cd5 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe;
 
 import android.app.Application;
 import android.content.Context;
-import android.util.Log;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -12,7 +11,8 @@ import org.acra.config.ACRAConfiguration;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
-import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.report.AcraReportSenderFactory;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 
 import info.guardianproject.netcipher.NetCipher;
diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index 7f5aaf1f8..1a574dc99 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -27,6 +27,7 @@ import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java b/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
index 0447ed647..7616cd8d0 100644
--- a/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
+++ b/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
@@ -7,8 +7,7 @@ import android.view.View;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
-import org.schabi.newpipe.ErrorActivity;
-import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.extractor.ServiceList;
 
 /**
diff --git a/app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java b/app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java
index 03178f9d1..31b65536e 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java
@@ -6,7 +6,7 @@ import android.util.Log;
 import android.view.View;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.ServiceList;
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index 2c5f2f46e..c22b82c93 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -43,7 +43,7 @@ import java.util.Vector;
 
 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.ChannelActivity;
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.ImageErrorLoadingListener;
 import org.schabi.newpipe.Localization;
 import org.schabi.newpipe.R;
diff --git a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
index ec4d97dda..1ea6d2024 100644
--- a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
@@ -26,7 +26,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 
diff --git a/app/src/main/java/org/schabi/newpipe/AcraReportSender.java b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
similarity index 95%
rename from app/src/main/java/org/schabi/newpipe/AcraReportSender.java
rename to app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
index bd151fae4..41e42fac1 100644
--- a/app/src/main/java/org/schabi/newpipe/AcraReportSender.java
+++ b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
@@ -1,10 +1,11 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.report;
 
 import android.content.Context;
 
 import org.acra.collector.CrashReportData;
 import org.acra.sender.ReportSender;
 import org.acra.sender.ReportSenderException;
+import org.schabi.newpipe.R;
 
 /**
  * Created by Christian Schabesberger  on 13.09.16.
diff --git a/app/src/main/java/org/schabi/newpipe/AcraReportSenderFactory.java b/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java
similarity index 93%
rename from app/src/main/java/org/schabi/newpipe/AcraReportSenderFactory.java
rename to app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java
index 13d7dbf57..1e49a8db0 100644
--- a/app/src/main/java/org/schabi/newpipe/AcraReportSenderFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java
@@ -1,10 +1,11 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.report;
 
 import android.content.Context;
 
 import org.acra.config.ACRAConfiguration;
 import org.acra.sender.ReportSender;
 import org.acra.sender.ReportSenderFactory;
+import org.schabi.newpipe.report.AcraReportSender;
 
 /**
  * Created by Christian Schabesberger  on 13.09.16.
diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/ErrorActivity.java
rename to app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 4fb21fdc2..3cc7791b7 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -1,6 +1,6 @@
 
 
-package org.schabi.newpipe;
+package org.schabi.newpipe.report;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,6 +30,11 @@ import org.acra.ReportField;
 import org.acra.collector.CrashReportData;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.Parser;
 
 import java.io.PrintWriter;
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
index 52fc305fb..fbe7546e6 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
@@ -18,7 +18,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.detail.VideoItemDetailFragment;
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
index 11de3b185..9e592ba47 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
@@ -6,10 +6,9 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
-import android.widget.Toast;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.SearchEngine;
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
index 71a3ef1ba..4a8840d95 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
@@ -1,14 +1,13 @@
 package org.schabi.newpipe.search_fragment;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.SearchEngine;
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index c6684263f..ea6cb7792 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ErrorActivity">
+    tools:context=".report.ErrorActivity">
 
     <ScrollView
         android:id="@+id/scrollView"