diff --git a/hashboot-9999.ebuild b/hashboot-9999.ebuild
index 8ec56d3..ad28c26 100644
--- a/hashboot-9999.ebuild
+++ b/hashboot-9999.ebuild
@@ -31,7 +31,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	mv initscript.openrc hashboot
+	mkdir bin
+	mkdir init
+	mv hashboot.sh init/hashboot
+	mv initscript.openrc init/hashboot
 	mv LICENSE HUG-WARE
 }
 
@@ -41,6 +44,6 @@ src_install() {
 	insinto /usr/portage/licenses
 	doins HUG-WARE
 	
-	dobin hashboot.sh
-	doinitd hashboot
+	dobin bin/hashboot
+	doinitd init/hashboot
 }
diff --git a/initscript.openrc b/initscript.openrc
index 570a8ed..7ea602d 100755
--- a/initscript.openrc
+++ b/initscript.openrc
@@ -11,17 +11,17 @@ start()
 {
 	ebegin "Checking integrity of files in /boot"
 
-	# See if hashboot.sh is accessible
-	which hashboot.sh > /dev/null || return 255
+	# See if hashboot is accessible
+	which hashboot > /dev/null || return 255
 
-	hashboot.sh check
+	hashboot check
 	if [ $? -gt 0 ] && [ $? -le 3 ]
 	then
 		echo -n "Recover files? [y/N] "
 		read -r yesno
 		if [ "${yesno}" == "y" ]
 		then
-			hashboot.sh recover
+			hashboot recover
 		fi
 
 		echo "Dropping to shell. Type exit to continue."
diff --git a/initscript.sysv b/initscript.sysv
index eb71630..e82d329 100755
--- a/initscript.sysv
+++ b/initscript.sysv
@@ -11,14 +11,14 @@
 
 #PATH=/sbin:/bin:/usr/bin:/usr
 
-# See if hashboot.sh is accessible
-test -x $(which hashboot.sh) || exit 255
+# See if hashboot is accessible
+test -x $(which hashboot) || exit 255
 
 case "$1" in
 	start)
 		log_daemon_msg "Checking integrity of files in /boot"
 
-		hashboot.sh check
+		hashboot check
 		if [ $? -gt 0 ] && [ $? -le 3 ]
 		then
 			log_end_msg 4
@@ -27,7 +27,7 @@ case "$1" in
 			read -r yesno
 			if [ "${yesno}" == "y" ]
 			then
-				hashboot.sh recover
+				hashboot recover
 			fi
 
 			echo "Dropping to shell. Type exit to continue."
diff --git a/kernel-hook b/kernel-hook
index b9c916e..43d36af 100755
--- a/kernel-hook
+++ b/kernel-hook
@@ -1,4 +1,4 @@
 #!/bin/sh
 # Generate checksums of MBR and /boot after each kernel update
 
-hashboot.sh index
+hashboot index