diff --git a/Makefile b/Makefile
index b4a9c44dc..5374e0205 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,8 @@ test:
 
 	@for SCRIPT in $(SCRIPTS); \
 	do \
-		if ! head -n1 $${SCRIPT} | grep -qs python; \
-		then \
-			sh -n $${SCRIPT}; \
-			echo -n "."; \
-		fi; \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
 	done
 
 	@echo " done."
@@ -28,11 +25,8 @@ test:
 	then \
 		for SCRIPT in $(SCRIPTS); \
 		do \
-			if ! head -n1 $${SCRIPT} | grep -qs python; \
-			then \
-				checkbashisms -f -x $${SCRIPT}; \
-				echo -n "."; \
-			fi; \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
 		done; \
 	else \
 		echo "WARNING: skipping bashism test - you need to install devscripts."; \
@@ -55,6 +49,7 @@ install:
 
 	mkdir -p $(DESTDIR)/usr/lib/live
 	cp -a scripts/* $(DESTDIR)/usr/lib/live
+	cp -a components/* $(DESTDIR)/usr/lib/live/build
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-build
diff --git a/scripts/build/binary_hooks b/components/binary_hooks
similarity index 100%
rename from scripts/build/binary_hooks
rename to components/binary_hooks
diff --git a/scripts/build/bootstrap_cdebootstrap b/components/bootstrap_cdebootstrap
similarity index 100%
rename from scripts/build/bootstrap_cdebootstrap
rename to components/bootstrap_cdebootstrap
diff --git a/scripts/build/bootstrap_debootstrap b/components/bootstrap_debootstrap
similarity index 100%
rename from scripts/build/bootstrap_debootstrap
rename to components/bootstrap_debootstrap
diff --git a/scripts/build/bootstrap_hooks b/components/bootstrap_hooks
similarity index 100%
rename from scripts/build/bootstrap_hooks
rename to components/bootstrap_hooks
diff --git a/scripts/build/chroot_hooks b/components/chroot_hooks
similarity index 100%
rename from scripts/build/chroot_hooks
rename to components/chroot_hooks
diff --git a/scripts/build/source_hooks b/components/source_hooks
similarity index 100%
rename from scripts/build/source_hooks
rename to components/source_hooks