diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 92f70d73f..e5d123f44 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -160,7 +160,7 @@ limitations under the License.
     <activity
       android:label="@string/menu_help"
       android:name="com.google.android.apps.mytracks.HelpActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity" >
+    <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
       <intent-filter>
         <action android:name="android.intent.action.ATTACH_DATA" />
         <action android:name="android.intent.action.VIEW" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 177969fc7..377b16e5e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -26,9 +26,9 @@ import com.google.android.apps.mytracks.fragments.EulaDialogFragment;
 import com.google.android.apps.mytracks.fragments.EulaDialogFragment.EulaCaller;
 import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment;
 import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller;
-import com.google.android.apps.mytracks.io.file.ImportActivity;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.io.file.export.SaveActivity;
+import com.google.android.apps.mytracks.io.file.importer.ImportActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sync.SyncUtils;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractFileTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractFileTrackImporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
index 35940fa7c..ea31f87f5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractFileTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
index a2c6e9656..ea7e49a1a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
index 16fc4f613..44b7b94e5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
@@ -14,9 +14,10 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.TrackDetailActivity;
+import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.util.DialogUtils;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.IntentUtils;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/ImportAsyncTask.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
index 2586a2b98..a08f63be5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
@@ -14,8 +14,9 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
+import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
index f03f63556..1ecd81212 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackImporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
index db2a48495..51ffdbe56 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java
similarity index 93%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/TrackImporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java
index 33edfb5d8..84be0ab2a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import java.io.InputStream;
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java
index 6ecb943da..cf3e334cc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java
@@ -18,7 +18,7 @@ package com.google.android.apps.mytracks.io.sync;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.io.file.KmlFileTrackImporter;
+import com.google.android.apps.mytracks.io.file.importer.KmlFileTrackImporter;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendToGoogleUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.gms.auth.GoogleAuthException;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/AbstractTestFileTrackImporter.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java
similarity index 99%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/AbstractTestFileTrackImporter.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java
index 2334dfc66..50dbdfd98 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/AbstractTestFileTrackImporter.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
similarity index 98%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
index 1bc791b3d..4eeff4f7b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxFileTrackImporterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
@@ -14,12 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
 
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.io.file.importer.GpxFileTrackImporter;
 import com.google.android.testing.mocking.AndroidMock;
 
 import android.location.Location;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
similarity index 97%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
index 01329a4af..6fe256e09 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlFileTrackImporterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
@@ -14,12 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
 
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.io.file.importer.KmlFileTrackImporter;
 import com.google.android.testing.mocking.AndroidMock;
 
 import android.location.Location;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/LocationsMatcher.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java
similarity index 97%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/LocationsMatcher.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java
index 7fed88299..b54979259 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/LocationsMatcher.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file;
+package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.testing.mocking.AndroidMock;