diff --git a/builds/crouton-master-jammy/init b/builds/crouton-master-jammy/init
deleted file mode 100644
index 8b1378917..000000000
--- a/builds/crouton-master-jammy/init
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/builds/crouton-master-jammy/testC b/builds/crouton-master-jammy/testC
deleted file mode 100755
index 75e65b0a2..000000000
Binary files a/builds/crouton-master-jammy/testC and /dev/null differ
diff --git a/builds/crouton-master-jammy/.github/CONTRIBUTING.md b/builds/crouton-master/.github/CONTRIBUTING.md
similarity index 100%
rename from builds/crouton-master-jammy/.github/CONTRIBUTING.md
rename to builds/crouton-master/.github/CONTRIBUTING.md
diff --git a/builds/crouton-master-jammy/.github/ISSUE_TEMPLATE.md b/builds/crouton-master/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from builds/crouton-master-jammy/.github/ISSUE_TEMPLATE.md
rename to builds/crouton-master/.github/ISSUE_TEMPLATE.md
diff --git a/builds/crouton-master-jammy/.gitignore b/builds/crouton-master/.gitignore
similarity index 100%
rename from builds/crouton-master-jammy/.gitignore
rename to builds/crouton-master/.gitignore
diff --git a/builds/crouton-master-jammy/AUTHORS b/builds/crouton-master/AUTHORS
similarity index 100%
rename from builds/crouton-master-jammy/AUTHORS
rename to builds/crouton-master/AUTHORS
diff --git a/builds/crouton-master-jammy/CONTRIBUTORS b/builds/crouton-master/CONTRIBUTORS
similarity index 100%
rename from builds/crouton-master-jammy/CONTRIBUTORS
rename to builds/crouton-master/CONTRIBUTORS
diff --git a/builds/crouton-master-jammy/LICENSE b/builds/crouton-master/LICENSE
similarity index 100%
rename from builds/crouton-master-jammy/LICENSE
rename to builds/crouton-master/LICENSE
diff --git a/builds/crouton-master-jammy/Makefile b/builds/crouton-master/Makefile
similarity index 100%
rename from builds/crouton-master-jammy/Makefile
rename to builds/crouton-master/Makefile
diff --git a/builds/crouton-master-jammy/README.md b/builds/crouton-master/README.md
similarity index 100%
rename from builds/crouton-master-jammy/README.md
rename to builds/crouton-master/README.md
diff --git a/builds/crouton-master-jammy/README.zh.md b/builds/crouton-master/README.zh.md
similarity index 100%
rename from builds/crouton-master-jammy/README.zh.md
rename to builds/crouton-master/README.zh.md
diff --git a/builds/crouton-master-jammy/build/CONTRIBUTORS.sed b/builds/crouton-master/build/CONTRIBUTORS.sed
similarity index 100%
rename from builds/crouton-master-jammy/build/CONTRIBUTORS.sed
rename to builds/crouton-master/build/CONTRIBUTORS.sed
diff --git a/builds/crouton-master-jammy/build/genversion.sh b/builds/crouton-master/build/genversion.sh
similarity index 100%
rename from builds/crouton-master-jammy/build/genversion.sh
rename to builds/crouton-master/build/genversion.sh
diff --git a/builds/crouton-master-jammy/build/release.sh b/builds/crouton-master/build/release.sh
similarity index 100%
rename from builds/crouton-master-jammy/build/release.sh
rename to builds/crouton-master/build/release.sh
diff --git a/builds/crouton-master-jammy/build/wrapper.sh b/builds/crouton-master/build/wrapper.sh
similarity index 100%
rename from builds/crouton-master-jammy/build/wrapper.sh
rename to builds/crouton-master/build/wrapper.sh
diff --git a/builds/crouton-master-jammy/chroot-bin/brightness b/builds/crouton-master/chroot-bin/brightness
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/brightness
rename to builds/crouton-master/chroot-bin/brightness
diff --git a/builds/crouton-master-jammy/chroot-bin/crouton-noroot b/builds/crouton-master/chroot-bin/crouton-noroot
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/crouton-noroot
rename to builds/crouton-master/chroot-bin/crouton-noroot
diff --git a/builds/crouton-master-jammy/chroot-bin/crouton-unity-autostart b/builds/crouton-master/chroot-bin/crouton-unity-autostart
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/crouton-unity-autostart
rename to builds/crouton-master/chroot-bin/crouton-unity-autostart
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonclip b/builds/crouton-master/chroot-bin/croutonclip
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonclip
rename to builds/crouton-master/chroot-bin/croutonclip
diff --git a/builds/crouton-master-jammy/chroot-bin/croutoncycle b/builds/crouton-master/chroot-bin/croutoncycle
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutoncycle
rename to builds/crouton-master/chroot-bin/croutoncycle
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonfindnacl b/builds/crouton-master/chroot-bin/croutonfindnacl
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonfindnacl
rename to builds/crouton-master/chroot-bin/croutonfindnacl
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonnotify b/builds/crouton-master/chroot-bin/croutonnotify
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonnotify
rename to builds/crouton-master/chroot-bin/croutonnotify
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonpowerd b/builds/crouton-master/chroot-bin/croutonpowerd
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonpowerd
rename to builds/crouton-master/chroot-bin/croutonpowerd
diff --git a/builds/crouton-master-jammy/chroot-bin/croutontriggerd b/builds/crouton-master/chroot-bin/croutontriggerd
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutontriggerd
rename to builds/crouton-master/chroot-bin/croutontriggerd
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonurlhandler b/builds/crouton-master/chroot-bin/croutonurlhandler
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonurlhandler
rename to builds/crouton-master/chroot-bin/croutonurlhandler
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonversion b/builds/crouton-master/chroot-bin/croutonversion
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonversion
rename to builds/crouton-master/chroot-bin/croutonversion
diff --git a/builds/crouton-master-jammy/chroot-bin/croutonxinitrc-wrapper b/builds/crouton-master/chroot-bin/croutonxinitrc-wrapper
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/croutonxinitrc-wrapper
rename to builds/crouton-master/chroot-bin/croutonxinitrc-wrapper
diff --git a/builds/crouton-master-jammy/chroot-bin/gnome-session-wrapper b/builds/crouton-master/chroot-bin/gnome-session-wrapper
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/gnome-session-wrapper
rename to builds/crouton-master/chroot-bin/gnome-session-wrapper
diff --git a/builds/crouton-master-jammy/chroot-bin/host-dbus b/builds/crouton-master/chroot-bin/host-dbus
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/host-dbus
rename to builds/crouton-master/chroot-bin/host-dbus
diff --git a/builds/crouton-master-jammy/chroot-bin/host-wayland b/builds/crouton-master/chroot-bin/host-wayland
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/host-wayland
rename to builds/crouton-master/chroot-bin/host-wayland
diff --git a/builds/crouton-master-jammy/chroot-bin/setres b/builds/crouton-master/chroot-bin/setres
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/setres
rename to builds/crouton-master/chroot-bin/setres
diff --git a/builds/crouton-master-jammy/chroot-bin/startgnome b/builds/crouton-master/chroot-bin/startgnome
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/startgnome
rename to builds/crouton-master/chroot-bin/startgnome
diff --git a/builds/crouton-master-jammy/chroot-bin/startkde b/builds/crouton-master/chroot-bin/startkde
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/startkde
rename to builds/crouton-master/chroot-bin/startkde
diff --git a/builds/crouton-master-jammy/chroot-bin/startlxde b/builds/crouton-master/chroot-bin/startlxde
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/startlxde
rename to builds/crouton-master/chroot-bin/startlxde
diff --git a/builds/crouton-master-jammy/chroot-bin/startunity b/builds/crouton-master/chroot-bin/startunity
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/startunity
rename to builds/crouton-master/chroot-bin/startunity
diff --git a/builds/crouton-master-jammy/chroot-bin/startxfce4 b/builds/crouton-master/chroot-bin/startxfce4
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/startxfce4
rename to builds/crouton-master/chroot-bin/startxfce4
diff --git a/builds/crouton-master-jammy/chroot-bin/volume b/builds/crouton-master/chroot-bin/volume
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/volume
rename to builds/crouton-master/chroot-bin/volume
diff --git a/builds/crouton-master-jammy/chroot-bin/xinit b/builds/crouton-master/chroot-bin/xinit
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/xinit
rename to builds/crouton-master/chroot-bin/xinit
diff --git a/builds/crouton-master-jammy/chroot-bin/xiwi b/builds/crouton-master/chroot-bin/xiwi
similarity index 100%
rename from builds/crouton-master-jammy/chroot-bin/xiwi
rename to builds/crouton-master/chroot-bin/xiwi
diff --git a/builds/crouton-master-jammy/chroot-etc/kodi-cycle.py b/builds/crouton-master/chroot-etc/kodi-cycle.py
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/kodi-cycle.py
rename to builds/crouton-master/chroot-etc/kodi-cycle.py
diff --git a/builds/crouton-master-jammy/chroot-etc/kodi-keyboard.xml b/builds/crouton-master/chroot-etc/kodi-keyboard.xml
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/kodi-keyboard.xml
rename to builds/crouton-master/chroot-etc/kodi-keyboard.xml
diff --git a/builds/crouton-master-jammy/chroot-etc/pulseaudio-default.pa b/builds/crouton-master/chroot-etc/pulseaudio-default.pa
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/pulseaudio-default.pa
rename to builds/crouton-master/chroot-etc/pulseaudio-default.pa
diff --git a/builds/crouton-master-jammy/chroot-etc/unity-autostart.desktop b/builds/crouton-master/chroot-etc/unity-autostart.desktop
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/unity-autostart.desktop
rename to builds/crouton-master/chroot-etc/unity-autostart.desktop
diff --git a/builds/crouton-master-jammy/chroot-etc/unity-profiled b/builds/crouton-master/chroot-etc/unity-profiled
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/unity-profiled
rename to builds/crouton-master/chroot-etc/unity-profiled
diff --git a/builds/crouton-master-jammy/chroot-etc/xbindkeysrc.scm b/builds/crouton-master/chroot-etc/xbindkeysrc.scm
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xbindkeysrc.scm
rename to builds/crouton-master/chroot-etc/xbindkeysrc.scm
diff --git a/builds/crouton-master-jammy/chroot-etc/xiwi.conf b/builds/crouton-master/chroot-etc/xiwi.conf
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xiwi.conf
rename to builds/crouton-master/chroot-etc/xiwi.conf
diff --git a/builds/crouton-master-jammy/chroot-etc/xorg-dummy.conf b/builds/crouton-master/chroot-etc/xorg-dummy.conf
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xorg-dummy.conf
rename to builds/crouton-master/chroot-etc/xorg-dummy.conf
diff --git a/builds/crouton-master-jammy/chroot-etc/xorg-intel-sna.conf b/builds/crouton-master/chroot-etc/xorg-intel-sna.conf
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xorg-intel-sna.conf
rename to builds/crouton-master/chroot-etc/xorg-intel-sna.conf
diff --git a/builds/crouton-master-jammy/chroot-etc/xserverrc b/builds/crouton-master/chroot-etc/xserverrc
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xserverrc
rename to builds/crouton-master/chroot-etc/xserverrc
diff --git a/builds/crouton-master-jammy/chroot-etc/xserverrc-local.example b/builds/crouton-master/chroot-etc/xserverrc-local.example
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xserverrc-local.example
rename to builds/crouton-master/chroot-etc/xserverrc-local.example
diff --git a/builds/crouton-master-jammy/chroot-etc/xserverrc-xiwi b/builds/crouton-master/chroot-etc/xserverrc-xiwi
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xserverrc-xiwi
rename to builds/crouton-master/chroot-etc/xserverrc-xiwi
diff --git a/builds/crouton-master-jammy/chroot-etc/xserverrc-xorg b/builds/crouton-master/chroot-etc/xserverrc-xorg
similarity index 100%
rename from builds/crouton-master-jammy/chroot-etc/xserverrc-xorg
rename to builds/crouton-master/chroot-etc/xserverrc-xorg
diff --git a/builds/crouton-master-jammy/gutsy b/builds/crouton-master/gutsy
similarity index 100%
rename from builds/crouton-master-jammy/gutsy
rename to builds/crouton-master/gutsy
diff --git a/builds/crouton-master-jammy/host-bin/crash_reporter_wrapper b/builds/crouton-master/host-bin/crash_reporter_wrapper
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/crash_reporter_wrapper
rename to builds/crouton-master/host-bin/crash_reporter_wrapper
diff --git a/builds/crouton-master-jammy/host-bin/delete-chroot b/builds/crouton-master/host-bin/delete-chroot
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/delete-chroot
rename to builds/crouton-master/host-bin/delete-chroot
diff --git a/builds/crouton-master-jammy/host-bin/edit-chroot b/builds/crouton-master/host-bin/edit-chroot
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/edit-chroot
rename to builds/crouton-master/host-bin/edit-chroot
diff --git a/builds/crouton-master-jammy/host-bin/enter-chroot b/builds/crouton-master/host-bin/enter-chroot
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/enter-chroot
rename to builds/crouton-master/host-bin/enter-chroot
diff --git a/builds/crouton-master-jammy/host-bin/mount-chroot b/builds/crouton-master/host-bin/mount-chroot
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/mount-chroot
rename to builds/crouton-master/host-bin/mount-chroot
diff --git a/builds/crouton-master-jammy/host-bin/startcli b/builds/crouton-master/host-bin/startcli
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startcli
rename to builds/crouton-master/host-bin/startcli
diff --git a/builds/crouton-master-jammy/host-bin/starte17 b/builds/crouton-master/host-bin/starte17
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/starte17
rename to builds/crouton-master/host-bin/starte17
diff --git a/builds/crouton-master-jammy/host-bin/startgnome b/builds/crouton-master/host-bin/startgnome
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startgnome
rename to builds/crouton-master/host-bin/startgnome
diff --git a/builds/crouton-master-jammy/host-bin/startkde b/builds/crouton-master/host-bin/startkde
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startkde
rename to builds/crouton-master/host-bin/startkde
diff --git a/builds/crouton-master-jammy/host-bin/startkodi b/builds/crouton-master/host-bin/startkodi
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startkodi
rename to builds/crouton-master/host-bin/startkodi
diff --git a/builds/crouton-master-jammy/host-bin/startlxde b/builds/crouton-master/host-bin/startlxde
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startlxde
rename to builds/crouton-master/host-bin/startlxde
diff --git a/builds/crouton-master-jammy/host-bin/startunity b/builds/crouton-master/host-bin/startunity
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startunity
rename to builds/crouton-master/host-bin/startunity
diff --git a/builds/crouton-master-jammy/host-bin/startxfce4 b/builds/crouton-master/host-bin/startxfce4
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startxfce4
rename to builds/crouton-master/host-bin/startxfce4
diff --git a/builds/crouton-master-jammy/host-bin/startxiwi b/builds/crouton-master/host-bin/startxiwi
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/startxiwi
rename to builds/crouton-master/host-bin/startxiwi
diff --git a/builds/crouton-master-jammy/host-bin/unmount-chroot b/builds/crouton-master/host-bin/unmount-chroot
similarity index 100%
rename from builds/crouton-master-jammy/host-bin/unmount-chroot
rename to builds/crouton-master/host-bin/unmount-chroot
diff --git a/builds/crouton-master-jammy/host-ext/.gitignore b/builds/crouton-master/host-ext/.gitignore
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/.gitignore
rename to builds/crouton-master/host-ext/.gitignore
diff --git a/builds/crouton-master-jammy/host-ext/crouton/background.html b/builds/crouton-master/host-ext/crouton/background.html
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/background.html
rename to builds/crouton-master/host-ext/crouton/background.html
diff --git a/builds/crouton-master-jammy/host-ext/crouton/background.js b/builds/crouton-master/host-ext/crouton/background.js
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/background.js
rename to builds/crouton-master/host-ext/crouton/background.js
diff --git a/builds/crouton-master-jammy/host-ext/crouton/connected-19.png b/builds/crouton-master/host-ext/crouton/connected-19.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/connected-19.png
rename to builds/crouton-master/host-ext/crouton/connected-19.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/connected-38.png b/builds/crouton-master/host-ext/crouton/connected-38.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/connected-38.png
rename to builds/crouton-master/host-ext/crouton/connected-38.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/disabled-19.png b/builds/crouton-master/host-ext/crouton/disabled-19.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/disabled-19.png
rename to builds/crouton-master/host-ext/crouton/disabled-19.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/disabled-38.png b/builds/crouton-master/host-ext/crouton/disabled-38.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/disabled-38.png
rename to builds/crouton-master/host-ext/crouton/disabled-38.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/disconnected-19.png b/builds/crouton-master/host-ext/crouton/disconnected-19.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/disconnected-19.png
rename to builds/crouton-master/host-ext/crouton/disconnected-19.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/disconnected-38.png b/builds/crouton-master/host-ext/crouton/disconnected-38.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/disconnected-38.png
rename to builds/crouton-master/host-ext/crouton/disconnected-38.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/error-19.png b/builds/crouton-master/host-ext/crouton/error-19.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/error-19.png
rename to builds/crouton-master/host-ext/crouton/error-19.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/error-38.png b/builds/crouton-master/host-ext/crouton/error-38.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/error-38.png
rename to builds/crouton-master/host-ext/crouton/error-38.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/first.html b/builds/crouton-master/host-ext/crouton/first.html
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/first.html
rename to builds/crouton-master/host-ext/crouton/first.html
diff --git a/builds/crouton-master-jammy/host-ext/crouton/icon-128.png b/builds/crouton-master/host-ext/crouton/icon-128.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/icon-128.png
rename to builds/crouton-master/host-ext/crouton/icon-128.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/icon-48.png b/builds/crouton-master/host-ext/crouton/icon-48.png
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/icon-48.png
rename to builds/crouton-master/host-ext/crouton/icon-48.png
diff --git a/builds/crouton-master-jammy/host-ext/crouton/kiwi.nmf b/builds/crouton-master/host-ext/crouton/kiwi.nmf
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/kiwi.nmf
rename to builds/crouton-master/host-ext/crouton/kiwi.nmf
diff --git a/builds/crouton-master-jammy/host-ext/crouton/manifest.json b/builds/crouton-master/host-ext/crouton/manifest.json
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/manifest.json
rename to builds/crouton-master/host-ext/crouton/manifest.json
diff --git a/builds/crouton-master-jammy/host-ext/crouton/popup.html b/builds/crouton-master/host-ext/crouton/popup.html
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/popup.html
rename to builds/crouton-master/host-ext/crouton/popup.html
diff --git a/builds/crouton-master-jammy/host-ext/crouton/popup.js b/builds/crouton-master/host-ext/crouton/popup.js
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/popup.js
rename to builds/crouton-master/host-ext/crouton/popup.js
diff --git a/builds/crouton-master-jammy/host-ext/crouton/window.html b/builds/crouton-master/host-ext/crouton/window.html
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/window.html
rename to builds/crouton-master/host-ext/crouton/window.html
diff --git a/builds/crouton-master-jammy/host-ext/crouton/window.js b/builds/crouton-master/host-ext/crouton/window.js
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/crouton/window.js
rename to builds/crouton-master/host-ext/crouton/window.js
diff --git a/builds/crouton-master-jammy/host-ext/gencrx.sh b/builds/crouton-master/host-ext/gencrx.sh
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/gencrx.sh
rename to builds/crouton-master/host-ext/gencrx.sh
diff --git a/builds/crouton-master-jammy/host-ext/logo.svg b/builds/crouton-master/host-ext/logo.svg
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/logo.svg
rename to builds/crouton-master/host-ext/logo.svg
diff --git a/builds/crouton-master-jammy/host-ext/nacl_src/.gitignore b/builds/crouton-master/host-ext/nacl_src/.gitignore
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/nacl_src/.gitignore
rename to builds/crouton-master/host-ext/nacl_src/.gitignore
diff --git a/builds/crouton-master-jammy/host-ext/nacl_src/Makefile b/builds/crouton-master/host-ext/nacl_src/Makefile
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/nacl_src/Makefile
rename to builds/crouton-master/host-ext/nacl_src/Makefile
diff --git a/builds/crouton-master-jammy/host-ext/nacl_src/keycode_converter.h b/builds/crouton-master/host-ext/nacl_src/keycode_converter.h
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/nacl_src/keycode_converter.h
rename to builds/crouton-master/host-ext/nacl_src/keycode_converter.h
diff --git a/builds/crouton-master-jammy/host-ext/nacl_src/kiwi.cc b/builds/crouton-master/host-ext/nacl_src/kiwi.cc
similarity index 100%
rename from builds/crouton-master-jammy/host-ext/nacl_src/kiwi.cc
rename to builds/crouton-master/host-ext/nacl_src/kiwi.cc
diff --git a/builds/crouton-master-jammy/installer/.gitattributes b/builds/crouton-master/installer/.gitattributes
similarity index 100%
rename from builds/crouton-master-jammy/installer/.gitattributes
rename to builds/crouton-master/installer/.gitattributes
diff --git a/builds/crouton-master-jammy/installer/crouton b/builds/crouton-master/installer/crouton
similarity index 100%
rename from builds/crouton-master-jammy/installer/crouton
rename to builds/crouton-master/installer/crouton
diff --git a/builds/crouton-master-jammy/installer/debian/ar b/builds/crouton-master/installer/debian/ar
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/ar
rename to builds/crouton-master/installer/debian/ar
diff --git a/builds/crouton-master-jammy/installer/debian/bootstrap b/builds/crouton-master/installer/debian/bootstrap
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/bootstrap
rename to builds/crouton-master/installer/debian/bootstrap
diff --git a/builds/crouton-master-jammy/installer/debian/defaults b/builds/crouton-master/installer/debian/defaults
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/defaults
rename to builds/crouton-master/installer/debian/defaults
diff --git a/builds/crouton-master-jammy/installer/debian/getrelease.sh b/builds/crouton-master/installer/debian/getrelease.sh
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/getrelease.sh
rename to builds/crouton-master/installer/debian/getrelease.sh
diff --git a/builds/crouton-master-jammy/installer/debian/pkgdetails b/builds/crouton-master/installer/debian/pkgdetails
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/pkgdetails
rename to builds/crouton-master/installer/debian/pkgdetails
diff --git a/builds/crouton-master-jammy/installer/debian/prepare b/builds/crouton-master/installer/debian/prepare
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/prepare
rename to builds/crouton-master/installer/debian/prepare
diff --git a/builds/crouton-master-jammy/installer/debian/releases b/builds/crouton-master/installer/debian/releases
similarity index 100%
rename from builds/crouton-master-jammy/installer/debian/releases
rename to builds/crouton-master/installer/debian/releases
diff --git a/builds/crouton-master-jammy/installer/functions b/builds/crouton-master/installer/functions
similarity index 100%
rename from builds/crouton-master-jammy/installer/functions
rename to builds/crouton-master/installer/functions
diff --git a/builds/crouton-master-jammy/installer/kali/ar b/builds/crouton-master/installer/kali/ar
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/ar
rename to builds/crouton-master/installer/kali/ar
diff --git a/builds/crouton-master-jammy/installer/kali/bootstrap b/builds/crouton-master/installer/kali/bootstrap
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/bootstrap
rename to builds/crouton-master/installer/kali/bootstrap
diff --git a/builds/crouton-master-jammy/installer/kali/defaults b/builds/crouton-master/installer/kali/defaults
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/defaults
rename to builds/crouton-master/installer/kali/defaults
diff --git a/builds/crouton-master-jammy/installer/kali/getrelease.sh b/builds/crouton-master/installer/kali/getrelease.sh
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/getrelease.sh
rename to builds/crouton-master/installer/kali/getrelease.sh
diff --git a/builds/crouton-master-jammy/installer/kali/pkgdetails b/builds/crouton-master/installer/kali/pkgdetails
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/pkgdetails
rename to builds/crouton-master/installer/kali/pkgdetails
diff --git a/builds/crouton-master-jammy/installer/kali/prepare b/builds/crouton-master/installer/kali/prepare
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/prepare
rename to builds/crouton-master/installer/kali/prepare
diff --git a/builds/crouton-master-jammy/installer/kali/releases b/builds/crouton-master/installer/kali/releases
similarity index 100%
rename from builds/crouton-master-jammy/installer/kali/releases
rename to builds/crouton-master/installer/kali/releases
diff --git a/builds/crouton-master-jammy/installer/main.sh b/builds/crouton-master/installer/main.sh
similarity index 100%
rename from builds/crouton-master-jammy/installer/main.sh
rename to builds/crouton-master/installer/main.sh
diff --git a/builds/crouton-master-jammy/installer/prepare.sh b/builds/crouton-master/installer/prepare.sh
similarity index 100%
rename from builds/crouton-master-jammy/installer/prepare.sh
rename to builds/crouton-master/installer/prepare.sh
diff --git a/builds/crouton-master-jammy/installer/ubuntu/ar b/builds/crouton-master/installer/ubuntu/ar
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/ar
rename to builds/crouton-master/installer/ubuntu/ar
diff --git a/builds/crouton-master-jammy/installer/ubuntu/bootstrap b/builds/crouton-master/installer/ubuntu/bootstrap
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/bootstrap
rename to builds/crouton-master/installer/ubuntu/bootstrap
diff --git a/builds/crouton-master-jammy/installer/ubuntu/defaults b/builds/crouton-master/installer/ubuntu/defaults
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/defaults
rename to builds/crouton-master/installer/ubuntu/defaults
diff --git a/builds/crouton-master-jammy/installer/ubuntu/getrelease.sh b/builds/crouton-master/installer/ubuntu/getrelease.sh
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/getrelease.sh
rename to builds/crouton-master/installer/ubuntu/getrelease.sh
diff --git a/builds/crouton-master-jammy/installer/ubuntu/pkgdetails b/builds/crouton-master/installer/ubuntu/pkgdetails
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/pkgdetails
rename to builds/crouton-master/installer/ubuntu/pkgdetails
diff --git a/builds/crouton-master-jammy/installer/ubuntu/prepare b/builds/crouton-master/installer/ubuntu/prepare
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/prepare
rename to builds/crouton-master/installer/ubuntu/prepare
diff --git a/builds/crouton-master-jammy/installer/ubuntu/releases b/builds/crouton-master/installer/ubuntu/releases
similarity index 100%
rename from builds/crouton-master-jammy/installer/ubuntu/releases
rename to builds/crouton-master/installer/ubuntu/releases
diff --git a/builds/crouton-master-jammy/jammy b/builds/crouton-master/jammy
similarity index 100%
rename from builds/crouton-master-jammy/jammy
rename to builds/crouton-master/jammy
diff --git a/builds/crouton-master-jammy/releases b/builds/crouton-master/releases
similarity index 100%
rename from builds/crouton-master-jammy/releases
rename to builds/crouton-master/releases
diff --git a/builds/crouton-master-jammy/src/fbserver-proto.h b/builds/crouton-master/src/fbserver-proto.h
similarity index 100%
rename from builds/crouton-master-jammy/src/fbserver-proto.h
rename to builds/crouton-master/src/fbserver-proto.h
diff --git a/builds/crouton-master-jammy/src/fbserver.c b/builds/crouton-master/src/fbserver.c
similarity index 100%
rename from builds/crouton-master-jammy/src/fbserver.c
rename to builds/crouton-master/src/fbserver.c
diff --git a/builds/crouton-master-jammy/src/findnacld.c b/builds/crouton-master/src/findnacld.c
similarity index 100%
rename from builds/crouton-master-jammy/src/findnacld.c
rename to builds/crouton-master/src/findnacld.c
diff --git a/builds/crouton-master-jammy/src/freon.c b/builds/crouton-master/src/freon.c
similarity index 100%
rename from builds/crouton-master-jammy/src/freon.c
rename to builds/crouton-master/src/freon.c
diff --git a/builds/crouton-master-jammy/src/vtmonitor.c b/builds/crouton-master/src/vtmonitor.c
similarity index 100%
rename from builds/crouton-master-jammy/src/vtmonitor.c
rename to builds/crouton-master/src/vtmonitor.c
diff --git a/builds/crouton-master-jammy/src/websocket.c b/builds/crouton-master/src/websocket.c
similarity index 100%
rename from builds/crouton-master-jammy/src/websocket.c
rename to builds/crouton-master/src/websocket.c
diff --git a/builds/crouton-master-jammy/src/websocket.h b/builds/crouton-master/src/websocket.h
similarity index 100%
rename from builds/crouton-master-jammy/src/websocket.h
rename to builds/crouton-master/src/websocket.h
diff --git a/builds/crouton-master-jammy/src/xi2event.c b/builds/crouton-master/src/xi2event.c
similarity index 100%
rename from builds/crouton-master-jammy/src/xi2event.c
rename to builds/crouton-master/src/xi2event.c
diff --git a/builds/crouton-master/targets/Python b/builds/crouton-master/targets/Python
new file mode 100644
index 000000000..9c467dc96
--- /dev/null
+++ b/builds/crouton-master/targets/Python
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+REQUIRES='core'
+DESCRIPTION='Basic CLI tools such as ssh.'
+HOSTBIN='startcli'
+CHROOTBIN='croutonpowerd'
+. "${TARGETSDIR:="$PWD"}/common"
+
+### Append to prepare.sh:
+install python3-pip python3-pyqt5 libsecp256k1-0 python3-cryptography
+
diff --git a/builds/crouton-master-jammy/targets/audio b/builds/crouton-master/targets/audio
similarity index 100%
rename from builds/crouton-master-jammy/targets/audio
rename to builds/crouton-master/targets/audio
diff --git a/builds/crouton-master-jammy/targets/chrome b/builds/crouton-master/targets/chrome
similarity index 100%
rename from builds/crouton-master-jammy/targets/chrome
rename to builds/crouton-master/targets/chrome
diff --git a/builds/crouton-master-jammy/targets/chrome-beta b/builds/crouton-master/targets/chrome-beta
similarity index 100%
rename from builds/crouton-master-jammy/targets/chrome-beta
rename to builds/crouton-master/targets/chrome-beta
diff --git a/builds/crouton-master-jammy/targets/chrome-common b/builds/crouton-master/targets/chrome-common
similarity index 100%
rename from builds/crouton-master-jammy/targets/chrome-common
rename to builds/crouton-master/targets/chrome-common
diff --git a/builds/crouton-master-jammy/targets/chrome-dev b/builds/crouton-master/targets/chrome-dev
similarity index 100%
rename from builds/crouton-master-jammy/targets/chrome-dev
rename to builds/crouton-master/targets/chrome-dev
diff --git a/builds/crouton-master-jammy/targets/chromium b/builds/crouton-master/targets/chromium
similarity index 57%
rename from builds/crouton-master-jammy/targets/chromium
rename to builds/crouton-master/targets/chromium
index 4c0f30b83..adea479db 100644
--- a/builds/crouton-master-jammy/targets/chromium
+++ b/builds/crouton-master/targets/chromium
@@ -2,14 +2,15 @@
 # Copyright (c) 2016 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-if [ "${TARGETNOINSTALL:-c}" = 'c' ] &&
-        [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' ] &&
-        [ "${ARCH#arm}" != "$ARCH" ]; then
-    error 99 "chromium target is not supported on Debian/ARM."
-fi
+#if [ "${TARGETNOINSTALL:-c}" = 'c' ] &&
+ #       [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' ] &&
+  #      [ "${ARCH#arm}" != "$ARCH" ]; then
+   # error 99 "chromium target is not supported on Debian/ARM."
+#fi
+
 REQUIRES='x11'
 DESCRIPTION="Chromium browser. Uses the distro's version, which may be old."
 . "${TARGETSDIR:="$PWD"}/common"
 
 ### Append to prepare.sh:
-install ubuntu=chromium-browser,chromium
+install chromium-browser
diff --git a/builds/crouton-master-jammy/targets/cli-extra b/builds/crouton-master/targets/cli-extra
similarity index 100%
rename from builds/crouton-master-jammy/targets/cli-extra
rename to builds/crouton-master/targets/cli-extra
diff --git a/builds/crouton-master-jammy/targets/common b/builds/crouton-master/targets/common
similarity index 100%
rename from builds/crouton-master-jammy/targets/common
rename to builds/crouton-master/targets/common
diff --git a/builds/crouton-master-jammy/targets/core b/builds/crouton-master/targets/core
similarity index 100%
rename from builds/crouton-master-jammy/targets/core
rename to builds/crouton-master/targets/core
diff --git a/builds/crouton-master-jammy/targets/e17 b/builds/crouton-master/targets/e17
similarity index 100%
rename from builds/crouton-master-jammy/targets/e17
rename to builds/crouton-master/targets/e17
diff --git a/builds/crouton-master-jammy/targets/extension b/builds/crouton-master/targets/extension
similarity index 100%
rename from builds/crouton-master-jammy/targets/extension
rename to builds/crouton-master/targets/extension
diff --git a/builds/crouton-master-jammy/targets/gnome b/builds/crouton-master/targets/gnome
similarity index 100%
rename from builds/crouton-master-jammy/targets/gnome
rename to builds/crouton-master/targets/gnome
diff --git a/builds/crouton-master-jammy/targets/gnome-desktop b/builds/crouton-master/targets/gnome-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/gnome-desktop
rename to builds/crouton-master/targets/gnome-desktop
diff --git a/builds/crouton-master-jammy/targets/gtk-extra b/builds/crouton-master/targets/gtk-extra
similarity index 100%
rename from builds/crouton-master-jammy/targets/gtk-extra
rename to builds/crouton-master/targets/gtk-extra
diff --git a/builds/crouton-master-jammy/targets/kde b/builds/crouton-master/targets/kde
similarity index 100%
rename from builds/crouton-master-jammy/targets/kde
rename to builds/crouton-master/targets/kde
diff --git a/builds/crouton-master-jammy/targets/kde-desktop b/builds/crouton-master/targets/kde-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/kde-desktop
rename to builds/crouton-master/targets/kde-desktop
diff --git a/builds/crouton-master-jammy/targets/keyboard b/builds/crouton-master/targets/keyboard
similarity index 100%
rename from builds/crouton-master-jammy/targets/keyboard
rename to builds/crouton-master/targets/keyboard
diff --git a/builds/crouton-master-jammy/targets/kodi b/builds/crouton-master/targets/kodi
similarity index 100%
rename from builds/crouton-master-jammy/targets/kodi
rename to builds/crouton-master/targets/kodi
diff --git a/builds/crouton-master/targets/libreoffice b/builds/crouton-master/targets/libreoffice
new file mode 100644
index 000000000..6f4176be5
--- /dev/null
+++ b/builds/crouton-master/targets/libreoffice
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+REQUIRES='core'
+DESCRIPTION='Libreoffice.'
+HOSTBIN='startcli'
+CHROOTBIN='croutonpowerd'
+. "${TARGETSDIR:="$PWD"}/common"
+
+### Append to prepare.sh:
+install libreoffice cups-bsd imagemagick gimp jupyter
+
+
diff --git a/builds/crouton-master-jammy/targets/lxde b/builds/crouton-master/targets/lxde
similarity index 100%
rename from builds/crouton-master-jammy/targets/lxde
rename to builds/crouton-master/targets/lxde
diff --git a/builds/crouton-master-jammy/targets/lxde-desktop b/builds/crouton-master/targets/lxde-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/lxde-desktop
rename to builds/crouton-master/targets/lxde-desktop
diff --git a/builds/crouton-master-jammy/targets/mate b/builds/crouton-master/targets/mate
similarity index 100%
rename from builds/crouton-master-jammy/targets/mate
rename to builds/crouton-master/targets/mate
diff --git a/builds/crouton-master-jammy/targets/mate-desktop b/builds/crouton-master/targets/mate-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/mate-desktop
rename to builds/crouton-master/targets/mate-desktop
diff --git a/builds/crouton-master-jammy/targets/post-common b/builds/crouton-master/targets/post-common
similarity index 100%
rename from builds/crouton-master-jammy/targets/post-common
rename to builds/crouton-master/targets/post-common
diff --git a/builds/crouton-master/targets/tools b/builds/crouton-master/targets/tools
new file mode 100644
index 000000000..ab48923df
--- /dev/null
+++ b/builds/crouton-master/targets/tools
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+REQUIRES='core'
+DESCRIPTION='tools.'
+HOSTBIN='startcli'
+CHROOTBIN='croutonpowerd'
+. "${TARGETSDIR:="$PWD"}/common"
+
+### Append to prepare.sh:
+install net-tools util-linux partitionmanager golang \
+bison cmake nano gedit gedit-plugins kwrite vlc \
+vlc-plugin-access-extra gnome-disk-utility gnome-sound-recorder \
+net-tools util-linux
+
+
+
+
diff --git a/builds/crouton-master-jammy/targets/touch b/builds/crouton-master/targets/touch
similarity index 100%
rename from builds/crouton-master-jammy/targets/touch
rename to builds/crouton-master/targets/touch
diff --git a/builds/crouton-master-jammy/targets/unity b/builds/crouton-master/targets/unity
similarity index 100%
rename from builds/crouton-master-jammy/targets/unity
rename to builds/crouton-master/targets/unity
diff --git a/builds/crouton-master-jammy/targets/unity-desktop b/builds/crouton-master/targets/unity-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/unity-desktop
rename to builds/crouton-master/targets/unity-desktop
diff --git a/builds/crouton-master-jammy/targets/x11 b/builds/crouton-master/targets/x11
similarity index 100%
rename from builds/crouton-master-jammy/targets/x11
rename to builds/crouton-master/targets/x11
diff --git a/builds/crouton-master-jammy/targets/x11-common b/builds/crouton-master/targets/x11-common
similarity index 100%
rename from builds/crouton-master-jammy/targets/x11-common
rename to builds/crouton-master/targets/x11-common
diff --git a/builds/crouton-master-jammy/targets/xbmc b/builds/crouton-master/targets/xbmc
similarity index 100%
rename from builds/crouton-master-jammy/targets/xbmc
rename to builds/crouton-master/targets/xbmc
diff --git a/builds/crouton-master-jammy/targets/xfce b/builds/crouton-master/targets/xfce
similarity index 100%
rename from builds/crouton-master-jammy/targets/xfce
rename to builds/crouton-master/targets/xfce
diff --git a/builds/crouton-master-jammy/targets/xfce-desktop b/builds/crouton-master/targets/xfce-desktop
similarity index 100%
rename from builds/crouton-master-jammy/targets/xfce-desktop
rename to builds/crouton-master/targets/xfce-desktop
diff --git a/builds/crouton-master-jammy/targets/xiwi b/builds/crouton-master/targets/xiwi
similarity index 100%
rename from builds/crouton-master-jammy/targets/xiwi
rename to builds/crouton-master/targets/xiwi
diff --git a/builds/crouton-master-jammy/targets/xorg b/builds/crouton-master/targets/xorg
similarity index 100%
rename from builds/crouton-master-jammy/targets/xorg
rename to builds/crouton-master/targets/xorg
diff --git a/builds/crouton-master-jammy/test/autotest_control.template b/builds/crouton-master/test/autotest_control.template
similarity index 100%
rename from builds/crouton-master-jammy/test/autotest_control.template
rename to builds/crouton-master/test/autotest_control.template
diff --git a/builds/crouton-master-jammy/test/daemon.sh b/builds/crouton-master/test/daemon.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/daemon.sh
rename to builds/crouton-master/test/daemon.sh
diff --git a/builds/crouton-master-jammy/test/genreport.sh b/builds/crouton-master/test/genreport.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/genreport.sh
rename to builds/crouton-master/test/genreport.sh
diff --git a/builds/crouton-master-jammy/test/reports/00-all.sh b/builds/crouton-master/test/reports/00-all.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/reports/00-all.sh
rename to builds/crouton-master/test/reports/00-all.sh
diff --git a/builds/crouton-master-jammy/test/reports/35-xorg.sh b/builds/crouton-master/test/reports/35-xorg.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/reports/35-xorg.sh
rename to builds/crouton-master/test/reports/35-xorg.sh
diff --git a/builds/crouton-master-jammy/test/reports/w0-common.sh b/builds/crouton-master/test/reports/w0-common.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/reports/w0-common.sh
rename to builds/crouton-master/test/reports/w0-common.sh
diff --git a/builds/crouton-master-jammy/test/run.sh b/builds/crouton-master/test/run.sh
similarity index 100%
rename from builds/crouton-master-jammy/test/run.sh
rename to builds/crouton-master/test/run.sh
diff --git a/builds/crouton-master-jammy/test/tests/00-tester b/builds/crouton-master/test/tests/00-tester
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/00-tester
rename to builds/crouton-master/test/tests/00-tester
diff --git a/builds/crouton-master-jammy/test/tests/10-basic b/builds/crouton-master/test/tests/10-basic
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/10-basic
rename to builds/crouton-master/test/tests/10-basic
diff --git a/builds/crouton-master-jammy/test/tests/11-32-on-64 b/builds/crouton-master/test/tests/11-32-on-64
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/11-32-on-64
rename to builds/crouton-master/test/tests/11-32-on-64
diff --git a/builds/crouton-master-jammy/test/tests/12-edit-chroot b/builds/crouton-master/test/tests/12-edit-chroot
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/12-edit-chroot
rename to builds/crouton-master/test/tests/12-edit-chroot
diff --git a/builds/crouton-master-jammy/test/tests/14-background b/builds/crouton-master/test/tests/14-background
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/14-background
rename to builds/crouton-master/test/tests/14-background
diff --git a/builds/crouton-master-jammy/test/tests/15-media b/builds/crouton-master/test/tests/15-media
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/15-media
rename to builds/crouton-master/test/tests/15-media
diff --git a/builds/crouton-master-jammy/test/tests/16-targetsfile b/builds/crouton-master/test/tests/16-targetsfile
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/16-targetsfile
rename to builds/crouton-master/test/tests/16-targetsfile
diff --git a/builds/crouton-master-jammy/test/tests/17-encryption b/builds/crouton-master/test/tests/17-encryption
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/17-encryption
rename to builds/crouton-master/test/tests/17-encryption
diff --git a/builds/crouton-master-jammy/test/tests/18-upgrade b/builds/crouton-master/test/tests/18-upgrade
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/18-upgrade
rename to builds/crouton-master/test/tests/18-upgrade
diff --git a/builds/crouton-master-jammy/test/tests/20-logind b/builds/crouton-master/test/tests/20-logind
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/20-logind
rename to builds/crouton-master/test/tests/20-logind
diff --git a/builds/crouton-master-jammy/test/tests/30-audio b/builds/crouton-master/test/tests/30-audio
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/30-audio
rename to builds/crouton-master/test/tests/30-audio
diff --git a/builds/crouton-master-jammy/test/tests/35-xorg b/builds/crouton-master/test/tests/35-xorg
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/35-xorg
rename to builds/crouton-master/test/tests/35-xorg
diff --git a/builds/crouton-master-jammy/test/tests/37-xiwi b/builds/crouton-master/test/tests/37-xiwi
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/37-xiwi
rename to builds/crouton-master/test/tests/37-xiwi
diff --git a/builds/crouton-master-jammy/test/tests/w0-common b/builds/crouton-master/test/tests/w0-common
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w0-common
rename to builds/crouton-master/test/tests/w0-common
diff --git a/builds/crouton-master-jammy/test/tests/w1-e17 b/builds/crouton-master/test/tests/w1-e17
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w1-e17
rename to builds/crouton-master/test/tests/w1-e17
diff --git a/builds/crouton-master-jammy/test/tests/w2-gnome b/builds/crouton-master/test/tests/w2-gnome
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w2-gnome
rename to builds/crouton-master/test/tests/w2-gnome
diff --git a/builds/crouton-master-jammy/test/tests/w2d-gnome-desktop b/builds/crouton-master/test/tests/w2d-gnome-desktop
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w2d-gnome-desktop
rename to builds/crouton-master/test/tests/w2d-gnome-desktop
diff --git a/builds/crouton-master-jammy/test/tests/w3-kde b/builds/crouton-master/test/tests/w3-kde
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w3-kde
rename to builds/crouton-master/test/tests/w3-kde
diff --git a/builds/crouton-master-jammy/test/tests/w3d-kde-desktop b/builds/crouton-master/test/tests/w3d-kde-desktop
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w3d-kde-desktop
rename to builds/crouton-master/test/tests/w3d-kde-desktop
diff --git a/builds/crouton-master-jammy/test/tests/w4-lxde b/builds/crouton-master/test/tests/w4-lxde
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w4-lxde
rename to builds/crouton-master/test/tests/w4-lxde
diff --git a/builds/crouton-master-jammy/test/tests/w4d-lxde-desktop b/builds/crouton-master/test/tests/w4d-lxde-desktop
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w4d-lxde-desktop
rename to builds/crouton-master/test/tests/w4d-lxde-desktop
diff --git a/builds/crouton-master-jammy/test/tests/w5-unity b/builds/crouton-master/test/tests/w5-unity
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w5-unity
rename to builds/crouton-master/test/tests/w5-unity
diff --git a/builds/crouton-master-jammy/test/tests/w5d-unity-desktop b/builds/crouton-master/test/tests/w5d-unity-desktop
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w5d-unity-desktop
rename to builds/crouton-master/test/tests/w5d-unity-desktop
diff --git a/builds/crouton-master-jammy/test/tests/w6-kodi b/builds/crouton-master/test/tests/w6-kodi
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w6-kodi
rename to builds/crouton-master/test/tests/w6-kodi
diff --git a/builds/crouton-master-jammy/test/tests/w7-xfce b/builds/crouton-master/test/tests/w7-xfce
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w7-xfce
rename to builds/crouton-master/test/tests/w7-xfce
diff --git a/builds/crouton-master-jammy/test/tests/w7d-xfce-desktop b/builds/crouton-master/test/tests/w7d-xfce-desktop
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/w7d-xfce-desktop
rename to builds/crouton-master/test/tests/w7d-xfce-desktop
diff --git a/builds/crouton-master-jammy/test/tests/x0-alltargets b/builds/crouton-master/test/tests/x0-alltargets
similarity index 100%
rename from builds/crouton-master-jammy/test/tests/x0-alltargets
rename to builds/crouton-master/test/tests/x0-alltargets
diff --git a/builds/crouton-master/testC b/builds/crouton-master/testC
new file mode 100755
index 000000000..58c2ab04d
Binary files /dev/null and b/builds/crouton-master/testC differ
diff --git a/targets/chromium b/targets/chromium
index 4c0f30b83..adea479db 100644
--- a/targets/chromium
+++ b/targets/chromium
@@ -2,14 +2,15 @@
 # Copyright (c) 2016 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-if [ "${TARGETNOINSTALL:-c}" = 'c' ] &&
-        [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' ] &&
-        [ "${ARCH#arm}" != "$ARCH" ]; then
-    error 99 "chromium target is not supported on Debian/ARM."
-fi
+#if [ "${TARGETNOINSTALL:-c}" = 'c' ] &&
+ #       [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' ] &&
+  #      [ "${ARCH#arm}" != "$ARCH" ]; then
+   # error 99 "chromium target is not supported on Debian/ARM."
+#fi
+
 REQUIRES='x11'
 DESCRIPTION="Chromium browser. Uses the distro's version, which may be old."
 . "${TARGETSDIR:="$PWD"}/common"
 
 ### Append to prepare.sh:
-install ubuntu=chromium-browser,chromium
+install chromium-browser
diff --git a/targets/openoffice b/targets/openoffice
new file mode 100644
index 000000000..6f4176be5
--- /dev/null
+++ b/targets/openoffice
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+REQUIRES='core'
+DESCRIPTION='Libreoffice.'
+HOSTBIN='startcli'
+CHROOTBIN='croutonpowerd'
+. "${TARGETSDIR:="$PWD"}/common"
+
+### Append to prepare.sh:
+install libreoffice cups-bsd imagemagick gimp jupyter
+
+
diff --git a/targets/tools b/targets/tools
new file mode 100644
index 000000000..445275114
--- /dev/null
+++ b/targets/tools
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+REQUIRES=core 
+DESCRIPTION= 'tools'
+
+. "${TARGETSDIR:="$PWD"}/common"
+
+### Append to prepare.sh:
+
+install net-tools util-linux  partitionmanager golang \
+-- bison cmake nano gedit gedit-plugins kwrite vlc \
+-- vlc-plugin-access-extra gnome-disk-utility gnome-sound-recorder \
+-- firefox-esr-l10n-all net-tools util-linux
+
+
+
+