diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
index 051f9949e..43e0a4be0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
@@ -16,6 +16,8 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
+import com.google.android.apps.mytracks.services.sensors.ant.AntSRMSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
similarity index 96%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
index f9c2d6c4a..c8cc2c1ed 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
@@ -13,14 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.services.sensors.ant.AntChannelIdMessage;
-import com.google.android.apps.mytracks.services.sensors.ant.AntChannelResponseMessage;
 import com.google.android.maps.mytracks.R;
 
 import com.dsi.ant.AntDefine;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
index cddc0d57e..4e30badf6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
@@ -13,10 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.services.sensors.SensorUtils;
 import com.google.android.maps.mytracks.R;
 
 import com.dsi.ant.AntDefine;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
index 5e83a8a4a..ef06c2997 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.services.sensors.ant.AntStartupMessage;
+import com.google.android.apps.mytracks.services.sensors.SensorManager;
 
 import com.dsi.ant.AntDefine;
 import com.dsi.ant.AntInterface;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
index 6cff03544..c50ecb985 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services.sensors;
 import com.dsi.ant.AntMesg;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
index c636d6eae..0019bf0ae 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.apps.mytracks.services.sensors;
 
+import com.google.android.apps.mytracks.services.sensors.ant.AntSensorManager;
+
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
index b25c9a9f2..933ba333a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
@@ -1,6 +1,8 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
+import com.google.android.apps.mytracks.services.sensors.ant.AntSRMSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;