diff --git a/vibrator/hidl/__init__.py b/vibrator/V1_0/__init__.py
similarity index 100%
rename from vibrator/hidl/__init__.py
rename to vibrator/V1_0/__init__.py
diff --git a/vibrator/hidl/host/Android.mk b/vibrator/V1_0/host/Android.mk
similarity index 92%
rename from vibrator/hidl/host/Android.mk
rename to vibrator/V1_0/host/Android.mk
index d005450..972fd33 100644
--- a/vibrator/hidl/host/Android.mk
+++ b/vibrator/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VibratorHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/host
 include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/vibrator/hidl/host/AndroidTest.xml b/vibrator/V1_0/host/AndroidTest.xml
similarity index 97%
rename from vibrator/hidl/host/AndroidTest.xml
rename to vibrator/V1_0/host/AndroidTest.xml
index c5074ee..f69e4d6 100644
--- a/vibrator/hidl/host/AndroidTest.xml
+++ b/vibrator/V1_0/host/AndroidTest.xml
@@ -23,6 +23,6 @@
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VibratorHidlTest" />
-        <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
+        <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VibratorHidlTest" />
     </test>
 </configuration>
diff --git a/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/V1_0/host/VibratorHidlTest.py
similarity index 100%
rename from vibrator/hidl/host/VibratorHidlTest.py
rename to vibrator/V1_0/host/VibratorHidlTest.py
diff --git a/vibrator/hidl/host/__init__.py b/vibrator/V1_0/host/__init__.py
similarity index 100%
rename from vibrator/hidl/host/__init__.py
rename to vibrator/V1_0/host/__init__.py
diff --git a/vibrator/hidl/host_profiling/Android.mk b/vibrator/V1_0/host_profiling/Android.mk
similarity index 91%
rename from vibrator/hidl/host_profiling/Android.mk
rename to vibrator/V1_0/host_profiling/Android.mk
index ec73e06..84e1d37 100644
--- a/vibrator/hidl/host_profiling/Android.mk
+++ b/vibrator/V1_0/host_profiling/Android.mk
@@ -19,5 +19,5 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VibratorHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/host_profiling
 include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/host_profiling/AndroidTest.xml b/vibrator/V1_0/host_profiling/AndroidTest.xml
similarity index 97%
rename from vibrator/hidl/host_profiling/AndroidTest.xml
rename to vibrator/V1_0/host_profiling/AndroidTest.xml
index 54830f0..d808c96 100644
--- a/vibrator/hidl/host_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/host_profiling/AndroidTest.xml
@@ -23,7 +23,7 @@
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VibratorHidlProfilingTest" />
-        <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
+        <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VibratorHidlTest" />
         <option name="enable-profiling" value="true" />
     </test>
 </configuration>
diff --git a/vibrator/hidl/target/Android.mk b/vibrator/V1_0/target/Android.mk
similarity index 93%
rename from vibrator/hidl/target/Android.mk
rename to vibrator/V1_0/target/Android.mk
index 704d985..a2dd029 100644
--- a/vibrator/hidl/target/Android.mk
+++ b/vibrator/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VibratorHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/target
 include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/target/AndroidTest.xml b/vibrator/V1_0/target/AndroidTest.xml
similarity index 99%
rename from vibrator/hidl/target/AndroidTest.xml
rename to vibrator/V1_0/target/AndroidTest.xml
index 7948c86..8af9467 100644
--- a/vibrator/hidl/target/AndroidTest.xml
+++ b/vibrator/V1_0/target/AndroidTest.xml
@@ -28,4 +28,3 @@
         <option name="test-timeout" value="1m" />
     </test>
 </configuration>
-
diff --git a/vibrator/hidl/target_profiling/Android.mk b/vibrator/V1_0/target_profiling/Android.mk
similarity index 92%
rename from vibrator/hidl/target_profiling/Android.mk
rename to vibrator/V1_0/target_profiling/Android.mk
index a1f43e4..acddc13 100644
--- a/vibrator/hidl/target_profiling/Android.mk
+++ b/vibrator/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := VibratorHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/target_profiling
 include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/target_profiling/AndroidTest.xml b/vibrator/V1_0/target_profiling/AndroidTest.xml
similarity index 99%
rename from vibrator/hidl/target_profiling/AndroidTest.xml
rename to vibrator/V1_0/target_profiling/AndroidTest.xml
index 4643e23..5256f73 100644
--- a/vibrator/hidl/target_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/target_profiling/AndroidTest.xml
@@ -29,4 +29,3 @@
         <option name="enable-profiling" value="true" />
     </test>
 </configuration>
-
diff --git a/vibrator/hidl/Android.mk b/vibrator/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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 $(call all-subdir-makefiles)