diff --git a/build.sh b/build.sh
index a2194d7..c2147c8 100755
--- a/build.sh
+++ b/build.sh
@@ -171,13 +171,13 @@ ln -nsf /proc/mounts       "$ROOTFS_DIR/etc/mtab"
 ##
 # Prepare package manager.
 #
-install -m 644 files/sources.list "$ROOTFS_DIR/etc/apt/sources.list"
+install -m 644 files/apt/sources.list "$ROOTFS_DIR/etc/apt/sources.list"
 
-on_chroot apt-key add - < files/raspberrypi.gpg.key
+on_chroot apt-key add - < files/apt/raspberrypi.gpg.asc
 
-install -m 644 files/raspberrypi-kernel-and-bootloader "$ROOTFS_DIR/etc/apt/preferences.d/raspberrypi-kernel-and-bootloader"
+install -m 644 files/apt/preferences "$ROOTFS_DIR/etc/apt/preferences.d/raspberrypi-kernel-and-bootloader"
 
-install -m 644 files/50raspi "$ROOTFS_DIR/etc/apt/apt.conf.d/50raspi"
+install -m 644 files/apt/50raspi "$ROOTFS_DIR/etc/apt/apt.conf.d/50raspi"
 
 on_chroot << EOF
 apt-get update
diff --git a/files/50raspi b/files/apt/50raspi
similarity index 100%
rename from files/50raspi
rename to files/apt/50raspi
diff --git a/files/raspberrypi-kernel-and-bootloader b/files/apt/preferences
similarity index 100%
rename from files/raspberrypi-kernel-and-bootloader
rename to files/apt/preferences
diff --git a/files/raspberrypi.gpg.key b/files/apt/raspberrypi.gpg.asc
similarity index 100%
rename from files/raspberrypi.gpg.key
rename to files/apt/raspberrypi.gpg.asc
diff --git a/files/sources.list b/files/apt/sources.list
similarity index 100%
rename from files/sources.list
rename to files/apt/sources.list