diff --git a/Makefile.am b/Makefile.am
index fecc6d5..0b5ba92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,20 +9,23 @@ libutil_a_SOURCES += lib/util/write_retry.c lib/util/read_retry.c
 libutil_a_SOURCES += lib/util/canonicalize_name.c
 libutil_a_SOURCES += include/util/util.h include/util/input_file.h
 
+libfilelist_a_SOURCES = lib/filelist/dump_toc.c lib/filelist/image_entry.c
+libfilelist_a_SOURCES += lib/filelist/image_entry_sort.c
+libfilelist_a_SOURCES += include/filelist/image_entry.h
+
 # application core
 GLOBALHDR = include/pkgformat.h include/pkgreader.h
 GLOBALHDR += include/compressor.h include/command.h include/pkgwriter.h
-GLOBALHDR += include/image_entry.h include/pkgio.h
+GLOBALHDR += include/pkgio.h
 
 MAIN = main/pkg.c main/compressor.c main/command.c main/pkgreader.c
-MAIN += main/pkgwriter.c main/image_entry.c main/image_entry_sort.c
-MAIN += main/pkgio_rd_image_entry.c main/pkg_unpack.c main/dump_toc.c
+MAIN += main/pkgwriter.c main/pkgio_rd_image_entry.c main/pkg_unpack.c
 
 pkg_SOURCES = $(GLOBALHDR) $(MAIN)
 pkg_CFLAGS = $(AM_CFLAGS)
-pkg_LDADD = libutil.a
+pkg_LDADD = libutil.a libfilelist.a
 
-noinst_LIBRARIES = libutil.a
+noinst_LIBRARIES = libutil.a libfilelist.a
 bin_PROGRAMS = pkg
 
 EXTRA_DIST = autogen.sh
diff --git a/include/image_entry.h b/include/filelist/image_entry.h
similarity index 96%
rename from include/image_entry.h
rename to include/filelist/image_entry.h
index a1fd79d..e2d4e67 100644
--- a/include/image_entry.h
+++ b/include/filelist/image_entry.h
@@ -4,8 +4,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#include "pkgreader.h"
-
 typedef struct image_entry_t {
 	struct image_entry_t *next;
 	char *name;
diff --git a/include/pkgio.h b/include/pkgio.h
index 4104819..dfafff3 100644
--- a/include/pkgio.h
+++ b/include/pkgio.h
@@ -2,7 +2,7 @@
 #define PKGIO_H
 
 #include "pkgreader.h"
-#include "image_entry.h"
+#include "filelist/image_entry.h"
 
 enum {
 	UNPACK_NO_CHOWN = 0x01,
diff --git a/main/dump_toc.c b/lib/filelist/dump_toc.c
similarity index 98%
rename from main/dump_toc.c
rename to lib/filelist/dump_toc.c
index 0de18a3..cfa5bb4 100644
--- a/main/dump_toc.c
+++ b/lib/filelist/dump_toc.c
@@ -2,7 +2,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
 
 typedef int (*print_fun_t)(image_entry_t *ent, const char *root);
 
diff --git a/main/image_entry.c b/lib/filelist/image_entry.c
similarity index 93%
rename from main/image_entry.c
rename to lib/filelist/image_entry.c
index 007cf9d..4b8068c 100644
--- a/main/image_entry.c
+++ b/lib/filelist/image_entry.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
 
 void image_entry_free(image_entry_t *ent)
 {
diff --git a/main/image_entry_sort.c b/lib/filelist/image_entry_sort.c
similarity index 97%
rename from main/image_entry_sort.c
rename to lib/filelist/image_entry_sort.c
index 40bf901..b056e93 100644
--- a/main/image_entry_sort.c
+++ b/lib/filelist/image_entry_sort.c
@@ -1,7 +1,7 @@
 #include <sys/stat.h>
 #include <string.h>
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
 
 static int compare_ent(image_entry_t *a, image_entry_t *b)
 {
diff --git a/main/cmd/dump/dump.h b/main/cmd/dump/dump.h
index 9c69d2c..852bb8e 100644
--- a/main/cmd/dump/dump.h
+++ b/main/cmd/dump/dump.h
@@ -9,7 +9,8 @@
 
 #include "util/util.h"
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
+
 #include "pkgformat.h"
 #include "pkgreader.h"
 #include "command.h"
diff --git a/main/cmd/install/install.h b/main/cmd/install/install.h
index a0c852c..c8cb860 100644
--- a/main/cmd/install/install.h
+++ b/main/cmd/install/install.h
@@ -11,7 +11,8 @@
 
 #include "util/util.h"
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
+
 #include "pkgreader.h"
 #include "command.h"
 #include "pkgio.h"
diff --git a/main/cmd/pack/pack.h b/main/cmd/pack/pack.h
index 40da3d2..fc64881 100644
--- a/main/cmd/pack/pack.h
+++ b/main/cmd/pack/pack.h
@@ -17,7 +17,8 @@
 #include "util/input_file.h"
 #include "util/util.h"
 
-#include "image_entry.h"
+#include "filelist/image_entry.h"
+
 #include "compressor.h"
 #include "pkgformat.h"
 #include "pkgwriter.h"