diff --git a/boot/loader/entries/arch.conf b/boot/loader/entries/arch.conf
new file mode 100755
index 0000000..6ac32d8
--- /dev/null
+++ b/boot/loader/entries/arch.conf
@@ -0,0 +1,5 @@
+title   Arch Linux Encrypted
+linux   /vmlinuz-linux
+initrd  /intel-ucode.img
+initrd  /initramfs-linux.img
+options cryptdevice=PARTUUID=379cfbc1-1611-4d61-ba80-dafac35f1c1a:lvm root=/dev/mapper/vg0-root resume=/dev/vg0/swap zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=20 zswap.zpool=z3fold intel_pstate=per_cpu_perf_limits apparmor=1 security=apparmor quiet rw
diff --git a/loader.conf b/boot/loader/loader.conf
similarity index 81%
rename from loader.conf
rename to boot/loader/loader.conf
index e79e4f1..9084478 100755
--- a/loader.conf
+++ b/boot/loader/loader.conf
@@ -1,4 +1,3 @@
 default  arch
-timeout 2
 console-mode max
 editor   no
diff --git a/entries/arch.conf b/entries/arch.conf
deleted file mode 100755
index f2b9b17..0000000
--- a/entries/arch.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title   Arch Linux Encrypted
-linux   /vmlinuz-linux
-initrd  /intel-ucode.img
-initrd  /initramfs-linux.img
-options cryptdevice=UUID=65127d08-139a-4e52-8a7b-c8c0911f460c:lvm root=/dev/mapper/vg0-root resume=/dev/vg0/swap zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=20 zswap.zpool=z3fold vm.dirty_ratio=3 vm.dirty_background_ratio=2 vm.vfs_cache_pressure=60 apparmor=1 security=apparmor quiet rw