diff --git a/Makefile b/Makefile
index dd9f9e2e1..d6a16e1b9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = cgi/live-build-cgi cgi/live-build-cgi.cron cron/live-build-cron* functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
+SCRIPTS = frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron frontends/cron/live-build-cron* functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
 
 all: build
 
@@ -40,13 +40,13 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live/build
-	cp -r cgi data examples functions scripts includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
+	cp -r frontends/cgi data examples functions scripts includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
 	cp -r share/* $(DESTDIR)/usr/share/live/build
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/usr/share/live/build/scripts/build/lb $(DESTDIR)/usr/share/live/build/scripts/build/live-build $(DESTDIR)/usr/bin
-	cp cron/live-* $(DESTDIR)/usr/bin
+	cp frontends/cron/live-* $(DESTDIR)/usr/bin
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-build
diff --git a/cgi/Makefile b/frontends/cgi/Makefile
similarity index 100%
rename from cgi/Makefile
rename to frontends/cgi/Makefile
diff --git a/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
similarity index 100%
rename from cgi/live-build-cgi
rename to frontends/cgi/live-build-cgi
diff --git a/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
similarity index 100%
rename from cgi/live-build-cgi.cron
rename to frontends/cgi/live-build-cgi.cron
diff --git a/cgi/live-build-cgi.crontab b/frontends/cgi/live-build-cgi.crontab
similarity index 100%
rename from cgi/live-build-cgi.crontab
rename to frontends/cgi/live-build-cgi.crontab
diff --git a/cgi/live-build-cgi.default b/frontends/cgi/live-build-cgi.default
similarity index 100%
rename from cgi/live-build-cgi.default
rename to frontends/cgi/live-build-cgi.default
diff --git a/cgi/live-build-cgi.logrotate b/frontends/cgi/live-build-cgi.logrotate
similarity index 100%
rename from cgi/live-build-cgi.logrotate
rename to frontends/cgi/live-build-cgi.logrotate
diff --git a/cron/TODO b/frontends/cron/TODO
similarity index 100%
rename from cron/TODO
rename to frontends/cron/TODO
diff --git a/cron/live-build-cron-images b/frontends/cron/live-build-cron-images
similarity index 100%
rename from cron/live-build-cron-images
rename to frontends/cron/live-build-cron-images
diff --git a/cron/live-build-cron-manual b/frontends/cron/live-build-cron-manual
similarity index 100%
rename from cron/live-build-cron-manual
rename to frontends/cron/live-build-cron-manual