diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SignalStrengthFacade.java
similarity index 96%
rename from sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
rename to sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SignalStrengthFacade.java
index bbadedf..a55ecc4 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SignalStrengthFacade.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade;
+package com.googlecode.android_scripting.facade.telephony;
 
 import android.app.Service;
 import android.content.Context;
@@ -25,6 +25,8 @@
 
 import com.googlecode.android_scripting.MainThread;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
+import com.googlecode.android_scripting.facade.EventFacade;
+import com.googlecode.android_scripting.facade.FacadeManager;
 import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcMinSdk;
 import com.googlecode.android_scripting.rpc.RpcStartEvent;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SmsFacade.java
similarity index 99%
rename from sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java
rename to sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SmsFacade.java
index d2499f4..1744d2b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SmsFacade.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade;
+package com.googlecode.android_scripting.facade.telephony;
 
 import com.google.android.mms.ContentType;
 import com.google.android.mms.InvalidHeaderValueException;
@@ -60,6 +60,8 @@
 import android.telephony.TelephonyManager;
 
 import com.googlecode.android_scripting.Log;
+import com.googlecode.android_scripting.facade.EventFacade;
+import com.googlecode.android_scripting.facade.FacadeManager;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
 import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcDefault;
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
index 1e9e471..005c72d 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
@@ -45,12 +45,14 @@
 import com.googlecode.android_scripting.facade.media.MediaRecorderFacade;
 import com.googlecode.android_scripting.facade.media.MediaScannerFacade;
 import com.googlecode.android_scripting.facade.media.MediaSessionFacade;
+import com.googlecode.android_scripting.facade.telephony.CarrierConfigFacade;
 import com.googlecode.android_scripting.facade.telephony.ImsManagerFacade;
-import com.googlecode.android_scripting.facade.telephony.TelephonyManagerFacade;
-import com.googlecode.android_scripting.facade.telephony.TelecomManagerFacade;
+import com.googlecode.android_scripting.facade.telephony.SignalStrengthFacade;
+import com.googlecode.android_scripting.facade.telephony.SmsFacade;
 import com.googlecode.android_scripting.facade.telephony.SubscriptionManagerFacade;
 import com.googlecode.android_scripting.facade.telephony.TelecomCallFacade;
-import com.googlecode.android_scripting.facade.telephony.CarrierConfigFacade;
+import com.googlecode.android_scripting.facade.telephony.TelecomManagerFacade;
+import com.googlecode.android_scripting.facade.telephony.TelephonyManagerFacade;
 import com.googlecode.android_scripting.facade.ui.UiFacade;
 import com.googlecode.android_scripting.facade.wifi.HttpFacade;
 import com.googlecode.android_scripting.facade.wifi.WifiManagerFacade;