diff --git a/ble/Android.mk b/Android.mk
similarity index 91%
rename from ble/Android.mk
rename to Android.mk
index 7160fb1..d62bb88 100644
--- a/ble/Android.mk
+++ b/Android.mk
@@ -18,6 +18,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsNbuBle
-VTS_CONFIG_SRC_DIR := testcases/nbu/ble
+LOCAL_MODULE := VtsNbu
+VTS_CONFIG_SRC_DIR := testcases/nbu
 -include test/vts/tools/build/Android.host_config.mk
diff --git a/AndroidTest.xml b/AndroidTest.xml
new file mode 100644
index 0000000..c648cf9
--- /dev/null
+++ b/AndroidTest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Config for VTS Next Billion User test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+        <option name="dep-module" value="mobly==1.7.1" />
+    </multi_target_preparer>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuBle" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.ble_test.BleTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuBluetooth" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.bluetooth_test.BluetoothTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuLocalHotspot" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.local_hotspot_test.LocalHotspotTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuWifiDirect" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.wifi_direct_test.WifiDirectTest" />
+    </test>
+</configuration>
diff --git a/ble/AndroidTest.xml b/ble/AndroidTest.xml
deleted file mode 100644
index 3450fb4..0000000
--- a/ble/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS Next Billion User Bluetooth Low Energy test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
-        <option name="dep-module" value="mobly==1.7.1" />
-    </multi_target_preparer>
-
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsNbuBle" />
-        <option name="test-timeout" value="10m" />
-        <option name="runtime-hint" value="3m" />
-        <option name="test-case-path" value="vts/testcases/nbu/ble/Ble" />
-    </test>
-</configuration>
diff --git a/ble/Ble.py b/ble/Ble.py
deleted file mode 100644
index bfa6295..0000000
--- a/ble/Ble.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from vts.runners.host import test_runner
-
-from vts.testcases.template.mobly.mobly_test import MoblyTest
-from vts.testcases.nbu.src.ble_test import BleTest
-
-
-if __name__ == "__main__":
-    test_runner.main()
\ No newline at end of file
diff --git a/ble/__init__.py b/ble/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/ble/__init__.py
+++ /dev/null
diff --git a/bluetooth/Android.mk b/bluetooth/Android.mk
deleted file mode 100644
index ab0fd3c..0000000
--- a/bluetooth/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsNbuBluetooth
-VTS_CONFIG_SRC_DIR := testcases/nbu/bluetooth
--include test/vts/tools/build/Android.host_config.mk
diff --git a/bluetooth/AndroidTest.xml b/bluetooth/AndroidTest.xml
deleted file mode 100644
index 689f4e8..0000000
--- a/bluetooth/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS Next Billion User Bluetooth test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
-        <option name="dep-module" value="mobly==1.7.1" />
-    </multi_target_preparer>
-
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsNbuBluetooth" />
-        <option name="test-timeout" value="10m" />
-        <option name="runtime-hint" value="1m" />
-        <option name="test-case-path" value="vts/testcases/nbu/bluetooth/Bluetooth" />
-    </test>
-</configuration>
diff --git a/bluetooth/Bluetooth.py b/bluetooth/Bluetooth.py
deleted file mode 100644
index 2b094ae..0000000
--- a/bluetooth/Bluetooth.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from vts.runners.host import test_runner
-
-from vts.testcases.template.mobly.mobly_test import MoblyTest
-from vts.testcases.nbu.src.bluetooth_test import BluetoothTest
-
-
-if __name__ == "__main__":
-    test_runner.main()
\ No newline at end of file
diff --git a/bluetooth/__init__.py b/bluetooth/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/bluetooth/__init__.py
+++ /dev/null