diff --git a/MyTracks/res/xml/advanced_settings.xml b/MyTracks/res/xml/advanced_settings.xml
index d234c3039..f88739673 100644
--- a/MyTracks/res/xml/advanced_settings.xml
+++ b/MyTracks/res/xml/advanced_settings.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_advanced" >
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="1024"
     android:key="@string/photo_size_key"
     android:title="@string/settings_advanced_photo_size_title" />
diff --git a/MyTracks/res/xml/recording_settings.xml b/MyTracks/res/xml/recording_settings.xml
index f5e845c5d..40a2a3bf7 100644
--- a/MyTracks/res/xml/recording_settings.xml
+++ b/MyTracks/res/xml/recording_settings.xml
@@ -16,11 +16,11 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_recording" >
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="0"
     android:key="@string/voice_frequency_key"
     android:title="@string/menu_voice_frequency" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="0"
     android:key="@string/split_frequency_key"
     android:title="@string/menu_split_frequency" />
@@ -28,27 +28,27 @@ limitations under the License.
     android:defaultValue="@string/settings_recording_track_name_location_value"
     android:key="@string/track_name_key"
     android:title="@string/settings_recording_track_name_title" />
-  <com.google.android.apps.mytracks.ActivityTypePreference
+  <com.google.android.apps.mytracks.settings.ActivityTypePreference
     android:defaultValue=""
     android:key="@string/default_activity_key"
     android:title="@string/settings_recording_default_activity_title" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="0"
     android:key="@string/min_recording_interval_key"
     android:title="@string/settings_recording_min_recording_interval_title" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="10"
     android:key="@string/recording_distance_interval_key"
     android:title="@string/settings_recording_min_recording_distance_title" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="200"
     android:key="@string/max_recording_distance_key"
     android:title="@string/settings_recording_max_recording_distance_title" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="50"
     android:key="@string/recording_gps_accuracy_key"
     android:title="@string/settings_recording_min_required_accuracy_title" />
-  <com.google.android.apps.mytracks.IntegerListPreference
+  <com.google.android.apps.mytracks.settings.IntegerListPreference
     android:defaultValue="10"
     android:key="@string/auto_resume_track_timeout_key"
     android:title="@string/settings_recording_auto_resume_track_timeout_title" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ActivityTypePreference.java b/MyTracks/src/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
similarity index 97%
rename from MyTracks/src/com/google/android/apps/mytracks/ActivityTypePreference.java
rename to MyTracks/src/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
index f6db89d82..8eed4f769 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ActivityTypePreference.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
@@ -14,9 +14,8 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package com.google.android.apps.mytracks.settings;
 
-import com.google.android.apps.mytracks.settings.RecordingSettingsActivity;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.TrackIconUtils;
 import com.google.android.maps.mytracks.R;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/IntegerListPreference.java b/MyTracks/src/com/google/android/apps/mytracks/settings/IntegerListPreference.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/IntegerListPreference.java
rename to MyTracks/src/com/google/android/apps/mytracks/settings/IntegerListPreference.java
index 97037b15c..249f1e243 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/IntegerListPreference.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/IntegerListPreference.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package com.google.android.apps.mytracks.settings;
 
 import android.content.Context;
 import android.preference.ListPreference;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
index 2ccc69d97..afdf430b3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
@@ -16,7 +16,6 @@
 
 package com.google.android.apps.mytracks.settings;
 
-import com.google.android.apps.mytracks.ActivityTypePreference;
 import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment;
 import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
 import com.google.android.apps.mytracks.util.PreferencesUtils;