diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e4a2c93e..4cfe40cb6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -108,7 +108,7 @@
                 android:value=".SearchResults" />
         </activity>
         <activity
-            android:name=".ManageRepo"
+            android:name=".views.ManageReposActivity"
             android:label="@string/menu_manage"
             android:launchMode="singleTask"
             android:parentActivityName=".FDroid" >
@@ -218,7 +218,7 @@
         <activity
             android:name=".views.RepoDetailsActivity"
             android:label="@string/menu_manage"
-            android:parentActivityName=".ManageRepo"
+            android:parentActivityName=".views.ManageReposActivity"
             android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 833ab01fc..4abcb60ad 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -46,6 +46,7 @@ import org.fdroid.fdroid.compat.TabManager;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListFragmentPageAdapter;
 import org.fdroid.fdroid.views.LocalRepoActivity;
+import org.fdroid.fdroid.views.ManageReposActivity;
 
 public class FDroid extends ActionBarActivity {
 
@@ -135,7 +136,7 @@ public class FDroid extends ActionBarActivity {
                 return true;
 
             case R.id.action_manage_repos:
-                Intent i = new Intent(this, ManageRepo.class);
+                Intent i = new Intent(this, ManageReposActivity.class);
                 startActivityForResult(i, REQUEST_MANAGEREPOS);
                 return true;
 
@@ -226,7 +227,7 @@ public class FDroid extends ActionBarActivity {
         case REQUEST_APPDETAILS:
             break;
         case REQUEST_MANAGEREPOS:
-            if (data != null && data.hasExtra(ManageRepo.REQUEST_UPDATE)) {
+            if (data != null && data.hasExtra(ManageReposActivity.REQUEST_UPDATE)) {
                 AlertDialog.Builder ask_alrt = new AlertDialog.Builder(this);
                 ask_alrt.setTitle(getString(R.string.repo_update_title));
                 ask_alrt.setIcon(android.R.drawable.ic_menu_rotate);
diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/views/ManageReposActivity.java
similarity index 97%
rename from src/org/fdroid/fdroid/ManageRepo.java
rename to src/org/fdroid/fdroid/views/ManageReposActivity.java
index f7a32a3c5..9e024f011 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.views;
 
 import android.app.Activity;
 import android.content.Context;
@@ -34,11 +34,16 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.Toast;
+
+import org.fdroid.fdroid.FDroid;
+import org.fdroid.fdroid.FDroidApp;
+import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.R.string;
 import org.fdroid.fdroid.views.fragments.RepoListFragment;
 
 import java.util.Locale;
 
-public class ManageRepo extends ActionBarActivity {
+public class ManageReposActivity extends ActionBarActivity {
 
     /**
      * If we have a new repo added, or the address of a repo has changed, then