diff --git a/src/googleplay/java/org/tasks/injection/ActivityComponent.java b/src/googleplay/java/org/tasks/injection/ActivityComponent.java
index 156cfda31..37fc35489 100644
--- a/src/googleplay/java/org/tasks/injection/ActivityComponent.java
+++ b/src/googleplay/java/org/tasks/injection/ActivityComponent.java
@@ -1,7 +1,5 @@
 package org.tasks.injection;
 
-import com.todoroo.astrid.actfm.FilterSettingsActivity;
-import com.todoroo.astrid.actfm.TagSettingsActivity;
 import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.activity.ShareLinkActivity;
 import com.todoroo.astrid.activity.TaskListActivity;
@@ -21,6 +19,8 @@ import org.tasks.activities.ColorPickerActivity;
 import org.tasks.activities.DateAndTimePickerActivity;
 import org.tasks.activities.DatePickerActivity;
 import org.tasks.activities.FilterSelectionActivity;
+import org.tasks.activities.FilterSettingsActivity;
+import org.tasks.activities.TagSettingsActivity;
 import org.tasks.activities.TimePickerActivity;
 import org.tasks.dashclock.DashClockSettings;
 import org.tasks.files.FileExplore;
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f68b86328..752729834 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -345,12 +345,9 @@
 
         <!-- actfm -->
 
-        <activity
-            android:name="com.todoroo.astrid.actfm.TagSettingsActivity" />
+        <activity android:name=".activities.TagSettingsActivity" />
 
-        <activity
-            android:name="com.todoroo.astrid.actfm.FilterSettingsActivity"
-            android:windowSoftInputMode="stateHidden" />
+        <activity android:name=".activities.FilterSettingsActivity" />
 
         <!-- repeats -->
 
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
index 86f48d860..030ccd212 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -22,6 +22,7 @@ import com.todoroo.astrid.tags.TagFilterExposer;
 
 import org.tasks.Broadcaster;
 import org.tasks.R;
+import org.tasks.activities.TagSettingsActivity;
 import org.tasks.injection.FragmentComponent;
 
 import javax.inject.Inject;
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index ea4194193..28d89c6cb 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -19,7 +19,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.actfm.TagSettingsActivity;
+import org.tasks.activities.TagSettingsActivity;
 import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index f9ab5bc16..25f343d31 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -39,7 +39,7 @@ import com.todoroo.andlib.sql.Field;
 import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.actfm.FilterSettingsActivity;
+import org.tasks.activities.FilterSettingsActivity;
 import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.adapter.TaskAdapter.ViewHolder;
diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 8693aef5b..ff8460a8a 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -18,7 +18,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.todoroo.astrid.actfm.TagSettingsActivity;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -27,6 +26,7 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CustomFilterActivity;
 
 import org.tasks.R;
+import org.tasks.activities.TagSettingsActivity;
 import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
 import org.tasks.filters.NavigationDrawerAction;
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 4ca6cfead..35e9ded07 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -23,7 +23,7 @@ import android.widget.ListView;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.UnaryCriterion;
-import com.todoroo.astrid.actfm.TagSettingsActivity;
+import org.tasks.activities.TagSettingsActivity;
 import com.todoroo.astrid.api.CustomFilter;
 import com.todoroo.astrid.api.CustomFilterCriterion;
 import com.todoroo.astrid.api.Filter;
diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/org/tasks/activities/FilterSettingsActivity.java
similarity index 99%
rename from src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
rename to src/main/java/org/tasks/activities/FilterSettingsActivity.java
index 7638cb8b5..764db4d23 100644
--- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
+++ b/src/main/java/org/tasks/activities/FilterSettingsActivity.java
@@ -3,7 +3,7 @@
  *
  * See the file "LICENSE" for the full license governing this code.
  */
-package com.todoroo.astrid.actfm;
+package org.tasks.activities;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/org/tasks/activities/TagSettingsActivity.java
similarity index 99%
rename from src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
rename to src/main/java/org/tasks/activities/TagSettingsActivity.java
index fd2c6ccf7..59223c6a0 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/src/main/java/org/tasks/activities/TagSettingsActivity.java
@@ -3,7 +3,7 @@
  *
  * See the file "LICENSE" for the full license governing this code.
  */
-package com.todoroo.astrid.actfm;
+package org.tasks.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +29,6 @@ import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
 import org.tasks.R;
-import org.tasks.activities.ColorPickerActivity;
 import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.dialogs.ColorPickerDialog;
diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index e1e90780b..e0432d980 100644
--- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -13,7 +13,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.todoroo.astrid.actfm.TagSettingsActivity;
+import org.tasks.activities.TagSettingsActivity;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.adapter.FilterAdapter;
diff --git a/src/release/res/xml/google_analytics.xml b/src/release/res/xml/google_analytics.xml
index 6837d0abc..26d3567a5 100644
--- a/src/release/res/xml/google_analytics.xml
+++ b/src/release/res/xml/google_analytics.xml
@@ -15,14 +15,14 @@
     <screenName name="org.tasks.voice.VoiceCommandActivity">VoiceCommandActivity</screenName>
     <screenName name="org.tasks.locale.ui.activity.TaskerSettingsActivity">TaskerSettingsActivity</screenName>
     <screenName name="com.todoroo.astrid.activity.TaskListActivity">TaskListActivity</screenName>
-    <screenName name="com.todoroo.astrid.actfm.TagSettingsActivity">TagSettingsActivity</screenName>
+    <screenName name="org.tasks.activities.TagSettingsActivity">TagSettingsActivity</screenName>
     <screenName name="org.tasks.reminders.SnoozeActivity">SnoozeActivity</screenName>
     <screenName name="com.todoroo.astrid.core.CustomFilterActivity">CustomFilterActivity</screenName>
     <screenName name="org.tasks.activities.CameraActivity">CameraActivity</screenName>
     <screenName name="org.tasks.activities.CalendarSelectionActivity">CalendarSelectionActivity</screenName>
     <screenName name="com.todoroo.astrid.gcal.CalendarReminderActivity">CalendarReminderActivity</screenName>
     <screenName name="com.todoroo.astrid.activity.BeastModePreferences">BeastModePreferences</screenName>
-    <screenName name="com.todoroo.astrid.actfm.FilterSettingsActivity">FilterSettingsActivity</screenName>
+    <screenName name="org.tasks.activities.FilterSettingsActivity">FilterSettingsActivity</screenName>
     <screenName name="org.tasks.activities.ColorPickerActivity">ColorPickerActivity</screenName>
     <screenName name="org.tasks.activities.DateAndTimePickerActivity">DateAndTimePickerActivity</screenName>
     <screenName name="org.tasks.activities.DatePickerActivity">DatePickerActivity</screenName>