diff --git a/Makefile b/Makefile
index 965719f65..77d134982 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = frontend/cli/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
+SCRIPTS = frontend/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
 
 all: build
 
@@ -45,7 +45,7 @@ install:
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	cp -a frontend/cli/* $(DESTDIR)/usr/bin
+	cp -a frontend/* $(DESTDIR)/usr/bin
 
 	mkdir -p $(DESTDIR)/usr/lib/live
 	cp -a scripts/* $(DESTDIR)/usr/lib/live
diff --git a/frontend/cli/lb b/frontend/lb
similarity index 100%
rename from frontend/cli/lb
rename to frontend/lb
diff --git a/frontend/cli/live-build b/frontend/live-build
similarity index 100%
rename from frontend/cli/live-build
rename to frontend/live-build