diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ab194ca..06baf18 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,7 +16,7 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_redfin.mk \
-    $(LOCAL_DIR)/aosp_redfin_vf.mk \
+    $(LOCAL_DIR)/vf/aosp_redfin_vf.mk \
 
 COMMON_LUNCH_CHOICES := \
     aosp_redfin-userdebug \
diff --git a/vf/OWNERS b/vf/OWNERS
new file mode 100644
index 0000000..6c5075e
--- /dev/null
+++ b/vf/OWNERS
@@ -0,0 +1,7 @@
+# Treble team for Vendor Freeze
+bpeckham@google.com
+chrisgross@google.com
+danielnorman@google.com
+inseob@google.com
+jjdemartino@google.com
+justinyun@google.com
diff --git a/aosp_redfin_vf.mk b/vf/aosp_redfin_vf.mk
similarity index 100%
rename from aosp_redfin_vf.mk
rename to vf/aosp_redfin_vf.mk