diff --git a/bin/qemush b/bin/qemush
new file mode 100755
index 0000000..b716638
--- /dev/null
+++ b/bin/qemush
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+exec_as() {
+    local user="$1"
+    shift
+
+    if [ "$(whoami)" != "$user" ]; then
+        exec sudo -u "$user" "$0" "$@"
+    else
+        cd
+    fi
+}
+
+exec_as qemu "$@" || exit
+PATH="./bin:${PATH}"
+
+perror() {
+    >&2 printf '\033[1;31mERROR:\033[0m \033[1m%s\033[0m\n' "$*"
+}
+
+public_help() {
+    local name
+    name="$(basename "$0")"
+    cat << EOF
+${name}: usage:
+  ${name} active                      - (default behaviour) list active VMs
+  ${name} start <VM name>             - start a VM
+  ${name} watch <VM name>             - attach VM screen session
+  ${name} list                        - list available VMs
+  ${name} add <VM name> <template>    - add launch script based on template
+  ${name} rm <VM name>                - delete launch script
+  ${name} diskls                      - list available disk images
+  ${name} diskadd <disk name> <size>  - create a disk image
+  ${name} diskrm <disk name>          - delete disk image
+  ${name} help                        - show this help
+EOF
+}
+
+error_usage() {
+    perror "Invalid usage"
+    >&2 public_help
+    return 1
+}
+
+public_start() {
+    local vm_name="$1"
+    shift
+
+    screen -d -m -S "$vm_name" "$vm_name" "$@"
+}
+
+public_watch() {
+    screen -dr "$1"
+}
+
+public_active() {
+    screen -ls
+}
+
+public_list() {
+    echo "Available machines:"
+    ls --color=auto bin
+}
+
+diskpath() {
+    printf 'images/%s.qcow2' "$1"
+}
+
+public_diskadd() {
+    qemu-img create -f qcow2 "$(diskpath "$1")" "$2"
+}
+
+public_diskrm() {
+    rm -vi -- "$(diskpath "$1")"
+}
+
+public_diskls() {
+    echo "Available disks:"
+    ls --color=auto images
+}
+
+public_add() {
+    ln -vs "$2" "bin/${1}"
+}
+
+public_rm() {
+    unlink "bin/${1}"
+}
+
+function="$1"
+shift
+
+if [ -z "$function" ]; then
+    public_active
+elif declare -F | cut -d \  -f 3- | grep '^public_' | sed 's/^public_//' | grep -q "^${function}$"; then
+    "public_${function}" "$@"
+else
+    error_usage
+fi
diff --git a/bin/windows10 b/bin/windows10
deleted file mode 120000
index c83465d..0000000
--- a/bin/windows10
+++ /dev/null
@@ -1 +0,0 @@
-../share/qemu/scripts/windows10
\ No newline at end of file
diff --git a/share/qemu/bin/linux b/qemu/bin/linux
similarity index 71%
rename from share/qemu/bin/linux
rename to qemu/bin/linux
index 50e9f72..1cc1d29 100755
--- a/share/qemu/bin/linux
+++ b/qemu/bin/linux
@@ -1,7 +1,6 @@
 #!/bin/sh -ex
 name="$(basename "$0")"
-cd "$(dirname "$(readlink -f "$0")")/.."
-exec screen -S "QEMU : ${name}" -d -m qemu-system-x86_64 \
+qemu-system-x86_64 \
     -monitor stdio -enable-kvm \
     -cpu host -smp "$(nproc)" \
     -m 4G \
diff --git a/share/qemu/bin/windows10 b/qemu/bin/windows10
similarity index 82%
rename from share/qemu/bin/windows10
rename to qemu/bin/windows10
index e758bf4..9bbac80 100755
--- a/share/qemu/bin/windows10
+++ b/qemu/bin/windows10
@@ -1,7 +1,6 @@
 #!/bin/sh -ex
 name="$(basename "$0")"
-cd "$(dirname "$(readlink -f "$0")")/.."
-exec screen -S "QEMU : ${name}" -d -m qemu-system-x86_64 \
+qemu-system-x86_64 \
     -monitor stdio -enable-kvm \
     -bios /usr/share/edk2/x64/OVMF_CODE.fd \
     -usb -device usb-ehci,id=ehci -device usb-host,bus=ehci.0,vendorid=1452 \