diff --git a/src/Android.bp b/SN100x/src/Android.bp
similarity index 100%
rename from src/Android.bp
rename to SN100x/src/Android.bp
diff --git a/src/adaptation/CrcChecksum.cc b/SN100x/src/adaptation/CrcChecksum.cc
similarity index 100%
rename from src/adaptation/CrcChecksum.cc
rename to SN100x/src/adaptation/CrcChecksum.cc
diff --git a/src/adaptation/NfcAdaptation.cc b/SN100x/src/adaptation/NfcAdaptation.cc
similarity index 100%
rename from src/adaptation/NfcAdaptation.cc
rename to SN100x/src/adaptation/NfcAdaptation.cc
diff --git a/src/adaptation/android_logmsg.cc b/SN100x/src/adaptation/android_logmsg.cc
similarity index 100%
rename from src/adaptation/android_logmsg.cc
rename to SN100x/src/adaptation/android_logmsg.cc
diff --git a/src/adaptation/debug_nfcsnoop.cc b/SN100x/src/adaptation/debug_nfcsnoop.cc
similarity index 100%
rename from src/adaptation/debug_nfcsnoop.cc
rename to SN100x/src/adaptation/debug_nfcsnoop.cc
diff --git a/src/adaptation/libmain.cc b/SN100x/src/adaptation/libmain.cc
similarity index 100%
rename from src/adaptation/libmain.cc
rename to SN100x/src/adaptation/libmain.cc
diff --git a/src/adaptation/nfc_config.cc b/SN100x/src/adaptation/nfc_config.cc
similarity index 100%
rename from src/adaptation/nfc_config.cc
rename to SN100x/src/adaptation/nfc_config.cc
diff --git a/src/gki/common/gki.h b/SN100x/src/gki/common/gki.h
similarity index 100%
rename from src/gki/common/gki.h
rename to SN100x/src/gki/common/gki.h
diff --git a/src/gki/common/gki_buffer.cc b/SN100x/src/gki/common/gki_buffer.cc
similarity index 100%
rename from src/gki/common/gki_buffer.cc
rename to SN100x/src/gki/common/gki_buffer.cc
diff --git a/src/gki/common/gki_common.h b/SN100x/src/gki/common/gki_common.h
similarity index 100%
rename from src/gki/common/gki_common.h
rename to SN100x/src/gki/common/gki_common.h
diff --git a/src/gki/common/gki_inet.h b/SN100x/src/gki/common/gki_inet.h
similarity index 100%
rename from src/gki/common/gki_inet.h
rename to SN100x/src/gki/common/gki_inet.h
diff --git a/src/gki/common/gki_time.cc b/SN100x/src/gki/common/gki_time.cc
similarity index 100%
rename from src/gki/common/gki_time.cc
rename to SN100x/src/gki/common/gki_time.cc
diff --git a/src/gki/ulinux/data_types.h b/SN100x/src/gki/ulinux/data_types.h
similarity index 100%
rename from src/gki/ulinux/data_types.h
rename to SN100x/src/gki/ulinux/data_types.h
diff --git a/src/gki/ulinux/gki_int.h b/SN100x/src/gki/ulinux/gki_int.h
similarity index 100%
rename from src/gki/ulinux/gki_int.h
rename to SN100x/src/gki/ulinux/gki_int.h
diff --git a/src/gki/ulinux/gki_ulinux.cc b/SN100x/src/gki/ulinux/gki_ulinux.cc
similarity index 100%
rename from src/gki/ulinux/gki_ulinux.cc
rename to SN100x/src/gki/ulinux/gki_ulinux.cc
diff --git a/src/include/CrcChecksum.h b/SN100x/src/include/CrcChecksum.h
similarity index 100%
rename from src/include/CrcChecksum.h
rename to SN100x/src/include/CrcChecksum.h
diff --git a/src/include/NfcAdaptation.h b/SN100x/src/include/NfcAdaptation.h
similarity index 100%
rename from src/include/NfcAdaptation.h
rename to SN100x/src/include/NfcAdaptation.h
diff --git a/src/include/android_logmsg.h b/SN100x/src/include/android_logmsg.h
similarity index 100%
rename from src/include/android_logmsg.h
rename to SN100x/src/include/android_logmsg.h
diff --git a/src/include/bt_types.h b/SN100x/src/include/bt_types.h
similarity index 100%
rename from src/include/bt_types.h
rename to SN100x/src/include/bt_types.h
diff --git a/src/include/buildcfg.h b/SN100x/src/include/buildcfg.h
similarity index 100%
rename from src/include/buildcfg.h
rename to SN100x/src/include/buildcfg.h
diff --git a/src/include/buildcfg_hal.h b/SN100x/src/include/buildcfg_hal.h
similarity index 100%
rename from src/include/buildcfg_hal.h
rename to SN100x/src/include/buildcfg_hal.h
diff --git a/src/include/debug_nfcsnoop.h b/SN100x/src/include/debug_nfcsnoop.h
similarity index 100%
rename from src/include/debug_nfcsnoop.h
rename to SN100x/src/include/debug_nfcsnoop.h
diff --git a/src/include/gki_hal_target.h b/SN100x/src/include/gki_hal_target.h
similarity index 100%
rename from src/include/gki_hal_target.h
rename to SN100x/src/include/gki_hal_target.h
diff --git a/src/include/gki_target.h b/SN100x/src/include/gki_target.h
similarity index 100%
rename from src/include/gki_target.h
rename to SN100x/src/include/gki_target.h
diff --git a/src/include/nci_defs.h b/SN100x/src/include/nci_defs.h
similarity index 100%
rename from src/include/nci_defs.h
rename to SN100x/src/include/nci_defs.h
diff --git a/src/include/nfc_brcm_defs.h b/SN100x/src/include/nfc_brcm_defs.h
similarity index 100%
rename from src/include/nfc_brcm_defs.h
rename to SN100x/src/include/nfc_brcm_defs.h
diff --git a/src/include/nfc_config.h b/SN100x/src/include/nfc_config.h
similarity index 100%
rename from src/include/nfc_config.h
rename to SN100x/src/include/nfc_config.h
diff --git a/src/include/nfc_hal_api.h b/SN100x/src/include/nfc_hal_api.h
similarity index 100%
rename from src/include/nfc_hal_api.h
rename to SN100x/src/include/nfc_hal_api.h
diff --git a/src/include/nfc_hal_int.h b/SN100x/src/include/nfc_hal_int.h
similarity index 100%
rename from src/include/nfc_hal_int.h
rename to SN100x/src/include/nfc_hal_int.h
diff --git a/src/include/nfc_hal_int_api.h b/SN100x/src/include/nfc_hal_int_api.h
similarity index 100%
rename from src/include/nfc_hal_int_api.h
rename to SN100x/src/include/nfc_hal_int_api.h
diff --git a/src/include/nfc_hal_nv_ci.h b/SN100x/src/include/nfc_hal_nv_ci.h
similarity index 100%
rename from src/include/nfc_hal_nv_ci.h
rename to SN100x/src/include/nfc_hal_nv_ci.h
diff --git a/src/include/nfc_hal_nv_co.h b/SN100x/src/include/nfc_hal_nv_co.h
similarity index 100%
rename from src/include/nfc_hal_nv_co.h
rename to SN100x/src/include/nfc_hal_nv_co.h
diff --git a/src/include/nfc_hal_post_reset.h b/SN100x/src/include/nfc_hal_post_reset.h
similarity index 100%
rename from src/include/nfc_hal_post_reset.h
rename to SN100x/src/include/nfc_hal_post_reset.h
diff --git a/src/include/nfc_hal_target.h b/SN100x/src/include/nfc_hal_target.h
similarity index 100%
rename from src/include/nfc_hal_target.h
rename to SN100x/src/include/nfc_hal_target.h
diff --git a/src/include/nfc_target.h b/SN100x/src/include/nfc_target.h
similarity index 100%
rename from src/include/nfc_target.h
rename to SN100x/src/include/nfc_target.h
diff --git a/src/include/nfc_types.h b/SN100x/src/include/nfc_types.h
similarity index 100%
rename from src/include/nfc_types.h
rename to SN100x/src/include/nfc_types.h
diff --git a/src/include/trace_api.h b/SN100x/src/include/trace_api.h
similarity index 100%
rename from src/include/trace_api.h
rename to SN100x/src/include/trace_api.h
diff --git a/src/include/vendor_cfg.h b/SN100x/src/include/vendor_cfg.h
similarity index 100%
rename from src/include/vendor_cfg.h
rename to SN100x/src/include/vendor_cfg.h
diff --git a/src/nfa/ce/nfa_ce_act.cc b/SN100x/src/nfa/ce/nfa_ce_act.cc
similarity index 100%
rename from src/nfa/ce/nfa_ce_act.cc
rename to SN100x/src/nfa/ce/nfa_ce_act.cc
diff --git a/src/nfa/ce/nfa_ce_api.cc b/SN100x/src/nfa/ce/nfa_ce_api.cc
similarity index 100%
rename from src/nfa/ce/nfa_ce_api.cc
rename to SN100x/src/nfa/ce/nfa_ce_api.cc
diff --git a/src/nfa/ce/nfa_ce_main.cc b/SN100x/src/nfa/ce/nfa_ce_main.cc
similarity index 100%
rename from src/nfa/ce/nfa_ce_main.cc
rename to SN100x/src/nfa/ce/nfa_ce_main.cc
diff --git a/src/nfa/dm/nfa_dm_act.cc b/SN100x/src/nfa/dm/nfa_dm_act.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_act.cc
rename to SN100x/src/nfa/dm/nfa_dm_act.cc
diff --git a/src/nfa/dm/nfa_dm_api.cc b/SN100x/src/nfa/dm/nfa_dm_api.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_api.cc
rename to SN100x/src/nfa/dm/nfa_dm_api.cc
diff --git a/src/nfa/dm/nfa_dm_cfg.cc b/SN100x/src/nfa/dm/nfa_dm_cfg.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_cfg.cc
rename to SN100x/src/nfa/dm/nfa_dm_cfg.cc
diff --git a/src/nfa/dm/nfa_dm_discover.cc b/SN100x/src/nfa/dm/nfa_dm_discover.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_discover.cc
rename to SN100x/src/nfa/dm/nfa_dm_discover.cc
diff --git a/src/nfa/dm/nfa_dm_main.cc b/SN100x/src/nfa/dm/nfa_dm_main.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_main.cc
rename to SN100x/src/nfa/dm/nfa_dm_main.cc
diff --git a/src/nfa/dm/nfa_dm_ndef.cc b/SN100x/src/nfa/dm/nfa_dm_ndef.cc
similarity index 100%
rename from src/nfa/dm/nfa_dm_ndef.cc
rename to SN100x/src/nfa/dm/nfa_dm_ndef.cc
diff --git a/src/nfa/ee/nfa_ee_act.cc b/SN100x/src/nfa/ee/nfa_ee_act.cc
similarity index 99%
rename from src/nfa/ee/nfa_ee_act.cc
rename to SN100x/src/nfa/ee/nfa_ee_act.cc
index 18b1802..13d00b9 100755
--- a/src/nfa/ee/nfa_ee_act.cc
+++ b/SN100x/src/nfa/ee/nfa_ee_act.cc
@@ -2693,7 +2693,7 @@
 #if (NXP_EXTNS == TRUE)
            |
           p_cb->aid_entries | p_cb->apdu_pattern_entries
-#endif 
+#endif
           ) {
         /* this NFCEE still has configuration when deactivated. clear the
          * configuration */
diff --git a/src/nfa/ee/nfa_ee_api.cc b/SN100x/src/nfa/ee/nfa_ee_api.cc
similarity index 100%
rename from src/nfa/ee/nfa_ee_api.cc
rename to SN100x/src/nfa/ee/nfa_ee_api.cc
diff --git a/src/nfa/ee/nfa_ee_main.cc b/SN100x/src/nfa/ee/nfa_ee_main.cc
similarity index 100%
rename from src/nfa/ee/nfa_ee_main.cc
rename to SN100x/src/nfa/ee/nfa_ee_main.cc
diff --git a/src/nfa/hci/nfa_hci_act.cc b/SN100x/src/nfa/hci/nfa_hci_act.cc
similarity index 99%
rename from src/nfa/hci/nfa_hci_act.cc
rename to SN100x/src/nfa/hci/nfa_hci_act.cc
index 7d62c2c..b7d9049 100644
--- a/src/nfa/hci/nfa_hci_act.cc
+++ b/SN100x/src/nfa/hci/nfa_hci_act.cc
@@ -2413,7 +2413,7 @@
             if(status == 1)
             {
                 /*UINT8 local_gate, UINT8 pipe_id, UINT8 dest_host, UINT8 dest_gate*/
-                if(!nfa_hciu_check_pipe_between_gates(NFA_HCI_APDU_APP_GATE, NFA_HCI_FIRST_PROP_HOST, 
+                if(!nfa_hciu_check_pipe_between_gates(NFA_HCI_APDU_APP_GATE, NFA_HCI_FIRST_PROP_HOST,
                                  NFA_HCI_APDU_GATE))
                 {
                     nfa_hci_update_pipe_status(NFA_HCI_APDU_GATE, NFA_HCI_APDUESE_PIPE);
@@ -2449,7 +2449,7 @@
             /*Update eSE Connectivity pipe status*/
             if(status == 1)
             {
-                if(!nfa_hciu_check_pipe_between_gates(NFA_HCI_CONNECTIVITY_GATE, NFA_HCI_FIRST_PROP_HOST, 
+                if(!nfa_hciu_check_pipe_between_gates(NFA_HCI_CONNECTIVITY_GATE, NFA_HCI_FIRST_PROP_HOST,
                                  NFA_HCI_CONNECTIVITY_GATE))
                 {
                     nfa_hci_update_pipe_status(NFA_HCI_CONNECTIVITY_GATE, NFA_HCI_CONN_ESE_PIPE);
@@ -2917,7 +2917,7 @@
             break;
 
         case NFA_HCI_EVT_WTX:
-            if (p_pipe_cmdrsp_info->w4_rsp_apdu_evt || 
+            if (p_pipe_cmdrsp_info->w4_rsp_apdu_evt ||
               p_pipe_cmdrsp_info->w4_atr_evt)
             {
                 if(p_nfa_hci_cfg->max_wtx_count) {
diff --git a/src/nfa/hci/nfa_hci_api.cc b/SN100x/src/nfa/hci/nfa_hci_api.cc
similarity index 100%
rename from src/nfa/hci/nfa_hci_api.cc
rename to SN100x/src/nfa/hci/nfa_hci_api.cc
diff --git a/src/nfa/hci/nfa_hci_ci.cc b/SN100x/src/nfa/hci/nfa_hci_ci.cc
similarity index 100%
rename from src/nfa/hci/nfa_hci_ci.cc
rename to SN100x/src/nfa/hci/nfa_hci_ci.cc
diff --git a/src/nfa/hci/nfa_hci_main.cc b/SN100x/src/nfa/hci/nfa_hci_main.cc
similarity index 99%
rename from src/nfa/hci/nfa_hci_main.cc
rename to SN100x/src/nfa/hci/nfa_hci_main.cc
index d2c3308..2a600f1 100644
--- a/src/nfa/hci/nfa_hci_main.cc
+++ b/SN100x/src/nfa/hci/nfa_hci_main.cc
@@ -761,7 +761,7 @@
     nfa_ee_proc_hci_info_cback();
     nfa_sys_cback_notify_nfcc_power_mode_proc_complete(NFA_ID_HCI);
 
-  } else 
+  } else
 #if(NXP_EXTNS == TRUE)
   if(nfa_hci_cb.hci_state == NFA_HCI_STATE_WAIT_NETWK_ENABLE ||
         nfa_hci_cb.hci_state == NFA_HCI_STATE_STARTUP)
diff --git a/src/nfa/hci/nfa_hci_utils.cc b/SN100x/src/nfa/hci/nfa_hci_utils.cc
similarity index 99%
rename from src/nfa/hci/nfa_hci_utils.cc
rename to SN100x/src/nfa/hci/nfa_hci_utils.cc
index 2b6ff3e..131365c 100644
--- a/src/nfa/hci/nfa_hci_utils.cc
+++ b/SN100x/src/nfa/hci/nfa_hci_utils.cc
@@ -423,7 +423,7 @@
                   p_nfa_hci_cfg->hcp_response_timeout);
       }
 #endif
-  } 
+  }
 #if(NXP_EXTNS == TRUE)
   else if(type == NFA_HCI_EVENT_TYPE)
   {
diff --git a/src/nfa/include/nfa_api.h b/SN100x/src/nfa/include/nfa_api.h
similarity index 100%
rename from src/nfa/include/nfa_api.h
rename to SN100x/src/nfa/include/nfa_api.h
diff --git a/src/nfa/include/nfa_ce_api.h b/SN100x/src/nfa/include/nfa_ce_api.h
similarity index 100%
rename from src/nfa/include/nfa_ce_api.h
rename to SN100x/src/nfa/include/nfa_ce_api.h
diff --git a/src/nfa/include/nfa_ce_int.h b/SN100x/src/nfa/include/nfa_ce_int.h
similarity index 100%
rename from src/nfa/include/nfa_ce_int.h
rename to SN100x/src/nfa/include/nfa_ce_int.h
diff --git a/src/nfa/include/nfa_dm_int.h b/SN100x/src/nfa/include/nfa_dm_int.h
similarity index 100%
rename from src/nfa/include/nfa_dm_int.h
rename to SN100x/src/nfa/include/nfa_dm_int.h
diff --git a/src/nfa/include/nfa_dta_int.h b/SN100x/src/nfa/include/nfa_dta_int.h
similarity index 100%
rename from src/nfa/include/nfa_dta_int.h
rename to SN100x/src/nfa/include/nfa_dta_int.h
diff --git a/src/nfa/include/nfa_ee_api.h b/SN100x/src/nfa/include/nfa_ee_api.h
similarity index 100%
rename from src/nfa/include/nfa_ee_api.h
rename to SN100x/src/nfa/include/nfa_ee_api.h
diff --git a/src/nfa/include/nfa_ee_int.h b/SN100x/src/nfa/include/nfa_ee_int.h
similarity index 100%
rename from src/nfa/include/nfa_ee_int.h
rename to SN100x/src/nfa/include/nfa_ee_int.h
diff --git a/src/nfa/include/nfa_hci_api.h b/SN100x/src/nfa/include/nfa_hci_api.h
similarity index 100%
rename from src/nfa/include/nfa_hci_api.h
rename to SN100x/src/nfa/include/nfa_hci_api.h
diff --git a/src/nfa/include/nfa_hci_defs.h b/SN100x/src/nfa/include/nfa_hci_defs.h
similarity index 100%
rename from src/nfa/include/nfa_hci_defs.h
rename to SN100x/src/nfa/include/nfa_hci_defs.h
diff --git a/src/nfa/include/nfa_hci_int.h b/SN100x/src/nfa/include/nfa_hci_int.h
similarity index 99%
rename from src/nfa/include/nfa_hci_int.h
rename to SN100x/src/nfa/include/nfa_hci_int.h
index 169736e..b426187 100644
--- a/src/nfa/include/nfa_hci_int.h
+++ b/SN100x/src/nfa/include/nfa_hci_int.h
@@ -193,7 +193,7 @@
 #if(NXP_EXTNS == TRUE)
   NFA_HCI_API_SEND_APDU_EVT,                                    /* Send Command APDU on APDU Pipe */
   NFA_HCI_API_ABORT_APDU_EVT,                                   /* Abort the Command APDU sent on APDU Pipe */
-#endif  
+#endif
   NFA_HCI_API_SEND_EVENT_EVT, /* Send event via pipe */
   NFA_HCI_RSP_NV_READ_EVT,           /* Non volatile read complete event */
   NFA_HCI_RSP_NV_WRITE_EVT,          /* Non volatile write complete event */
diff --git a/src/nfa/include/nfa_mem_co.h b/SN100x/src/nfa/include/nfa_mem_co.h
similarity index 100%
rename from src/nfa/include/nfa_mem_co.h
rename to SN100x/src/nfa/include/nfa_mem_co.h
diff --git a/src/nfa/include/nfa_nv_ci.h b/SN100x/src/nfa/include/nfa_nv_ci.h
similarity index 100%
rename from src/nfa/include/nfa_nv_ci.h
rename to SN100x/src/nfa/include/nfa_nv_ci.h
diff --git a/src/nfa/include/nfa_nv_co.h b/SN100x/src/nfa/include/nfa_nv_co.h
similarity index 100%
rename from src/nfa/include/nfa_nv_co.h
rename to SN100x/src/nfa/include/nfa_nv_co.h
diff --git a/src/nfa/include/nfa_p2p_api.h b/SN100x/src/nfa/include/nfa_p2p_api.h
similarity index 100%
rename from src/nfa/include/nfa_p2p_api.h
rename to SN100x/src/nfa/include/nfa_p2p_api.h
diff --git a/src/nfa/include/nfa_p2p_int.h b/SN100x/src/nfa/include/nfa_p2p_int.h
similarity index 100%
rename from src/nfa/include/nfa_p2p_int.h
rename to SN100x/src/nfa/include/nfa_p2p_int.h
diff --git a/src/nfa/include/nfa_rw_api.h b/SN100x/src/nfa/include/nfa_rw_api.h
similarity index 100%
rename from src/nfa/include/nfa_rw_api.h
rename to SN100x/src/nfa/include/nfa_rw_api.h
diff --git a/src/nfa/include/nfa_rw_int.h b/SN100x/src/nfa/include/nfa_rw_int.h
similarity index 100%
rename from src/nfa/include/nfa_rw_int.h
rename to SN100x/src/nfa/include/nfa_rw_int.h
diff --git a/src/nfa/include/nfa_snep_api.h b/SN100x/src/nfa/include/nfa_snep_api.h
similarity index 100%
rename from src/nfa/include/nfa_snep_api.h
rename to SN100x/src/nfa/include/nfa_snep_api.h
diff --git a/src/nfa/include/nfa_snep_int.h b/SN100x/src/nfa/include/nfa_snep_int.h
similarity index 100%
rename from src/nfa/include/nfa_snep_int.h
rename to SN100x/src/nfa/include/nfa_snep_int.h
diff --git a/src/nfa/include/nfa_sys.h b/SN100x/src/nfa/include/nfa_sys.h
similarity index 100%
rename from src/nfa/include/nfa_sys.h
rename to SN100x/src/nfa/include/nfa_sys.h
diff --git a/src/nfa/include/nfa_sys_int.h b/SN100x/src/nfa/include/nfa_sys_int.h
similarity index 100%
rename from src/nfa/include/nfa_sys_int.h
rename to SN100x/src/nfa/include/nfa_sys_int.h
diff --git a/src/nfa/include/nfa_sys_ptim.h b/SN100x/src/nfa/include/nfa_sys_ptim.h
similarity index 100%
rename from src/nfa/include/nfa_sys_ptim.h
rename to SN100x/src/nfa/include/nfa_sys_ptim.h
diff --git a/src/nfa/p2p/nfa_p2p_act.cc b/SN100x/src/nfa/p2p/nfa_p2p_act.cc
similarity index 100%
rename from src/nfa/p2p/nfa_p2p_act.cc
rename to SN100x/src/nfa/p2p/nfa_p2p_act.cc
diff --git a/src/nfa/p2p/nfa_p2p_api.cc b/SN100x/src/nfa/p2p/nfa_p2p_api.cc
similarity index 100%
rename from src/nfa/p2p/nfa_p2p_api.cc
rename to SN100x/src/nfa/p2p/nfa_p2p_api.cc
diff --git a/src/nfa/p2p/nfa_p2p_main.cc b/SN100x/src/nfa/p2p/nfa_p2p_main.cc
similarity index 100%
rename from src/nfa/p2p/nfa_p2p_main.cc
rename to SN100x/src/nfa/p2p/nfa_p2p_main.cc
diff --git a/src/nfa/rw/nfa_rw_act.cc b/SN100x/src/nfa/rw/nfa_rw_act.cc
similarity index 100%
rename from src/nfa/rw/nfa_rw_act.cc
rename to SN100x/src/nfa/rw/nfa_rw_act.cc
diff --git a/src/nfa/rw/nfa_rw_api.cc b/SN100x/src/nfa/rw/nfa_rw_api.cc
similarity index 100%
rename from src/nfa/rw/nfa_rw_api.cc
rename to SN100x/src/nfa/rw/nfa_rw_api.cc
diff --git a/src/nfa/rw/nfa_rw_main.cc b/SN100x/src/nfa/rw/nfa_rw_main.cc
similarity index 100%
rename from src/nfa/rw/nfa_rw_main.cc
rename to SN100x/src/nfa/rw/nfa_rw_main.cc
diff --git a/src/nfa/sys/nfa_sys_cback.cc b/SN100x/src/nfa/sys/nfa_sys_cback.cc
similarity index 100%
rename from src/nfa/sys/nfa_sys_cback.cc
rename to SN100x/src/nfa/sys/nfa_sys_cback.cc
diff --git a/src/nfa/sys/nfa_sys_cfg.cc b/SN100x/src/nfa/sys/nfa_sys_cfg.cc
similarity index 100%
rename from src/nfa/sys/nfa_sys_cfg.cc
rename to SN100x/src/nfa/sys/nfa_sys_cfg.cc
diff --git a/src/nfa/sys/nfa_sys_main.cc b/SN100x/src/nfa/sys/nfa_sys_main.cc
similarity index 100%
rename from src/nfa/sys/nfa_sys_main.cc
rename to SN100x/src/nfa/sys/nfa_sys_main.cc
diff --git a/src/nfa/sys/nfa_sys_ptim.cc b/SN100x/src/nfa/sys/nfa_sys_ptim.cc
similarity index 100%
rename from src/nfa/sys/nfa_sys_ptim.cc
rename to SN100x/src/nfa/sys/nfa_sys_ptim.cc
diff --git a/src/nfc/include/ce_api.h b/SN100x/src/nfc/include/ce_api.h
similarity index 100%
rename from src/nfc/include/ce_api.h
rename to SN100x/src/nfc/include/ce_api.h
diff --git a/src/nfc/include/ce_int.h b/SN100x/src/nfc/include/ce_int.h
similarity index 100%
rename from src/nfc/include/ce_int.h
rename to SN100x/src/nfc/include/ce_int.h
diff --git a/src/nfc/include/llcp_api.h b/SN100x/src/nfc/include/llcp_api.h
similarity index 100%
rename from src/nfc/include/llcp_api.h
rename to SN100x/src/nfc/include/llcp_api.h
diff --git a/src/nfc/include/llcp_defs.h b/SN100x/src/nfc/include/llcp_defs.h
similarity index 100%
rename from src/nfc/include/llcp_defs.h
rename to SN100x/src/nfc/include/llcp_defs.h
diff --git a/src/nfc/include/llcp_int.h b/SN100x/src/nfc/include/llcp_int.h
similarity index 100%
rename from src/nfc/include/llcp_int.h
rename to SN100x/src/nfc/include/llcp_int.h
diff --git a/src/nfc/include/nci_hmsgs.h b/SN100x/src/nfc/include/nci_hmsgs.h
similarity index 100%
rename from src/nfc/include/nci_hmsgs.h
rename to SN100x/src/nfc/include/nci_hmsgs.h
diff --git a/src/nfc/include/ndef_utils.h b/SN100x/src/nfc/include/ndef_utils.h
similarity index 100%
rename from src/nfc/include/ndef_utils.h
rename to SN100x/src/nfc/include/ndef_utils.h
diff --git a/src/nfc/include/nfc_api.h b/SN100x/src/nfc/include/nfc_api.h
similarity index 100%
rename from src/nfc/include/nfc_api.h
rename to SN100x/src/nfc/include/nfc_api.h
diff --git a/src/nfc/include/nfc_int.h b/SN100x/src/nfc/include/nfc_int.h
similarity index 100%
rename from src/nfc/include/nfc_int.h
rename to SN100x/src/nfc/include/nfc_int.h
diff --git a/src/nfc/include/nfc_vs.h b/SN100x/src/nfc/include/nfc_vs.h
similarity index 100%
rename from src/nfc/include/nfc_vs.h
rename to SN100x/src/nfc/include/nfc_vs.h
diff --git a/src/nfc/include/rw_api.h b/SN100x/src/nfc/include/rw_api.h
similarity index 100%
rename from src/nfc/include/rw_api.h
rename to SN100x/src/nfc/include/rw_api.h
diff --git a/src/nfc/include/rw_int.h b/SN100x/src/nfc/include/rw_int.h
similarity index 100%
rename from src/nfc/include/rw_int.h
rename to SN100x/src/nfc/include/rw_int.h
diff --git a/src/nfc/include/tags_defs.h b/SN100x/src/nfc/include/tags_defs.h
similarity index 100%
rename from src/nfc/include/tags_defs.h
rename to SN100x/src/nfc/include/tags_defs.h
diff --git a/src/nfc/include/tags_int.h b/SN100x/src/nfc/include/tags_int.h
similarity index 100%
rename from src/nfc/include/tags_int.h
rename to SN100x/src/nfc/include/tags_int.h
diff --git a/src/nfc/llcp/llcp_api.cc b/SN100x/src/nfc/llcp/llcp_api.cc
similarity index 100%
rename from src/nfc/llcp/llcp_api.cc
rename to SN100x/src/nfc/llcp/llcp_api.cc
diff --git a/src/nfc/llcp/llcp_dlc.cc b/SN100x/src/nfc/llcp/llcp_dlc.cc
similarity index 100%
rename from src/nfc/llcp/llcp_dlc.cc
rename to SN100x/src/nfc/llcp/llcp_dlc.cc
diff --git a/src/nfc/llcp/llcp_link.cc b/SN100x/src/nfc/llcp/llcp_link.cc
similarity index 100%
rename from src/nfc/llcp/llcp_link.cc
rename to SN100x/src/nfc/llcp/llcp_link.cc
diff --git a/src/nfc/llcp/llcp_main.cc b/SN100x/src/nfc/llcp/llcp_main.cc
similarity index 100%
rename from src/nfc/llcp/llcp_main.cc
rename to SN100x/src/nfc/llcp/llcp_main.cc
diff --git a/src/nfc/llcp/llcp_sdp.cc b/SN100x/src/nfc/llcp/llcp_sdp.cc
similarity index 100%
rename from src/nfc/llcp/llcp_sdp.cc
rename to SN100x/src/nfc/llcp/llcp_sdp.cc
diff --git a/src/nfc/llcp/llcp_util.cc b/SN100x/src/nfc/llcp/llcp_util.cc
similarity index 100%
rename from src/nfc/llcp/llcp_util.cc
rename to SN100x/src/nfc/llcp/llcp_util.cc
diff --git a/src/nfc/nci/nci_hmsgs.cc b/SN100x/src/nfc/nci/nci_hmsgs.cc
similarity index 100%
rename from src/nfc/nci/nci_hmsgs.cc
rename to SN100x/src/nfc/nci/nci_hmsgs.cc
diff --git a/src/nfc/nci/nci_hrcv.cc b/SN100x/src/nfc/nci/nci_hrcv.cc
similarity index 100%
rename from src/nfc/nci/nci_hrcv.cc
rename to SN100x/src/nfc/nci/nci_hrcv.cc
diff --git a/src/nfc/ndef/ndef_utils.cc b/SN100x/src/nfc/ndef/ndef_utils.cc
similarity index 100%
rename from src/nfc/ndef/ndef_utils.cc
rename to SN100x/src/nfc/ndef/ndef_utils.cc
diff --git a/src/nfc/nfc/nfc_ee.cc b/SN100x/src/nfc/nfc/nfc_ee.cc
similarity index 100%
rename from src/nfc/nfc/nfc_ee.cc
rename to SN100x/src/nfc/nfc/nfc_ee.cc
diff --git a/src/nfc/nfc/nfc_main.cc b/SN100x/src/nfc/nfc/nfc_main.cc
similarity index 100%
rename from src/nfc/nfc/nfc_main.cc
rename to SN100x/src/nfc/nfc/nfc_main.cc
diff --git a/src/nfc/nfc/nfc_ncif.cc b/SN100x/src/nfc/nfc/nfc_ncif.cc
similarity index 100%
rename from src/nfc/nfc/nfc_ncif.cc
rename to SN100x/src/nfc/nfc/nfc_ncif.cc
diff --git a/src/nfc/nfc/nfc_task.cc b/SN100x/src/nfc/nfc/nfc_task.cc
similarity index 100%
rename from src/nfc/nfc/nfc_task.cc
rename to SN100x/src/nfc/nfc/nfc_task.cc
diff --git a/src/nfc/nfc/nfc_test.cc b/SN100x/src/nfc/nfc/nfc_test.cc
similarity index 100%
rename from src/nfc/nfc/nfc_test.cc
rename to SN100x/src/nfc/nfc/nfc_test.cc
diff --git a/src/nfc/nfc/nfc_utils.cc b/SN100x/src/nfc/nfc/nfc_utils.cc
similarity index 100%
rename from src/nfc/nfc/nfc_utils.cc
rename to SN100x/src/nfc/nfc/nfc_utils.cc
diff --git a/src/nfc/nfc/nfc_vs.cc b/SN100x/src/nfc/nfc/nfc_vs.cc
similarity index 100%
rename from src/nfc/nfc/nfc_vs.cc
rename to SN100x/src/nfc/nfc/nfc_vs.cc
diff --git a/src/nfc/tags/ce_main.cc b/SN100x/src/nfc/tags/ce_main.cc
similarity index 100%
rename from src/nfc/tags/ce_main.cc
rename to SN100x/src/nfc/tags/ce_main.cc
diff --git a/src/nfc/tags/ce_t3t.cc b/SN100x/src/nfc/tags/ce_t3t.cc
similarity index 100%
rename from src/nfc/tags/ce_t3t.cc
rename to SN100x/src/nfc/tags/ce_t3t.cc
diff --git a/src/nfc/tags/ce_t4t.cc b/SN100x/src/nfc/tags/ce_t4t.cc
similarity index 100%
rename from src/nfc/tags/ce_t4t.cc
rename to SN100x/src/nfc/tags/ce_t4t.cc
diff --git a/src/nfc/tags/rw_i93.cc b/SN100x/src/nfc/tags/rw_i93.cc
similarity index 100%
rename from src/nfc/tags/rw_i93.cc
rename to SN100x/src/nfc/tags/rw_i93.cc
diff --git a/src/nfc/tags/rw_main.cc b/SN100x/src/nfc/tags/rw_main.cc
similarity index 100%
rename from src/nfc/tags/rw_main.cc
rename to SN100x/src/nfc/tags/rw_main.cc
diff --git a/src/nfc/tags/rw_t1t.cc b/SN100x/src/nfc/tags/rw_t1t.cc
similarity index 100%
rename from src/nfc/tags/rw_t1t.cc
rename to SN100x/src/nfc/tags/rw_t1t.cc
diff --git a/src/nfc/tags/rw_t1t_ndef.cc b/SN100x/src/nfc/tags/rw_t1t_ndef.cc
similarity index 100%
rename from src/nfc/tags/rw_t1t_ndef.cc
rename to SN100x/src/nfc/tags/rw_t1t_ndef.cc
diff --git a/src/nfc/tags/rw_t2t.cc b/SN100x/src/nfc/tags/rw_t2t.cc
similarity index 100%
rename from src/nfc/tags/rw_t2t.cc
rename to SN100x/src/nfc/tags/rw_t2t.cc
diff --git a/src/nfc/tags/rw_t2t_ndef.cc b/SN100x/src/nfc/tags/rw_t2t_ndef.cc
similarity index 100%
rename from src/nfc/tags/rw_t2t_ndef.cc
rename to SN100x/src/nfc/tags/rw_t2t_ndef.cc
diff --git a/src/nfc/tags/rw_t3t.cc b/SN100x/src/nfc/tags/rw_t3t.cc
similarity index 100%
rename from src/nfc/tags/rw_t3t.cc
rename to SN100x/src/nfc/tags/rw_t3t.cc
diff --git a/src/nfc/tags/rw_t4t.cc b/SN100x/src/nfc/tags/rw_t4t.cc
similarity index 100%
rename from src/nfc/tags/rw_t4t.cc
rename to SN100x/src/nfc/tags/rw_t4t.cc
diff --git a/src/nfc/tags/tags_int.cc b/SN100x/src/nfc/tags/tags_int.cc
similarity index 100%
rename from src/nfc/tags/tags_int.cc
rename to SN100x/src/nfc/tags/tags_int.cc
diff --git a/src/nfca_version.h b/SN100x/src/nfca_version.h
similarity index 100%
rename from src/nfca_version.h
rename to SN100x/src/nfca_version.h
diff --git a/utils/Android.bp b/SN100x/utils/Android.bp
similarity index 100%
rename from utils/Android.bp
rename to SN100x/utils/Android.bp
diff --git a/utils/config.cc b/SN100x/utils/config.cc
similarity index 100%
rename from utils/config.cc
rename to SN100x/utils/config.cc
diff --git a/utils/include/config.h b/SN100x/utils/include/config.h
similarity index 100%
rename from utils/include/config.h
rename to SN100x/utils/include/config.h
diff --git a/utils/include/ringbuffer.h b/SN100x/utils/include/ringbuffer.h
similarity index 100%
rename from utils/include/ringbuffer.h
rename to SN100x/utils/include/ringbuffer.h
diff --git a/utils/ringbuffer.cc b/SN100x/utils/ringbuffer.cc
similarity index 100%
rename from utils/ringbuffer.cc
rename to SN100x/utils/ringbuffer.cc
diff --git a/utils/test/config_test.cc b/SN100x/utils/test/config_test.cc
similarity index 100%
rename from utils/test/config_test.cc
rename to SN100x/utils/test/config_test.cc
diff --git a/utils/test/ringbuffer_test.cc b/SN100x/utils/test/ringbuffer_test.cc
similarity index 100%
rename from utils/test/ringbuffer_test.cc
rename to SN100x/utils/test/ringbuffer_test.cc