diff --git a/.gear/doskast.spec b/.gear/doskast.spec
index 4dd907f..9a18f9b 100644
--- a/.gear/doskast.spec
+++ b/.gear/doskast.spec
@@ -73,7 +73,7 @@ Requires: %{_bindir}/pkexec
 
 %build
 %install
-desktop-file-validate *.desktop
+desktop-file-validate server-watcher/*.desktop
 desktop-file-validate xpra-shadow/*.desktop
 %makeinstall_std
 
diff --git a/Makefile b/Makefile
index 7fb2e6f..af2f24f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ CGI_DIR ?= /var/www/cgi-bin
 install:
 	# TODO: make a custom location with separate web server
 	mkdir -p --mode=0755 $(DESTDIR)$(CGI_DIR)
-	install -m0755 doskast-trigger-connect.cgi $(DESTDIR)$(CGI_DIR)
+	install -m0755 webserver/doskast-trigger-connect.cgi $(DESTDIR)$(CGI_DIR)
 
 	mkdir -p --mode=0755 $(DESTDIR)$(UNITDIR)
 	install -m0644 xpra-shadow/doskast-xpra-shadow.socket $(DESTDIR)$(UNITDIR)
@@ -22,14 +22,14 @@ install:
 
 	mkdir -p --mode=0755 $(DESTDIR)$(BINDIR)
 	mkdir -p --mode=0755 $(DESTDIR)$(SBINDIR)
-	install -m0755 doskast-server-watcher.sh $(DESTDIR)$(BINDIR)/doskast-server-watcher
+	install -m0755 server-watcher/doskast-server-watcher.sh $(DESTDIR)$(BINDIR)/doskast-server-watcher
 	install -m0755 student-config/doskast-student-config.sh $(DESTDIR)$(SBINDIR)/doskast-student-config
 	echo -e '#!/bin/sh\npkexec $(SBINDIR)/doskast-student-config "$$@"' > $(DESTDIR)$(BINDIR)/doskast-student-config
 	chmod 0755 $(DESTDIR)$(BINDIR)/doskast-student-config
 	install -m0755 xpra-shadow/doskast-xpra-shadow.sh $(DESTDIR)$(BINDIR)/doskast-xpra-shadow
 
 	mkdir -p --mode=0755 $(DESTDIR)$(SYSCONFDIR)/xdg/autostart
-	install -m0644 doskast-server-watcher.desktop $(DESTDIR)$(SYSCONFDIR)/xdg/autostart
+	install -m0644 server-watcher/doskast-server-watcher.desktop $(DESTDIR)$(SYSCONFDIR)/xdg/autostart
 	install -m0644 xpra-shadow/doskast-xpra-shadow.desktop $(DESTDIR)$(SYSCONFDIR)/xdg/autostart
 
 	mkdir -p --mode=0755 $(DESTDIR)$(DATADIR)/polkit-1/actions
diff --git a/doskast-server-watcher.desktop b/server-watcher/doskast-server-watcher.desktop
similarity index 100%
rename from doskast-server-watcher.desktop
rename to server-watcher/doskast-server-watcher.desktop
diff --git a/doskast-server-watcher.sh b/server-watcher/doskast-server-watcher.sh
similarity index 100%
rename from doskast-server-watcher.sh
rename to server-watcher/doskast-server-watcher.sh
diff --git a/doskast-student-connect.sh b/student-connect/doskast-student-connect.sh
similarity index 100%
rename from doskast-student-connect.sh
rename to student-connect/doskast-student-connect.sh
diff --git a/doskast-trigger-connect.cgi b/webserver/doskast-trigger-connect.cgi
similarity index 100%
rename from doskast-trigger-connect.cgi
rename to webserver/doskast-trigger-connect.cgi