diff --git a/apkdmverity/apkverity/.cargo/config.toml b/apkdmverity/.cargo/config.toml
similarity index 100%
rename from apkdmverity/apkverity/.cargo/config.toml
rename to apkdmverity/.cargo/config.toml
diff --git a/apkdmverity/apkverity/Android.bp b/apkdmverity/Android.bp
similarity index 100%
rename from apkdmverity/apkverity/Android.bp
rename to apkdmverity/Android.bp
diff --git a/apkdmverity/apkverity/AndroidTest.xml b/apkdmverity/AndroidTest.xml
similarity index 100%
rename from apkdmverity/apkverity/AndroidTest.xml
rename to apkdmverity/AndroidTest.xml
diff --git a/apkdmverity/apkverity/Cargo.toml b/apkdmverity/Cargo.toml
similarity index 100%
rename from apkdmverity/apkverity/Cargo.toml
rename to apkdmverity/Cargo.toml
diff --git a/apkdmverity/TEST_MAPPING b/apkdmverity/TEST_MAPPING
new file mode 100644
index 00000000..997b3f9c
--- /dev/null
+++ b/apkdmverity/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "postsubmit" : [
+    {
+      "name" : "apkdmverity.test"
+    }
+  ]
+}
diff --git a/apkdmverity/apkverity/src/apksigv4.rs b/apkdmverity/src/apksigv4.rs
similarity index 100%
rename from apkdmverity/apkverity/src/apksigv4.rs
rename to apkdmverity/src/apksigv4.rs
diff --git a/apkdmverity/apkverity/src/dm.rs b/apkdmverity/src/dm.rs
similarity index 100%
rename from apkdmverity/apkverity/src/dm.rs
rename to apkdmverity/src/dm.rs
diff --git a/apkdmverity/apkverity/src/dm/sys.rs b/apkdmverity/src/dm/sys.rs
similarity index 100%
rename from apkdmverity/apkverity/src/dm/sys.rs
rename to apkdmverity/src/dm/sys.rs
diff --git a/apkdmverity/apkverity/src/dm/verity.rs b/apkdmverity/src/dm/verity.rs
similarity index 100%
rename from apkdmverity/apkverity/src/dm/verity.rs
rename to apkdmverity/src/dm/verity.rs
diff --git a/apkdmverity/apkverity/src/loopdevice.rs b/apkdmverity/src/loopdevice.rs
similarity index 100%
rename from apkdmverity/apkverity/src/loopdevice.rs
rename to apkdmverity/src/loopdevice.rs
diff --git a/apkdmverity/apkverity/src/loopdevice/sys.rs b/apkdmverity/src/loopdevice/sys.rs
similarity index 100%
rename from apkdmverity/apkverity/src/loopdevice/sys.rs
rename to apkdmverity/src/loopdevice/sys.rs
diff --git a/apkdmverity/apkverity/src/main.rs b/apkdmverity/src/main.rs
similarity index 100%
rename from apkdmverity/apkverity/src/main.rs
rename to apkdmverity/src/main.rs
diff --git a/apkdmverity/apkverity/src/util.rs b/apkdmverity/src/util.rs
similarity index 100%
rename from apkdmverity/apkverity/src/util.rs
rename to apkdmverity/src/util.rs
diff --git a/apkdmverity/apkverity/testdata/README b/apkdmverity/testdata/README
similarity index 100%
rename from apkdmverity/apkverity/testdata/README
rename to apkdmverity/testdata/README
diff --git a/apkdmverity/apkverity/testdata/keystore b/apkdmverity/testdata/keystore
similarity index 100%
rename from apkdmverity/apkverity/testdata/keystore
rename to apkdmverity/testdata/keystore
diff --git a/apkdmverity/apkverity/testdata/test.apk b/apkdmverity/testdata/test.apk
similarity index 100%
rename from apkdmverity/apkverity/testdata/test.apk
rename to apkdmverity/testdata/test.apk
diff --git a/apkdmverity/apkverity/testdata/test.apk.idsig b/apkdmverity/testdata/test.apk.idsig
similarity index 100%
rename from apkdmverity/apkverity/testdata/test.apk.idsig
rename to apkdmverity/testdata/test.apk.idsig