diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4cf8c91
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+.*~
diff --git a/wifitv.xml b/_drm_restricted.xml
similarity index 83%
rename from wifitv.xml
rename to _drm_restricted.xml
index c68d6df..59da53e 100644
--- a/wifitv.xml
+++ b/_drm_restricted.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote
-    name="gfiber-internal"
-    fetch="https://gfiber-internal.googlesource.com/"
-    review="https://gfiber-internal-review.googlesource.com/"/>
-  <default
-    remote="gfiber-internal"
-    revision="refs/heads/wifitv"
-    sync-j="12"/>
-
-  <include name="wifitv_unrestricted.xml"/>
-
   <project name="chromium"/>
   <project name="chromium/src2" path="chromium/src"/>
   <project name="chromium/src/breakpad/src"/>
   <project name="chromium/src/cast"/>
   <project name="chromium/src/chromecast/internal"/>
   <project name="chromium/src/chromecast/internal/cdm/widevine"/>
-  <project name="chromium/src/chromecast/internal/vendor/fiber"/>
   <project name="chromium/src/fiber"/>
-  <project name="chromium/src/ozone-nexus"/>
   <project name="chromium/src/sdch/open-vcdiff"/>
   <project name="chromium/src/testing/gmock"/>
   <project name="chromium/src/testing/gtest"/>
@@ -70,10 +57,6 @@
   <project name="vendor/google/glfw_nexus"/>
   <project name="vendor/google/hdcp"/>
 
-  <project name="vendor/hfw/glaukus-hal"/>
-  <project name="vendor/hfw/glaukus-linkman"/>
-  <project name="vendor/hfw/surprise_diagnostics"/>
-
   <project name="vendor/netflix/nrd"/>
 
   <project name="vendor/sagetv/miniclient"/>
diff --git a/_private.xml b/_private.xml
new file mode 100644
index 0000000..301cd88
--- /dev/null
+++ b/_private.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project name="vendor/broadcom/alsa"/>
+  <project name="vendor/broadcom/bcm851xx_api"/>
+  <project name="vendor/broadcom/cfe-bin" path="loader-bin"/>
+  <project name="vendor/broadcom/common"/>
+  <project name="vendor/broadcom/drivers"/>
+  <project name="vendor/google/channel_srv"/>
+  <project name="vendor/google/dashplayer"/>
+  <project name="vendor/google/dvbcapture"/>
+  <project name="vendor/google/freetypejni"/>
+  <project name="vendor/google/frob"/>
+  <project name="vendor/google/gcm"/>
+  <project name="vendor/google/gips"/>
+  <project name="vendor/google/gl_dart"/>
+  <project name="vendor/google/glfw_dart"/>
+  <project name="vendor/google/imageloadjni"/>
+  <project name="vendor/google/jacob100"/>
+  <project name="vendor/google/libgep"/>
+  <project name="vendor/google/mcastcapture"/>
+  <project name="vendor/google/mpegparser"/>
+  <project name="vendor/google/oregano"/>
+  <project name="vendor/google/oregano-native"/>
+  <project name="vendor/google/prism"/>
+  <project name="vendor/google/sagejni"/>
+  <project name="vendor/google/sageserver"/>
+  <project name="vendor/google/spacecast"/>
+  <project name="vendor/google/tarballs"/>
+  <project name="vendor/google/telepresence"/>
+  <project name="vendor/google/ts_check"/>
+  <project name="vendor/google/tvstreamparser"/>
+  <project name="vendor/google/widevine"/>
+  <project name="vendor/google/widevine_cenc"/>
+  <project name="vendor/google/wipg"/>
+  <project name="vendor/hfw/glaukus-hal"/>
+  <project name="vendor/hfw/glaukus-linkman"/>
+  <project name="vendor/hfw/glaukus-protobufs"/>
+  <project name="vendor/humax/bootloader"/>
+  <project name="vendor/marvell/3220sdk"/>
+  <project name="vendor/marvell/application"/>
+  <project name="vendor/marvell/cpss"/>
+  <project name="vendor/marvell/dek-tools"/>
+  <project name="vendor/marvell/manufacturing"/>
+  <project name="vendor/ookla"/>
+  <project name="vendor/opensource/backports" path="vendor/opensource/backports-quantenna" revision="refs/heads/quantenna"/>
+  <project name="vendor/opensource/hdhomerun_plugin"/>
+  <project name="vendor/opensource/hostap" path="vendor/opensource/hostapd-quantenna" revision="refs/heads/hostapd-quantenna"/>
+  <project name="vendor/opensource/hostap" path="vendor/opensource/wpa_supplicant-quantenna" revision="refs/heads/wpa_supplicant-quantenna"/>
+  <project name="vendor/qualcomm/drivers"/>
+  <project name="vendor/qualcomm/switch"/>
+  <project name="vendor/quantenna/drivers"/>
+  <project name="vendor/sagetv/pullreader"/>
+  <project name="vendor/skelmir/vm"/>
+</manifest>
diff --git a/default_unrestricted.xml b/_public.xml
similarity index 83%
rename from default_unrestricted.xml
rename to _public.xml
index c674e8b..6aca651 100644
--- a/default_unrestricted.xml
+++ b/_public.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote
-    name="origin"
-    fetch="https://gfiber.googlesource.com/"
-    review="https://gfiber-review.googlesource.com/"/>
-  <default
-    remote="origin"
-    revision="refs/heads/master"
-    sync-j="3"/>
-
   <project name="barebox/mindspeed"/>
   <project name="buildroot"/>
   <project name="kernel/bruno"/>
-  <project name="kernel/bruno" path="kernel/bruno_new" revision="refs/heads/newkernel_dev"/>
+  <project name="kernel/lockdown"/>
   <project name="kernel/mindspeed" revision="refs/heads/newkernel-4.1"/>
   <project name="kernel/mindspeed" path="kernel/mindspeed-3.2" revision="refs/heads/master"/>
   <project name="kernel/prism"/>
+  <project name="kernel/quantenna"/>
+  <project name="kernel/skids"/>
   <project name="kernel/windcharger"/>
   <project name="toolchains/armada"/>
   <project name="toolchains/bruno"/>
@@ -23,9 +16,13 @@
   <project name="toolchains/kvm"/>
   <project name="toolchains/mindspeed"/>
   <project name="toolchains/prism"/>
+  <project name="toolchains/quantenna"/>
+  <project name="toolchains/skids"/>
   <project name="toolchains/windcharger"/>
   <project name="uboot/armada"/>
+  <project name="uboot/mindspeed"/>
   <project name="uboot/prism"/>
+  <project name="uboot/qsr1000"/>
   <project name="uboot/windcharger"/>
   <project name="vendor/broadcom/bmoca"/>
   <project name="vendor/firmware"/>
@@ -44,8 +41,11 @@
   <project name="vendor/opensource/dial"/>
   <project name="vendor/opensource/dnsmasq"/>
   <project name="vendor/opensource/fallocate"/>
+  <project name="vendor/opensource/ffmpeg"/>
   <project name="vendor/opensource/hostap"/>
   <project name="vendor/opensource/libjingle"/>
+  <project name="vendor/opensource/netsnmp"/>
+  <project name="vendor/opensource/pf_ring"/>
   <project name="vendor/opensource/projectM"/>
   <project name="vendor/opensource/tarballs"/>
   <project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
diff --git a/_url.xml b/_url.xml
new file mode 100644
index 0000000..2c13701
--- /dev/null
+++ b/_url.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote
+    name="origin"
+    fetch="https://gfiber.googlesource.com/"
+    review="https://gfiber-review.googlesource.com/"/>
+  <default
+    remote="origin"
+    revision="refs/heads/master"
+    sync-j="3"/>
+</manifest>
diff --git a/default.xml b/default.xml
index bcb7685..97644f7 100644
--- a/default.xml
+++ b/default.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <include name="default_unrestricted.xml"/>
+  <include name="openbox.xml"/>
 </manifest>
diff --git a/drm.xml b/drm.xml
new file mode 100644
index 0000000..38c6f55
--- /dev/null
+++ b/drm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <include name="_url.xml"/>
+  <include name="_public.xml"/>
+  <include name="_private.xml"/>
+  <include name="_drm_restricted.xml"/>
+</manifest>
diff --git a/no-drm.xml b/no-drm.xml
new file mode 100644
index 0000000..abf8610
--- /dev/null
+++ b/no-drm.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <include name="_url.xml"/>
+  <include name="_public.xml"/>
+  <include name="_private.xml"/>
+</manifest>
diff --git a/openbox.xml b/openbox.xml
new file mode 100644
index 0000000..a78da64
--- /dev/null
+++ b/openbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <include name="_url.xml"/>
+  <include name="_public.xml"/>
+</manifest>
diff --git a/release.xml b/release.xml
new file mode 100644
index 0000000..acc6b50
--- /dev/null
+++ b/release.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <include name="_url.xml"/>
+  <include name="_public.xml"/>
+  <include name="_private.xml"/>
+  <include name="_drm_restricted.xml"/>
+
+  <project name="vendor/broadcom/bolt"/>
+  <project name="vendor/broadcom/cfe"/>
+</manifest>
diff --git a/wifitv_unrestricted.xml b/wifitv_unrestricted.xml
deleted file mode 100644
index b3dc0fd..0000000
--- a/wifitv_unrestricted.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote
-    name="gfiber-internal"
-    fetch="https://gfiber-internal.googlesource.com/"
-    review="https://gfiber-internal-review.googlesource.com/"/>
-  <default
-    remote="gfiber-internal"
-    revision="refs/heads/wifitv"
-    sync-j="12"/>
-  <manifest-server
-    url="http://gfiber-buildbot.cbf.corp.google.com:8080/"/>
-
-  <project name="barebox/mindspeed"/>
-  <project name="buildroot"/>
-  <project name="kernel/bruno"/>
-  <project name="kernel/bruno" path="kernel/bruno_arm" revision="refs/heads/wifitv_bruno_arm"/>
-  <project name="kernel/bruno" path="kernel/bruno_new" revision="refs/heads/wifitv_newkernel_dev"/>
-  <project name="kernel/mindspeed" revision="refs/heads/wifitv_newkernel-4.1"/>
-  <project name="kernel/mindspeed" path="kernel/mindspeed-3.2" revision="refs/heads/wifitv"/>
-  <project name="kernel/prism"/>
-  <project name="kernel/skids"/>
-  <project name="kernel/windcharger"/>
-  <project name="toolchains/armada"/>
-  <project name="toolchains/bruno"/>
-  <project name="toolchains/bruno_arm"/>
-  <project name="toolchains/kvm"/>
-  <project name="toolchains/mindspeed"/>
-  <project name="toolchains/prism"/>
-  <project name="toolchains/skids"/>
-  <project name="toolchains/windcharger"/>
-  <project name="uboot/armada"/>
-  <project name="uboot/mindspeed"/>
-  <project name="uboot/prism"/>
-  <project name="uboot/windcharger"/>
-  <project name="vendor/broadcom/alsa"/>
-  <project name="vendor/broadcom/bmoca"/>
-  <project name="vendor/broadcom/cfe-bin" path="loader-bin"/>
-  <project name="vendor/broadcom/common"/>
-  <project name="vendor/broadcom/drivers"/>
-  <project name="vendor/firmware"/>
-  <project name="vendor/google/catawampus"/>
-  <project name="vendor/google/channel_srv"/>
-  <project name="vendor/google/dvbcapture"/>
-  <project name="vendor/google/freetypejni"/>
-  <project name="vendor/google/frob"/>
-  <project name="vendor/google/gips"/>
-  <project name="vendor/google/gl_dart"/>
-  <project name="vendor/google/glfw_dart"/>
-  <project name="vendor/google/imageloadjni"/>
-  <project name="vendor/google/jacob100"/>
-  <project name="vendor/google/jtux"/>
-  <project name="vendor/google/libgep"/>
-  <project name="vendor/google/mcastcapture"/>
-  <project name="vendor/google/mpegparser"/>
-  <project name="vendor/google/oregano"/>
-  <project name="vendor/google/platform"/>
-  <project name="vendor/google/prism"/>
-  <project name="vendor/google/sagejni"/>
-  <project name="vendor/google/sageserver"/>
-  <project name="vendor/google/sdr"/>
-  <project name="vendor/google/spacecast"/>
-  <project name="vendor/google/swscale"/>
-  <project name="vendor/google/tarballs"/>
-  <project name="vendor/google/telepresence"/>
-  <project name="vendor/google/test"/>
-  <project name="vendor/google/ts_check"/>
-  <project name="vendor/google/tvstreamparser"/>
-  <project name="vendor/google/widevine"/>
-  <project name="vendor/google/widevine_cenc"/>
-  <project name="vendor/humax/bootloader"/>
-  <project name="vendor/humax/misc"/>
-  <project name="vendor/marvell/application"/>
-  <project name="vendor/marvell/cpss"/>
-  <project name="vendor/marvell/manufacturing"/>
-  <project name="vendor/mindspeed/drivers" revision="refs/heads/wifitv_newkernel-4.1"/>
-  <project name="vendor/mindspeed/drivers" path="vendor/mindspeed/drivers-3.2" revision="refs/heads/wifitv"/>
-  <project name="vendor/ookla"/>
-  <project name="vendor/opensource/backports"/>
-  <project name="vendor/opensource/backports" path="vendor/opensource/backports-quantenna" revision="refs/heads/quantenna"/>
-  <project name="vendor/opensource/bluez"/>
-  <project name="vendor/opensource/dial"/>
-  <project name="vendor/opensource/dnsmasq"/>
-  <project name="vendor/opensource/fallocate"/>
-  <project name="vendor/opensource/ffmpeg"/>
-  <project name="vendor/opensource/hdhomerun_plugin"/>
-  <project name="vendor/opensource/hostap"/>
-  <project name="vendor/opensource/hostap" path="vendor/opensource/hostapd-quantenna" revision="refs/heads/hostapd-quantenna"/>
-  <project name="vendor/opensource/hostap" path="vendor/opensource/wpa_supplicant-quantenna" revision="refs/heads/wpa_supplicant-quantenna"/>
-  <project name="vendor/opensource/libjingle"/>
-  <project name="vendor/opensource/pf_ring"/>
-  <project name="vendor/opensource/projectM"/>
-  <project name="vendor/opensource/tarballs"/>
-  <project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
-  <project name="vendor/opensource/webrtc"/>
-  <project name="vendor/qualcomm/drivers"/>
-  <project name="vendor/qualcomm/switch"/>
-  <project name="vendor/quantenna/drivers"/>
-  <project name="vendor/sagetv/pullreader"/>
-  <project name="vendor/skelmir/vm"/>
-</manifest>