diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index 561a0df..0000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=decrypt
-pkgver=0.5.1
-pkgrel=4
-pkgdesc="Decryption script"
-arch=('any')
-license=('MIT')
-depends=('cryptsetup')
-changelog=changelog
-install=decrypt.install
-source=(
-'binaries/decrypt.sh'
-'initcpio/archlinux/decrypt.hook'
-'initcpio/archlinux/decrypt.install'
-)
-
-package() {
-
-  	# Install last known script with service
- 	install -Dm 755 "${srcdir}/decrypt.hook" "${pkgdir}/usr/lib/initcpio/hooks/decrypt"
-  	install -Dm 755 "${srcdir}/decrypt.sh" "${pkgdir}/usr/lib/initcpio/hooks/decrypt.sh"
-  	install -Dm 755 "${srcdir}/decrypt.install" "${pkgdir}/usr/lib/initcpio/install/decrypt"
-
-  	# Add copywrite header to all files
-	for i in $(find ${pkgdir}/* -type f -not -name ".PKGINFO" -not -name ".BUILDINFO" -not -name ".MTREE"); do
-  		echo "#
-# Author Antoine Martin
-# Copyright (c) $(date +%Y) Antoine Martin <antoine.martin@protonmail.com>
-# Release v${pkgver}-${pkgrel} ${pkgname}
-#
-$(cat "${i}")
-" > ${i}
-	done
-}
-
diff --git a/binaries/decrypt.sh b/bin/decrypt.sh
similarity index 100%
rename from binaries/decrypt.sh
rename to bin/decrypt.sh
diff --git a/decrypt.install b/decrypt.install
deleted file mode 100644
index 2d189a2..0000000
--- a/decrypt.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-
-   	echo "INSTALL INSTRUCTIONS"
-   	echo "1) Add 'decrypt' in /etc/mkinitcpio"
-   	echo "2) Execute 'mkinitcpio -p linux'"
-
-}
-
-post_upgrade() {
-	mkinitcpio -p linux
-}
\ No newline at end of file
diff --git a/initcpio/debian/decrypt.hook b/hooks/decrypt.hook
similarity index 100%
rename from initcpio/debian/decrypt.hook
rename to hooks/decrypt.hook
diff --git a/initcpio/debian/decrypt.install b/hooks/decrypt.install
similarity index 100%
rename from initcpio/debian/decrypt.install
rename to hooks/decrypt.install
diff --git a/initcpio/archlinux/decrypt.hook b/initcpio/archlinux/decrypt.hook
deleted file mode 100755
index 932097d..0000000
--- a/initcpio/archlinux/decrypt.hook
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Author Antoine Martin
-# Copyright (c) 2016 Antoine Martin <antoine.martin@protonmail.com>
-# Release v0.5.1-4 decrypt
-#
-#!/usr/bin/ash
-run_hook() {
-    modprobe -a -q dm-crypt >/dev/null 2>&1
-    [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-        export TERMINFO=/usr/lib/terminfo
-	bash /usr/bin/decrypt open
-
-}
-
diff --git a/initcpio/archlinux/decrypt.install b/initcpio/archlinux/decrypt.install
deleted file mode 100755
index a56130e..0000000
--- a/initcpio/archlinux/decrypt.install
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Author Antoine Martin
-# Copyright (c) 2016 Antoine Martin <antoine.martin@protonmail.com>
-# Release v0.5.1-4 decrypt
-#
-#!/bin/bash
-
-build() {
-    local mod
-
-    add_module dm-crypt
-    if [[ $CRYPTO_MODULES ]]; then
-        for mod in $CRYPTO_MODULES; do
-            add_module "$mod"
-        done
-    else
-        add_all_modules '/crypto/'
-    fi
-
-    add_binary "cryptsetup"
-    add_binary "dmsetup"
-    add_binary "mount"
-    add_binary "egrep"
-    add_binary "lsblk"
-    add_binary "sed"
-    add_binary "bash"
-    add_binary "tput"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/share/terminfo/l/linux" "/usr/lib/terminfo/l/linux"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-    add_file "/usr/lib/initcpio/hooks/decrypt.sh" "/usr/bin/decrypt"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook allows for an encrypted root device. Users should specify the device
-to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
-where 'device' is the path to the raw device, and 'dmname' is the name given to
-the device after unlocking, and will be available as /dev/mapper/dmname.
-
-For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
-the kernel cmdline, where 'device' represents the raw block device where the key
-exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
-the absolute path of the keyfile within the device.
-
-Without specifying a keyfile, you will be prompted for the password at runtime.
-This means you must have a keyboard available to input it, and you may need
-the keymap hook as well to ensure that the keyboard is using the layout you
-expect.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
-