diff --git a/LocationLib/bin/locationlib.jar b/LocationLib/bin/locationlib.jar
index 0c931a4..90f9c28 100644
Binary files a/LocationLib/bin/locationlib.jar and b/LocationLib/bin/locationlib.jar differ
diff --git a/LocationLib/src/com/TwentyCodes/android/fragments/SkyHoookUserOverlayMapFragment.java b/LocationLib/src/com/TwentyCodes/android/fragments/SkyHoookUserOverlayMapFragment.java
index 93233ff..bdae0ca 100644
--- a/LocationLib/src/com/TwentyCodes/android/fragments/SkyHoookUserOverlayMapFragment.java
+++ b/LocationLib/src/com/TwentyCodes/android/fragments/SkyHoookUserOverlayMapFragment.java
@@ -6,7 +6,7 @@
  */
 package com.TwentyCodes.android.fragments;
 
-import com.TwentyCodes.android.location.CompassListener;
+import com.TwentyCodes.android.location.CompassSensor.CompassListener;
 import com.TwentyCodes.android.location.GeoPointLocationListener;
 import com.TwentyCodes.android.location.MapView;
 import com.TwentyCodes.android.overlays.SkyHookUserOverlay;
diff --git a/LocationLib/src/com/TwentyCodes/android/fragments/UserOverlayMapFragment.java b/LocationLib/src/com/TwentyCodes/android/fragments/UserOverlayMapFragment.java
index 5984676..2016eeb 100644
--- a/LocationLib/src/com/TwentyCodes/android/fragments/UserOverlayMapFragment.java
+++ b/LocationLib/src/com/TwentyCodes/android/fragments/UserOverlayMapFragment.java
@@ -6,7 +6,7 @@
  */
 package com.TwentyCodes.android.fragments;
 
-import com.TwentyCodes.android.location.CompassListener;
+import com.TwentyCodes.android.location.CompassSensor.CompassListener;
 import com.TwentyCodes.android.location.GeoPointLocationListener;
 import com.TwentyCodes.android.location.MapView;
 import com.TwentyCodes.android.overlays.UserOverlay;
diff --git a/LocationLib/src/com/TwentyCodes/android/location/CompassListener.java b/LocationLib/src/com/TwentyCodes/android/location/CompassListener.java
deleted file mode 100644
index 2e77771..0000000
--- a/LocationLib/src/com/TwentyCodes/android/location/CompassListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * CompassListener.java
- * @date Mar 2, 2011
- * @author ricky barrette
- * @author Twenty Codes, LLC
- */
-package com.TwentyCodes.android.location;
-
-/**
- * A simple listener interface to get updates from CompassSensor
- * @author ricky barrette
- */
-public interface CompassListener {
-	
-	/**
-	 * Called when there is an update from the Compass Sensor
-	 * @param bearing
-	 * @author ricky barrette
-	 */
-	public void onCompassUpdate(float bearing);
-}
\ No newline at end of file
diff --git a/LocationLib/src/com/TwentyCodes/android/location/CompassSensor.java b/LocationLib/src/com/TwentyCodes/android/location/CompassSensor.java
index 5986fca..2a8d1ed 100644
--- a/LocationLib/src/com/TwentyCodes/android/location/CompassSensor.java
+++ b/LocationLib/src/com/TwentyCodes/android/location/CompassSensor.java
@@ -28,13 +28,27 @@ import com.TwentyCodes.android.debug.Debug;
  */
 public class CompassSensor{
 	
+	/**
+	 * A simple listener interface to get updates from CompassSensor
+	 * @author ricky barrette
+	 */
+	public interface CompassListener {
+		
+		/**
+		 * Called when there is an update from the Compass Sensor
+		 * @param bearing
+		 * @author ricky barrette
+		 */
+		public void onCompassUpdate(float bearing);
+	}
+	
 	public static final String TAG = "CompassSensor";
 	private static final int BEARING = 0;
 	private final Display mDisplay;
 	private final Handler mHandler;
 	private final SensorManager mSensorManager;
+	private final Context mContext;
 	private CompassListener mListener;
-	private Context mContext;
 	private float mDelination = 0;
 
 	private final SensorEventListener mCallBack = new SensorEventListener() {
diff --git a/LocationLib/src/com/TwentyCodes/android/overlays/BaseUserOverlay.java b/LocationLib/src/com/TwentyCodes/android/overlays/BaseUserOverlay.java
index 4f4fcd3..ab0d824 100644
--- a/LocationLib/src/com/TwentyCodes/android/overlays/BaseUserOverlay.java
+++ b/LocationLib/src/com/TwentyCodes/android/overlays/BaseUserOverlay.java
@@ -19,7 +19,7 @@ import android.graphics.RectF;
 import android.util.Log;
 
 import com.TwentyCodes.android.debug.Debug;
-import com.TwentyCodes.android.location.CompassListener;
+import com.TwentyCodes.android.location.CompassSensor.CompassListener;
 import com.TwentyCodes.android.location.GeoPointLocationListener;
 import com.TwentyCodes.android.location.GeoUtils;
 import com.TwentyCodes.android.location.R;
diff --git a/LocationLib/src/com/TwentyCodes/android/overlays/CompasOverlay.java b/LocationLib/src/com/TwentyCodes/android/overlays/CompasOverlay.java
index 15ea9bc..e769035 100644
--- a/LocationLib/src/com/TwentyCodes/android/overlays/CompasOverlay.java
+++ b/LocationLib/src/com/TwentyCodes/android/overlays/CompasOverlay.java
@@ -15,8 +15,8 @@ import android.graphics.Matrix;
 import android.graphics.Point;
 import android.util.TypedValue;
 
-import com.TwentyCodes.android.location.CompassListener;
 import com.TwentyCodes.android.location.CompassSensor;
+import com.TwentyCodes.android.location.CompassSensor.CompassListener;
 import com.TwentyCodes.android.location.GeoUtils;
 import com.TwentyCodes.android.location.R;
 import com.google.android.maps.GeoPoint;