diff --git a/Android.mk b/Android.mk
index 2cdfc68..a041854 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,14 +6,6 @@
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, src)
 
-ifeq ($(NFC_USE_NCI_STACK), true)
-    LOCAL_SRC_FILES += \
-        $(call all-java-files-under, nci)
-else
-    LOCAL_SRC_FILES += \
-        $(call all-java-files-under, nxp)
-endif
-
 LOCAL_PACKAGE_NAME := Nfc
 LOCAL_CERTIFICATE := platform
 
diff --git a/nxp/jni/Android.mk b/jni/Android.mk
similarity index 100%
rename from nxp/jni/Android.mk
rename to jni/Android.mk
diff --git a/nxp/jni/com_android_nfc.cpp b/jni/com_android_nfc.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc.cpp
rename to jni/com_android_nfc.cpp
diff --git a/nxp/jni/com_android_nfc.h b/jni/com_android_nfc.h
similarity index 100%
rename from nxp/jni/com_android_nfc.h
rename to jni/com_android_nfc.h
diff --git a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
rename to jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
diff --git a/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp b/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
rename to jni/com_android_nfc_NativeLlcpServiceSocket.cpp
diff --git a/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp b/jni/com_android_nfc_NativeLlcpSocket.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeLlcpSocket.cpp
rename to jni/com_android_nfc_NativeLlcpSocket.cpp
diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeNfcManager.cpp
rename to jni/com_android_nfc_NativeNfcManager.cpp
diff --git a/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp b/jni/com_android_nfc_NativeNfcSecureElement.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp
rename to jni/com_android_nfc_NativeNfcSecureElement.cpp
diff --git a/nxp/jni/com_android_nfc_NativeNfcTag.cpp b/jni/com_android_nfc_NativeNfcTag.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeNfcTag.cpp
rename to jni/com_android_nfc_NativeNfcTag.cpp
diff --git a/nxp/jni/com_android_nfc_NativeP2pDevice.cpp b/jni/com_android_nfc_NativeP2pDevice.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_NativeP2pDevice.cpp
rename to jni/com_android_nfc_NativeP2pDevice.cpp
diff --git a/nxp/jni/com_android_nfc_list.cpp b/jni/com_android_nfc_list.cpp
similarity index 100%
rename from nxp/jni/com_android_nfc_list.cpp
rename to jni/com_android_nfc_list.cpp
diff --git a/nxp/jni/com_android_nfc_list.h b/jni/com_android_nfc_list.h
similarity index 100%
rename from nxp/jni/com_android_nfc_list.h
rename to jni/com_android_nfc_list.h
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 3e7a6b5..602b25d 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -23,8 +23,8 @@
 import com.android.nfc.DeviceHost.NfcDepEndpoint;
 import com.android.nfc.DeviceHost.TagEndpoint;
 import com.android.nfc.handover.HandoverManager;
-import com.android.nfc.dhimpl.NativeNfcManager;
-import com.android.nfc.dhimpl.NativeNfcSecureElement;
+import com.android.nfc.nxp.NativeNfcManager;
+import com.android.nfc.nxp.NativeNfcSecureElement;
 
 import android.app.Application;
 import android.app.KeyguardManager;
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java b/src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java
similarity index 97%
rename from nxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java
rename to src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java
index db78496..c9d3b5d 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java
+++ b/src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost;
 import com.android.nfc.LlcpPacket;
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java b/src/com/android/nfc/nxp/NativeLlcpServiceSocket.java
similarity index 97%
rename from nxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java
rename to src/com/android/nfc/nxp/NativeLlcpServiceSocket.java
index 3a7e57f..531afd8 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java
+++ b/src/com/android/nfc/nxp/NativeLlcpServiceSocket.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost;
 import com.android.nfc.DeviceHost.LlcpSocket;
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java b/src/com/android/nfc/nxp/NativeLlcpSocket.java
similarity index 98%
rename from nxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java
rename to src/com/android/nfc/nxp/NativeLlcpSocket.java
index 69506c5..a337d35 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java
+++ b/src/com/android/nfc/nxp/NativeLlcpSocket.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost;
 
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java b/src/com/android/nfc/nxp/NativeNfcManager.java
similarity index 99%
rename from nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
rename to src/com/android/nfc/nxp/NativeNfcManager.java
index f969627..4bd8c24 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/src/com/android/nfc/nxp/NativeNfcManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost;
 import com.android.nfc.LlcpException;
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java b/src/com/android/nfc/nxp/NativeNfcSecureElement.java
similarity index 97%
rename from nxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java
rename to src/com/android/nfc/nxp/NativeNfcSecureElement.java
index e2d91ec..88f9b9d 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java
+++ b/src/com/android/nfc/nxp/NativeNfcSecureElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java b/src/com/android/nfc/nxp/NativeNfcTag.java
similarity index 99%
rename from nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java
rename to src/com/android/nfc/nxp/NativeNfcTag.java
index eddde94..8996dfb 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java
+++ b/src/com/android/nfc/nxp/NativeNfcTag.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost.TagEndpoint;
 
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java b/src/com/android/nfc/nxp/NativeP2pDevice.java
similarity index 97%
rename from nxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java
rename to src/com/android/nfc/nxp/NativeP2pDevice.java
index 094f46a..7c7db41 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java
+++ b/src/com/android/nfc/nxp/NativeP2pDevice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.nfc.dhimpl;
+package com.android.nfc.nxp;
 
 import com.android.nfc.DeviceHost.NfcDepEndpoint;