Move library source into src sub-directory

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

170 files changed, 141 insertions, 164 deletions

diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am
index c6a98a2..7edc39a 100644
--- a/bin/gensquashfs/Makemodule.am
+++ b/bin/gensquashfs/Makemodule.am
@@ -1,10 +1,9 @@
-gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h
-gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c
-gensquashfs_SOURCES += bin/gensquashfs/dirscan_xattr.c
-gensquashfs_SOURCES += bin/gensquashfs/filemap_xattr.c
-gensquashfs_SOURCES += bin/gensquashfs/fstree_from_file.c
-gensquashfs_SOURCES += bin/gensquashfs/fstree_from_dir.c
-gensquashfs_SOURCES += bin/gensquashfs/sort_by_file.c
+gensquashfs_SOURCES = bin/gensquashfs/src/mkfs.c bin/gensquashfs/src/mkfs.h \
+	bin/gensquashfs/src/options.c bin/gensquashfs/src/selinux.c \
+	bin/gensquashfs/src/dirscan_xattr.c bin/gensquashfs/src/filemap_xattr.c\
+	bin/gensquashfs/src/fstree_from_file.c \
+	bin/gensquashfs/src/fstree_from_dir.c \
+	bin/gensquashfs/src/sort_by_file.c
 gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libio.a
 gensquashfs_LDADD += libutil.a libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS)
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/bin/gensquashfs/dirscan_xattr.c b/bin/gensquashfs/src/dirscan_xattr.c
index 7d4e552..7d4e552 100644
--- a/bin/gensquashfs/dirscan_xattr.c
+++ b/bin/gensquashfs/src/dirscan_xattr.c
diff --git a/bin/gensquashfs/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c
index dd76b50..dd76b50 100644
--- a/bin/gensquashfs/filemap_xattr.c
+++ b/bin/gensquashfs/src/filemap_xattr.c
diff --git a/bin/gensquashfs/fstree_from_dir.c b/bin/gensquashfs/src/fstree_from_dir.c
index 5b3f003..5b3f003 100644
--- a/bin/gensquashfs/fstree_from_dir.c
+++ b/bin/gensquashfs/src/fstree_from_dir.c
diff --git a/bin/gensquashfs/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index e26d4b1..e26d4b1 100644
--- a/bin/gensquashfs/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
diff --git a/bin/gensquashfs/mkfs.c b/bin/gensquashfs/src/mkfs.c
index c773dd7..c773dd7 100644
--- a/bin/gensquashfs/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
diff --git a/bin/gensquashfs/mkfs.h b/bin/gensquashfs/src/mkfs.h
index 53fb018..53fb018 100644
--- a/bin/gensquashfs/mkfs.h
+++ b/bin/gensquashfs/src/mkfs.h
diff --git a/bin/gensquashfs/options.c b/bin/gensquashfs/src/options.c
index f263bce..f263bce 100644
--- a/bin/gensquashfs/options.c
+++ b/bin/gensquashfs/src/options.c
diff --git a/bin/gensquashfs/selinux.c b/bin/gensquashfs/src/selinux.c
index 678723b..678723b 100644
--- a/bin/gensquashfs/selinux.c
+++ b/bin/gensquashfs/src/selinux.c
diff --git a/bin/gensquashfs/sort_by_file.c b/bin/gensquashfs/src/sort_by_file.c
index a555718..a555718 100644
--- a/bin/gensquashfs/sort_by_file.c
+++ b/bin/gensquashfs/src/sort_by_file.c
diff --git a/bin/rdsquashfs/Makemodule.am b/bin/rdsquashfs/Makemodule.am
index 1ff9c60..f8f9d3d 100644
--- a/bin/rdsquashfs/Makemodule.am
+++ b/bin/rdsquashfs/Makemodule.am
@@ -1,8 +1,8 @@
-rdsquashfs_SOURCES = bin/rdsquashfs/rdsquashfs.c bin/rdsquashfs/rdsquashfs.h
-rdsquashfs_SOURCES += bin/rdsquashfs/list_files.c bin/rdsquashfs/options.c
-rdsquashfs_SOURCES += bin/rdsquashfs/restore_fstree.c bin/rdsquashfs/describe.c
-rdsquashfs_SOURCES += bin/rdsquashfs/fill_files.c bin/rdsquashfs/dump_xattrs.c
-rdsquashfs_SOURCES += bin/rdsquashfs/stat.c
+rdsquashfs_SOURCES = bin/rdsquashfs/src/rdsquashfs.c \
+	bin/rdsquashfs/src/rdsquashfs.h bin/rdsquashfs/src/list_files.c \
+	bin/rdsquashfs/src/options.c bin/rdsquashfs/src/restore_fstree.c \
+	bin/rdsquashfs/src/describe.c bin/rdsquashfs/src/fill_files.c \
+	bin/rdsquashfs/src/dump_xattrs.c bin/rdsquashfs/src/stat.c
 rdsquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 rdsquashfs_LDADD = libcommon.a libio.a libcompat.a libutil.a libsquashfs.la
 rdsquashfs_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS)
diff --git a/bin/rdsquashfs/describe.c b/bin/rdsquashfs/src/describe.c
index 540b126..540b126 100644
--- a/bin/rdsquashfs/describe.c
+++ b/bin/rdsquashfs/src/describe.c
diff --git a/bin/rdsquashfs/dump_xattrs.c b/bin/rdsquashfs/src/dump_xattrs.c
index 9dbe437..9dbe437 100644
--- a/bin/rdsquashfs/dump_xattrs.c
+++ b/bin/rdsquashfs/src/dump_xattrs.c
diff --git a/bin/rdsquashfs/fill_files.c b/bin/rdsquashfs/src/fill_files.c
index 3104146..3104146 100644
--- a/bin/rdsquashfs/fill_files.c
+++ b/bin/rdsquashfs/src/fill_files.c
diff --git a/bin/rdsquashfs/list_files.c b/bin/rdsquashfs/src/list_files.c
index b1a0102..b1a0102 100644
--- a/bin/rdsquashfs/list_files.c
+++ b/bin/rdsquashfs/src/list_files.c
diff --git a/bin/rdsquashfs/options.c b/bin/rdsquashfs/src/options.c
index dbb5e40..dbb5e40 100644
--- a/bin/rdsquashfs/options.c
+++ b/bin/rdsquashfs/src/options.c
diff --git a/bin/rdsquashfs/rdsquashfs.c b/bin/rdsquashfs/src/rdsquashfs.c
index bdcc5a0..bdcc5a0 100644
--- a/bin/rdsquashfs/rdsquashfs.c
+++ b/bin/rdsquashfs/src/rdsquashfs.c
diff --git a/bin/rdsquashfs/rdsquashfs.h b/bin/rdsquashfs/src/rdsquashfs.h
index 56bb836..56bb836 100644
--- a/bin/rdsquashfs/rdsquashfs.h
+++ b/bin/rdsquashfs/src/rdsquashfs.h
diff --git a/bin/rdsquashfs/restore_fstree.c b/bin/rdsquashfs/src/restore_fstree.c
index ea9d4f1..ea9d4f1 100644
--- a/bin/rdsquashfs/restore_fstree.c
+++ b/bin/rdsquashfs/src/restore_fstree.c
diff --git a/bin/rdsquashfs/stat.c b/bin/rdsquashfs/src/stat.c
index 8b4581f..8b4581f 100644
--- a/bin/rdsquashfs/stat.c
+++ b/bin/rdsquashfs/src/stat.c
diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am
index 05cee5b..2e6c411 100644
--- a/bin/sqfs2tar/Makemodule.am
+++ b/bin/sqfs2tar/Makemodule.am
@@ -1,6 +1,6 @@
-sqfs2tar_SOURCES = bin/sqfs2tar/sqfs2tar.c bin/sqfs2tar/sqfs2tar.h
-sqfs2tar_SOURCES += bin/sqfs2tar/options.c bin/sqfs2tar/write_tree.c
-sqfs2tar_SOURCES += bin/sqfs2tar/xattr.c
+sqfs2tar_SOURCES = bin/sqfs2tar/src/sqfs2tar.c bin/sqfs2tar/src/sqfs2tar.h \
+	bin/sqfs2tar/src/options.c bin/sqfs2tar/src/write_tree.c \
+	bin/sqfs2tar/src/xattr.c
 sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a
 sqfs2tar_LDADD += libio.a libxfrm.a libcompat.a libfstree.a
diff --git a/bin/sqfs2tar/options.c b/bin/sqfs2tar/src/options.c
index ba1588d..ba1588d 100644
--- a/bin/sqfs2tar/options.c
+++ b/bin/sqfs2tar/src/options.c
diff --git a/bin/sqfs2tar/sqfs2tar.c b/bin/sqfs2tar/src/sqfs2tar.c
index 43f9e78..43f9e78 100644
--- a/bin/sqfs2tar/sqfs2tar.c
+++ b/bin/sqfs2tar/src/sqfs2tar.c
diff --git a/bin/sqfs2tar/sqfs2tar.h b/bin/sqfs2tar/src/sqfs2tar.h
index 4bf5428..4bf5428 100644
--- a/bin/sqfs2tar/sqfs2tar.h
+++ b/bin/sqfs2tar/src/sqfs2tar.h
diff --git a/bin/sqfs2tar/write_tree.c b/bin/sqfs2tar/src/write_tree.c
index 354ec21..354ec21 100644
--- a/bin/sqfs2tar/write_tree.c
+++ b/bin/sqfs2tar/src/write_tree.c
diff --git a/bin/sqfs2tar/xattr.c b/bin/sqfs2tar/src/xattr.c
index abec4fb..abec4fb 100644
--- a/bin/sqfs2tar/xattr.c
+++ b/bin/sqfs2tar/src/xattr.c
diff --git a/bin/sqfsdiff/Makemodule.am b/bin/sqfsdiff/Makemodule.am
index ff08c7a..4f21901 100644
--- a/bin/sqfsdiff/Makemodule.am
+++ b/bin/sqfsdiff/Makemodule.am
@@ -1,8 +1,8 @@
-sqfsdiff_SOURCES = bin/sqfsdiff/sqfsdiff.c bin/sqfsdiff/sqfsdiff.h
-sqfsdiff_SOURCES += bin/sqfsdiff/util.c bin/sqfsdiff/options.c
-sqfsdiff_SOURCES += bin/sqfsdiff/compare_dir.c bin/sqfsdiff/node_compare.c
-sqfsdiff_SOURCES += bin/sqfsdiff/compare_files.c bin/sqfsdiff/super.c
-sqfsdiff_SOURCES += bin/sqfsdiff/extract.c
+sqfsdiff_SOURCES = bin/sqfsdiff/src/sqfsdiff.c bin/sqfsdiff/src/sqfsdiff.h \
+	bin/sqfsdiff/src/util.c bin/sqfsdiff/src/options.c \
+	bin/sqfsdiff/src/compare_dir.c bin/sqfsdiff/src/node_compare.c \
+	bin/sqfsdiff/src/compare_files.c bin/sqfsdiff/src/super.c \
+	bin/sqfsdiff/src/extract.c
 sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 sqfsdiff_LDADD = libcommon.a libsquashfs.la libio.a libcompat.a libutil.a
 sqfsdiff_LDADD += $(LZO_LIBS) libfstree.a $(PTHREAD_LIBS)
diff --git a/bin/sqfsdiff/compare_dir.c b/bin/sqfsdiff/src/compare_dir.c
index 1a4c800..1a4c800 100644
--- a/bin/sqfsdiff/compare_dir.c
+++ b/bin/sqfsdiff/src/compare_dir.c
diff --git a/bin/sqfsdiff/compare_files.c b/bin/sqfsdiff/src/compare_files.c
index 51b66bb..51b66bb 100644
--- a/bin/sqfsdiff/compare_files.c
+++ b/bin/sqfsdiff/src/compare_files.c
diff --git a/bin/sqfsdiff/extract.c b/bin/sqfsdiff/src/extract.c
index f2072d4..f2072d4 100644
--- a/bin/sqfsdiff/extract.c
+++ b/bin/sqfsdiff/src/extract.c
diff --git a/bin/sqfsdiff/node_compare.c b/bin/sqfsdiff/src/node_compare.c
index a0c99c7..a0c99c7 100644
--- a/bin/sqfsdiff/node_compare.c
+++ b/bin/sqfsdiff/src/node_compare.c
diff --git a/bin/sqfsdiff/options.c b/bin/sqfsdiff/src/options.c
index b8ce7f0..b8ce7f0 100644
--- a/bin/sqfsdiff/options.c
+++ b/bin/sqfsdiff/src/options.c
diff --git a/bin/sqfsdiff/sqfsdiff.c b/bin/sqfsdiff/src/sqfsdiff.c
index d789fe1..d789fe1 100644
--- a/bin/sqfsdiff/sqfsdiff.c
+++ b/bin/sqfsdiff/src/sqfsdiff.c
diff --git a/bin/sqfsdiff/sqfsdiff.h b/bin/sqfsdiff/src/sqfsdiff.h
index 65e8120..65e8120 100644
--- a/bin/sqfsdiff/sqfsdiff.h
+++ b/bin/sqfsdiff/src/sqfsdiff.h
diff --git a/bin/sqfsdiff/super.c b/bin/sqfsdiff/src/super.c
index 0cf18e0..0cf18e0 100644
--- a/bin/sqfsdiff/super.c
+++ b/bin/sqfsdiff/src/super.c
diff --git a/bin/sqfsdiff/util.c b/bin/sqfsdiff/src/util.c
index a11770f..a11770f 100644
--- a/bin/sqfsdiff/util.c
+++ b/bin/sqfsdiff/src/util.c
diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am
index faa2948..c8f52ea 100644
--- a/bin/tar2sqfs/Makemodule.am
+++ b/bin/tar2sqfs/Makemodule.am
@@ -1,5 +1,5 @@
-tar2sqfs_SOURCES = bin/tar2sqfs/tar2sqfs.c bin/tar2sqfs/tar2sqfs.h
-tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c
+tar2sqfs_SOURCES = bin/tar2sqfs/src/tar2sqfs.c bin/tar2sqfs/src/tar2sqfs.h \
+	bin/tar2sqfs/src/options.c bin/tar2sqfs/src/process_tarball.c
 tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libio.a libxfrm.a
 tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a libutil.a $(LZO_LIBS)
diff --git a/bin/tar2sqfs/options.c b/bin/tar2sqfs/src/options.c
index f2185a6..f2185a6 100644
--- a/bin/tar2sqfs/options.c
+++ b/bin/tar2sqfs/src/options.c
diff --git a/bin/tar2sqfs/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c
index 6aaa24b..6aaa24b 100644
--- a/bin/tar2sqfs/process_tarball.c
+++ b/bin/tar2sqfs/src/process_tarball.c
diff --git a/bin/tar2sqfs/tar2sqfs.c b/bin/tar2sqfs/src/tar2sqfs.c
index 9257fed..9257fed 100644
--- a/bin/tar2sqfs/tar2sqfs.c
+++ b/bin/tar2sqfs/src/tar2sqfs.c
diff --git a/bin/tar2sqfs/tar2sqfs.h b/bin/tar2sqfs/src/tar2sqfs.h
index a21774b..a21774b 100644
--- a/bin/tar2sqfs/tar2sqfs.h
+++ b/bin/tar2sqfs/src/tar2sqfs.h
diff --git a/lib/common/Makemodule.am b/lib/common/Makemodule.am
index b19ecd6..74b924e 100644
--- a/lib/common/Makemodule.am
+++ b/lib/common/Makemodule.am
@@ -1,18 +1,16 @@
-libcommon_a_SOURCES = lib/common/hardlink.c
-libcommon_a_SOURCES += lib/common/print_version.c lib/common/data_reader_dump.c
-libcommon_a_SOURCES += lib/common/compress.c lib/common/comp_opt.c
-libcommon_a_SOURCES += lib/common/data_writer.c include/common.h
-libcommon_a_SOURCES += lib/common/data_writer_ostream.c
-libcommon_a_SOURCES += lib/common/perror.c lib/common/parse_size.c
-libcommon_a_SOURCES += lib/common/print_size.c include/simple_writer.h
-libcommon_a_SOURCES += include/compress_cli.h
-libcommon_a_SOURCES += lib/common/writer/init.c lib/common/writer/cleanup.c
-libcommon_a_SOURCES += lib/common/writer/serialize_fstree.c
-libcommon_a_SOURCES += lib/common/writer/finish.c
+libcommon_a_SOURCES = include/common.h include/simple_writer.h \
+	include/compress_cli.h \
+	lib/common/src/hardlink.c lib/common/src/print_version.c \
+	lib/common/src/data_reader_dump.c lib/common/src/compress.c \
+	lib/common/src/comp_opt.c lib/common/src/data_writer.c \
+	lib/common/src/data_writer_ostream.c lib/common/src/perror.c \
+	lib/common/src/parse_size.c lib/common/src/print_size.c \
+	lib/common/src/writer/init.c lib/common/src/writer/cleanup.c \
+	lib/common/src/writer/serialize_fstree.c lib/common/src/writer/finish.c
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LZO_CFLAGS)
 
 if WITH_LZO
-libcommon_a_SOURCES += lib/common/comp_lzo.c
+libcommon_a_SOURCES += lib/common/src/comp_lzo.c
 endif
 
 noinst_LIBRARIES += libcommon.a
diff --git a/lib/common/comp_lzo.c b/lib/common/src/comp_lzo.c
index 2021d34..2021d34 100644
--- a/lib/common/comp_lzo.c
+++ b/lib/common/src/comp_lzo.c
diff --git a/lib/common/comp_opt.c b/lib/common/src/comp_opt.c
index d605c0c..d605c0c 100644
--- a/lib/common/comp_opt.c
+++ b/lib/common/src/comp_opt.c
diff --git a/lib/common/compress.c b/lib/common/src/compress.c
index 1e0ca06..1e0ca06 100644
--- a/lib/common/compress.c
+++ b/lib/common/src/compress.c
diff --git a/lib/common/data_reader_dump.c b/lib/common/src/data_reader_dump.c
index 7902c25..7902c25 100644
--- a/lib/common/data_reader_dump.c
+++ b/lib/common/src/data_reader_dump.c
diff --git a/lib/common/data_writer.c b/lib/common/src/data_writer.c
index ceccaac..ceccaac 100644
--- a/lib/common/data_writer.c
+++ b/lib/common/src/data_writer.c
diff --git a/lib/common/data_writer_ostream.c b/lib/common/src/data_writer_ostream.c
index fbd0431..fbd0431 100644
--- a/lib/common/data_writer_ostream.c
+++ b/lib/common/src/data_writer_ostream.c
diff --git a/lib/common/hardlink.c b/lib/common/src/hardlink.c
index e43df33..e43df33 100644
--- a/lib/common/hardlink.c
+++ b/lib/common/src/hardlink.c
diff --git a/lib/common/parse_size.c b/lib/common/src/parse_size.c
index 3e79a19..3e79a19 100644
--- a/lib/common/parse_size.c
+++ b/lib/common/src/parse_size.c
diff --git a/lib/common/perror.c b/lib/common/src/perror.c
index 53a8c16..53a8c16 100644
--- a/lib/common/perror.c
+++ b/lib/common/src/perror.c
diff --git a/lib/common/print_size.c b/lib/common/src/print_size.c
index 6e76805..6e76805 100644
--- a/lib/common/print_size.c
+++ b/lib/common/src/print_size.c
diff --git a/lib/common/print_version.c b/lib/common/src/print_version.c
index 0c7fe5c..0c7fe5c 100644
--- a/lib/common/print_version.c
+++ b/lib/common/src/print_version.c
diff --git a/lib/common/writer/cleanup.c b/lib/common/src/writer/cleanup.c
index a3fd039..a3fd039 100644
--- a/lib/common/writer/cleanup.c
+++ b/lib/common/src/writer/cleanup.c
diff --git a/lib/common/writer/finish.c b/lib/common/src/writer/finish.c
index c539579..c539579 100644
--- a/lib/common/writer/finish.c
+++ b/lib/common/src/writer/finish.c
diff --git a/lib/common/writer/init.c b/lib/common/src/writer/init.c
index 497fc6e..497fc6e 100644
--- a/lib/common/writer/init.c
+++ b/lib/common/src/writer/init.c
diff --git a/lib/common/writer/serialize_fstree.c b/lib/common/src/writer/serialize_fstree.c
index 9776874..9776874 100644
--- a/lib/common/writer/serialize_fstree.c
+++ b/lib/common/src/writer/serialize_fstree.c
diff --git a/lib/compat/Makemodule.am b/lib/compat/Makemodule.am
index 06fc95e..be9bf8c 100644
--- a/lib/compat/Makemodule.am
+++ b/lib/compat/Makemodule.am
@@ -1,13 +1,9 @@
-libcompat_a_SOURCES = lib/compat/getsubopt.c
-libcompat_a_SOURCES += lib/compat/strndup.c lib/compat/mockups.c
-libcompat_a_SOURCES += lib/compat/chdir.c include/compat.h
-libcompat_a_SOURCES += lib/compat/path_to_windows.c
-libcompat_a_SOURCES += lib/compat/w32_perror.c
-libcompat_a_SOURCES += lib/compat/w32_wmain.c
-libcompat_a_SOURCES += lib/compat/w32_stdio.c
-libcompat_a_SOURCES += lib/compat/fnmatch.c
-libcompat_a_SOURCES += lib/compat/getopt.c
-libcompat_a_SOURCES += lib/compat/getopt_long.c
-libcompat_a_SOURCES += lib/compat/strchrnul.c
+libcompat_a_SOURCES = include/compat.h lib/compat/src/getsubopt.c \
+	lib/compat/src/strndup.c lib/compat/src/mockups.c \
+	lib/compat/src/chdir.c lib/compat/src/path_to_windows.c \
+	lib/compat/src/w32_perror.c lib/compat/src/w32_wmain.c \
+	lib/compat/src/w32_stdio.c lib/compat/src/fnmatch.c \
+	lib/compat/src/getopt.c lib/compat/src/getopt_long.c \
+	lib/compat/src/strchrnul.c
 
 noinst_LIBRARIES += libcompat.a
diff --git a/lib/compat/chdir.c b/lib/compat/src/chdir.c
index f695e2a..f695e2a 100644
--- a/lib/compat/chdir.c
+++ b/lib/compat/src/chdir.c
diff --git a/lib/compat/fnmatch.c b/lib/compat/src/fnmatch.c
index ed4dde1..ed4dde1 100644
--- a/lib/compat/fnmatch.c
+++ b/lib/compat/src/fnmatch.c
diff --git a/lib/compat/getopt.c b/lib/compat/src/getopt.c
index 9876a87..9876a87 100644
--- a/lib/compat/getopt.c
+++ b/lib/compat/src/getopt.c
diff --git a/lib/compat/getopt_long.c b/lib/compat/src/getopt_long.c
index 58354c3..58354c3 100644
--- a/lib/compat/getopt_long.c
+++ b/lib/compat/src/getopt_long.c
diff --git a/lib/compat/getsubopt.c b/lib/compat/src/getsubopt.c
index e6fea1a..e6fea1a 100644
--- a/lib/compat/getsubopt.c
+++ b/lib/compat/src/getsubopt.c
diff --git a/lib/compat/mockups.c b/lib/compat/src/mockups.c
index 4c396ec..4c396ec 100644
--- a/lib/compat/mockups.c
+++ b/lib/compat/src/mockups.c
diff --git a/lib/compat/path_to_windows.c b/lib/compat/src/path_to_windows.c
index ff3a5d2..ff3a5d2 100644
--- a/lib/compat/path_to_windows.c
+++ b/lib/compat/src/path_to_windows.c
diff --git a/lib/compat/strchrnul.c b/lib/compat/src/strchrnul.c
index 7296060..7296060 100644
--- a/lib/compat/strchrnul.c
+++ b/lib/compat/src/strchrnul.c
diff --git a/lib/compat/strndup.c b/lib/compat/src/strndup.c
index 7e77f6c..7e77f6c 100644
--- a/lib/compat/strndup.c
+++ b/lib/compat/src/strndup.c
diff --git a/lib/compat/w32_perror.c b/lib/compat/src/w32_perror.c
index 8c84191..8c84191 100644
--- a/lib/compat/w32_perror.c
+++ b/lib/compat/src/w32_perror.c
diff --git a/lib/compat/w32_stdio.c b/lib/compat/src/w32_stdio.c
index c7f68d0..c7f68d0 100644
--- a/lib/compat/w32_stdio.c
+++ b/lib/compat/src/w32_stdio.c
diff --git a/lib/compat/w32_wmain.c b/lib/compat/src/w32_wmain.c
index 9b3e354..9b3e354 100644
--- a/lib/compat/w32_wmain.c
+++ b/lib/compat/src/w32_wmain.c
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index 09cd9ac..f740527 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -1,8 +1,6 @@
-libfstree_a_SOURCES = include/fstree.h lib/fstree/fstree.c
-libfstree_a_SOURCES += lib/fstree/post_process.c lib/fstree/get_path.c
-libfstree_a_SOURCES += lib/fstree/mknode.c lib/fstree/hardlink.c
-libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/get_by_path.c
-libfstree_a_CFLAGS = $(AM_CFLAGS)
-libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
+libfstree_a_SOURCES = include/fstree.h lib/fstree/src/fstree.c \
+	lib/fstree/src/post_process.c lib/fstree/src/get_path.c \
+	lib/fstree/src/mknode.c lib/fstree/src/hardlink.c \
+	lib/fstree/src/add_by_path.c lib/fstree/src/get_by_path.c
 
 noinst_LIBRARIES += libfstree.a
diff --git a/lib/fstree/add_by_path.c b/lib/fstree/src/add_by_path.c
index 0afd898..0afd898 100644
--- a/lib/fstree/add_by_path.c
+++ b/lib/fstree/src/add_by_path.c
diff --git a/lib/fstree/fstree.c b/lib/fstree/src/fstree.c
index d44a8ae..d44a8ae 100644
--- a/lib/fstree/fstree.c
+++ b/lib/fstree/src/fstree.c
diff --git a/lib/fstree/get_by_path.c b/lib/fstree/src/get_by_path.c
index 8742892..8742892 100644
--- a/lib/fstree/get_by_path.c
+++ b/lib/fstree/src/get_by_path.c
diff --git a/lib/fstree/get_path.c b/lib/fstree/src/get_path.c
index decf92e..decf92e 100644
--- a/lib/fstree/get_path.c
+++ b/lib/fstree/src/get_path.c
diff --git a/lib/fstree/hardlink.c b/lib/fstree/src/hardlink.c
index 2165b5f..2165b5f 100644
--- a/lib/fstree/hardlink.c
+++ b/lib/fstree/src/hardlink.c
diff --git a/lib/fstree/mknode.c b/lib/fstree/src/mknode.c
index 2faf901..2faf901 100644
--- a/lib/fstree/mknode.c
+++ b/lib/fstree/src/mknode.c
diff --git a/lib/fstree/post_process.c b/lib/fstree/src/post_process.c
index 088916b..088916b 100644
--- a/lib/fstree/post_process.c
+++ b/lib/fstree/src/post_process.c
diff --git a/lib/io/Makemodule.am b/lib/io/Makemodule.am
index 918ce50..c331124 100644
--- a/lib/io/Makemodule.am
+++ b/lib/io/Makemodule.am
@@ -1,19 +1,16 @@
-libio_a_SOURCES = lib/io/internal.h
-libio_a_SOURCES += include/io/istream.h lib/io/ostream.c lib/io/printf.c
-libio_a_SOURCES += include/io/ostream.h lib/io/istream.c lib/io/get_line.c
-libio_a_SOURCES += include/io/xfrm.h include/io/file.h include/io/std.h
-libio_a_SOURCES += lib/io/xfrm/ostream.c lib/io/xfrm/istream.c
+libio_a_SOURCES = include/io/istream.h include/io/ostream.h include/io/xfrm.h \
+	include/io/file.h include/io/std.h \
+	lib/io/src/internal.h lib/io/src/ostream.c lib/io/src/printf.c \
+	lib/io/src/istream.c lib/io/src/get_line.c lib/io/src/xfrm/ostream.c \
+	lib/io/src/xfrm/istream.c
 libio_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS)
 libio_a_CFLAGS += $(ZSTD_CFLAGS) $(BZIP2_CFLAGS)
-libio_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 if WINDOWS
-libio_a_SOURCES += lib/io/win32/ostream.c
-libio_a_SOURCES += lib/io/win32/istream.c
+libio_a_SOURCES += lib/io/src/win32/ostream.c lib/io/src/win32/istream.c
 libio_a_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600
 else
-libio_a_SOURCES += lib/io/unix/ostream.c
-libio_a_SOURCES += lib/io/unix/istream.c
+libio_a_SOURCES += lib/io/src/unix/ostream.c lib/io/src/unix/istream.c
 endif
 
 noinst_LIBRARIES += libio.a
diff --git a/lib/io/get_line.c b/lib/io/src/get_line.c
index f7e0b59..f7e0b59 100644
--- a/lib/io/get_line.c
+++ b/lib/io/src/get_line.c
diff --git a/lib/io/internal.h b/lib/io/src/internal.h
index 25a0196..25a0196 100644
--- a/lib/io/internal.h
+++ b/lib/io/src/internal.h
diff --git a/lib/io/istream.c b/lib/io/src/istream.c
index 64fa478..64fa478 100644
--- a/lib/io/istream.c
+++ b/lib/io/src/istream.c
diff --git a/lib/io/ostream.c b/lib/io/src/ostream.c
index da0b7b3..da0b7b3 100644
--- a/lib/io/ostream.c
+++ b/lib/io/src/ostream.c
diff --git a/lib/io/printf.c b/lib/io/src/printf.c
index 3850487..3850487 100644
--- a/lib/io/printf.c
+++ b/lib/io/src/printf.c
diff --git a/lib/io/unix/istream.c b/lib/io/src/unix/istream.c
index f8cffad..f8cffad 100644
--- a/lib/io/unix/istream.c
+++ b/lib/io/src/unix/istream.c
diff --git a/lib/io/unix/ostream.c b/lib/io/src/unix/ostream.c
index 5ef2af2..5ef2af2 100644
--- a/lib/io/unix/ostream.c
+++ b/lib/io/src/unix/ostream.c
diff --git a/lib/io/win32/istream.c b/lib/io/src/win32/istream.c
index be3d829..be3d829 100644
--- a/lib/io/win32/istream.c
+++ b/lib/io/src/win32/istream.c
diff --git a/lib/io/win32/ostream.c b/lib/io/src/win32/ostream.c
index 0fe04f3..0fe04f3 100644
--- a/lib/io/win32/ostream.c
+++ b/lib/io/src/win32/ostream.c
diff --git a/lib/io/xfrm/istream.c b/lib/io/src/xfrm/istream.c
index 4a1ad77..4a1ad77 100644
--- a/lib/io/xfrm/istream.c
+++ b/lib/io/src/xfrm/istream.c
diff --git a/lib/io/xfrm/ostream.c b/lib/io/src/xfrm/ostream.c
index bd94515..bd94515 100644
--- a/lib/io/xfrm/ostream.c
+++ b/lib/io/src/xfrm/ostream.c
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 748794a..dfd88c9 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -10,30 +10,27 @@ LIBSQFS_HEARDS = include/sqfs/meta_writer.h \
 		include/sqfs/xattr_reader.h include/sqfs/xattr_writer.h \
 		include/sqfs/frag_table.h include/sqfs/block_writer.h
 
-libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/id_table.c lib/sqfs/super.c
-libsquashfs_la_SOURCES += lib/sqfs/readdir.c lib/sqfs/xattr/xattr.c
-libsquashfs_la_SOURCES += lib/sqfs/write_table.c lib/sqfs/meta_writer.c
-libsquashfs_la_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/read_inode.c lib/sqfs/write_inode.c
-libsquashfs_la_SOURCES += lib/sqfs/dir_writer.c lib/sqfs/xattr/xattr_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/read_table.c lib/sqfs/comp/compressor.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/internal.h
-libsquashfs_la_SOURCES += lib/sqfs/dir_reader/dir_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/dir_reader/read_tree.c
-libsquashfs_la_SOURCES += lib/sqfs/dir_reader/get_path.c
-libsquashfs_la_SOURCES += lib/sqfs/dir_reader/internal.h
-libsquashfs_la_SOURCES += lib/sqfs/inode.c lib/sqfs/xattr/xattr_writer.c
-libsquashfs_la_SOURCES += lib/sqfs/xattr/xattr_writer_flush.c
-libsquashfs_la_SOURCES += lib/sqfs/xattr/xattr_writer_record.c
-libsquashfs_la_SOURCES += lib/sqfs/xattr/xattr_writer.h
-libsquashfs_la_SOURCES += lib/sqfs/write_super.c lib/sqfs/data_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/block_processor/internal.h
-libsquashfs_la_SOURCES += lib/sqfs/block_processor/frontend.c
-libsquashfs_la_SOURCES += lib/sqfs/block_processor/block_processor.c
-libsquashfs_la_SOURCES += lib/sqfs/block_processor/backend.c
-libsquashfs_la_SOURCES += lib/sqfs/frag_table.c include/sqfs/frag_table.h
-libsquashfs_la_SOURCES += lib/sqfs/block_writer.c include/sqfs/block_writer.h
-libsquashfs_la_SOURCES += lib/sqfs/misc.c
+libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/src/id_table.c \
+	lib/sqfs/src/super.c lib/sqfs/src/readdir.c lib/sqfs/src/xattr/xattr.c \
+	lib/sqfs/src/write_table.c lib/sqfs/src/meta_writer.c \
+	lib/sqfs/src/read_super.c lib/sqfs/src/meta_reader.c \
+	lib/sqfs/src/read_inode.c lib/sqfs/src/write_inode.c \
+	lib/sqfs/src/dir_writer.c lib/sqfs/src/xattr/xattr_reader.c \
+	lib/sqfs/src/read_table.c lib/sqfs/src/comp/compressor.c \
+	lib/sqfs/src/comp/internal.h lib/sqfs/src/dir_reader/dir_reader.c \
+	lib/sqfs/src/dir_reader/read_tree.c lib/sqfs/src/dir_reader/get_path.c \
+	lib/sqfs/src/dir_reader/internal.h lib/sqfs/src/inode.c \
+	lib/sqfs/src/xattr/xattr_writer.c \
+	lib/sqfs/src/xattr/xattr_writer_flush.c \
+	lib/sqfs/src/xattr/xattr_writer_record.c \
+	lib/sqfs/src/xattr/xattr_writer.h \
+	lib/sqfs/src/write_super.c lib/sqfs/src/data_reader.c \
+	lib/sqfs/src/block_processor/internal.h \
+	lib/sqfs/src/block_processor/frontend.c \
+	lib/sqfs/src/block_processor/block_processor.c \
+	lib/sqfs/src/block_processor/backend.c \
+	lib/sqfs/src/frag_table.c lib/sqfs/src/block_writer.c \
+	lib/sqfs/src/misc.c
 libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
 libsquashfs_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSQUASHFS_SO_VERSION)
 libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
@@ -43,60 +40,60 @@ libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS)
 libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS)
 
 # directly "import" stuff from libutil
-libsquashfs_la_SOURCES += lib/util/str_table.c lib/util/alloc.c
-libsquashfs_la_SOURCES += lib/util/xxhash.c lib/util/file_cmp.c
-libsquashfs_la_SOURCES += lib/util/hash_table.c include/util/hash_table.h
-libsquashfs_la_SOURCES += lib/util/rbtree.c include/util/rbtree.h
-libsquashfs_la_SOURCES += lib/util/array.c include/util/array.h
-libsquashfs_la_SOURCES += lib/util/is_memory_zero.c
+libsquashfs_la_SOURCES += lib/util/src/str_table.c lib/util/src/alloc.c
+libsquashfs_la_SOURCES += lib/util/src/xxhash.c lib/util/src/file_cmp.c
+libsquashfs_la_SOURCES += lib/util/src/hash_table.c include/util/hash_table.h
+libsquashfs_la_SOURCES += lib/util/src/rbtree.c include/util/rbtree.h
+libsquashfs_la_SOURCES += lib/util/src/array.c include/util/array.h
+libsquashfs_la_SOURCES += lib/util/src/is_memory_zero.c
 libsquashfs_la_SOURCES += include/util/threadpool.h
 
 # and from libcompat
-libsquashfs_la_SOURCES += lib/compat/strchrnul.c lib/compat/strndup.c
+libsquashfs_la_SOURCES += lib/compat/src/strchrnul.c lib/compat/src/strndup.c
 libsquashfs_la_SOURCES += include/compat.h
 
 if CUSTOM_ALLOC
-libsquashfs_la_SOURCES += lib/util/mempool.c include/util/mempool.h
+libsquashfs_la_SOURCES += lib/util/src/mempool.c include/util/mempool.h
 endif
 
 if WINDOWS
-libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c
+libsquashfs_la_SOURCES += lib/sqfs/src/win32/io_file.c
 libsquashfs_la_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600
 libsquashfs_la_CFLAGS += -Wc,-static-libgcc
 libsquashfs_la_LDFLAGS += -no-undefined -avoid-version
 else
-libsquashfs_la_SOURCES += lib/sqfs/unix/io_file.c
+libsquashfs_la_SOURCES += lib/sqfs/src/unix/io_file.c
 endif
 
 if HAVE_PTHREAD
-libsquashfs_la_SOURCES += lib/util/threadpool.c
+libsquashfs_la_SOURCES += lib/util/src/threadpool.c
 else
 if WINDOWS
-libsquashfs_la_SOURCES += lib/util/threadpool.c
+libsquashfs_la_SOURCES += lib/util/src/threadpool.c
 else
-libsquashfs_la_SOURCES += lib/util/threadpool_serial.c
+libsquashfs_la_SOURCES += lib/util/src/threadpool_serial.c
 libsquashfs_la_CPPFLAGS += -DNO_THREAD_IMPL
 endif
 endif
 
 if WITH_GZIP
-libsquashfs_la_SOURCES += lib/sqfs/comp/gzip.c
+libsquashfs_la_SOURCES += lib/sqfs/src/comp/gzip.c
 libsquashfs_la_CPPFLAGS += -DWITH_GZIP
 endif
 
 if WITH_XZ
-libsquashfs_la_SOURCES += lib/sqfs/comp/xz.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/lzma.c
+libsquashfs_la_SOURCES += lib/sqfs/src/comp/xz.c
+libsquashfs_la_SOURCES += lib/sqfs/src/comp/lzma.c
 libsquashfs_la_CPPFLAGS += -DWITH_XZ
 endif
 
 if WITH_LZ4
-libsquashfs_la_SOURCES += lib/sqfs/comp/lz4.c
+libsquashfs_la_SOURCES += lib/sqfs/src/comp/lz4.c
 libsquashfs_la_CPPFLAGS += -DWITH_LZ4
 endif
 
 if WITH_ZSTD
-libsquashfs_la_SOURCES += lib/sqfs/comp/zstd.c
+libsquashfs_la_SOURCES += lib/sqfs/src/comp/zstd.c
 libsquashfs_la_CPPFLAGS += -DWITH_ZSTD
 endif
 
diff --git a/lib/sqfs/block_processor/backend.c b/lib/sqfs/src/block_processor/backend.c
index b443c9d..b443c9d 100644
--- a/lib/sqfs/block_processor/backend.c
+++ b/lib/sqfs/src/block_processor/backend.c
diff --git a/lib/sqfs/block_processor/block_processor.c b/lib/sqfs/src/block_processor/block_processor.c
index d607437..d607437 100644
--- a/lib/sqfs/block_processor/block_processor.c
+++ b/lib/sqfs/src/block_processor/block_processor.c
diff --git a/lib/sqfs/block_processor/frontend.c b/lib/sqfs/src/block_processor/frontend.c
index e8a4207..e8a4207 100644
--- a/lib/sqfs/block_processor/frontend.c
+++ b/lib/sqfs/src/block_processor/frontend.c
diff --git a/lib/sqfs/block_processor/internal.h b/lib/sqfs/src/block_processor/internal.h
index 0b2c88d..0b2c88d 100644
--- a/lib/sqfs/block_processor/internal.h
+++ b/lib/sqfs/src/block_processor/internal.h
diff --git a/lib/sqfs/block_writer.c b/lib/sqfs/src/block_writer.c
index a5135bc..a5135bc 100644
--- a/lib/sqfs/block_writer.c
+++ b/lib/sqfs/src/block_writer.c
diff --git a/lib/sqfs/comp/compressor.c b/lib/sqfs/src/comp/compressor.c
index 4c4d73c..4c4d73c 100644
--- a/lib/sqfs/comp/compressor.c
+++ b/lib/sqfs/src/comp/compressor.c
diff --git a/lib/sqfs/comp/gzip.c b/lib/sqfs/src/comp/gzip.c
index beacfb8..beacfb8 100644
--- a/lib/sqfs/comp/gzip.c
+++ b/lib/sqfs/src/comp/gzip.c
diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/src/comp/internal.h
index e4c3dd8..e4c3dd8 100644
--- a/lib/sqfs/comp/internal.h
+++ b/lib/sqfs/src/comp/internal.h
diff --git a/lib/sqfs/comp/lz4.c b/lib/sqfs/src/comp/lz4.c
index 77f4a6e..77f4a6e 100644
--- a/lib/sqfs/comp/lz4.c
+++ b/lib/sqfs/src/comp/lz4.c
diff --git a/lib/sqfs/comp/lzma.c b/lib/sqfs/src/comp/lzma.c
index 5456603..5456603 100644
--- a/lib/sqfs/comp/lzma.c
+++ b/lib/sqfs/src/comp/lzma.c
diff --git a/lib/sqfs/comp/xz.c b/lib/sqfs/src/comp/xz.c
index 13545ed..13545ed 100644
--- a/lib/sqfs/comp/xz.c
+++ b/lib/sqfs/src/comp/xz.c
diff --git a/lib/sqfs/comp/zstd.c b/lib/sqfs/src/comp/zstd.c
index a6d7975..a6d7975 100644
--- a/lib/sqfs/comp/zstd.c
+++ b/lib/sqfs/src/comp/zstd.c
diff --git a/lib/sqfs/data_reader.c b/lib/sqfs/src/data_reader.c
index 3f0cd74..3f0cd74 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfs/src/data_reader.c
diff --git a/lib/sqfs/dir_reader/dir_reader.c b/lib/sqfs/src/dir_reader/dir_reader.c
index d70f729..d70f729 100644
--- a/lib/sqfs/dir_reader/dir_reader.c
+++ b/lib/sqfs/src/dir_reader/dir_reader.c
diff --git a/lib/sqfs/dir_reader/get_path.c b/lib/sqfs/src/dir_reader/get_path.c
index 847bfd3..847bfd3 100644
--- a/lib/sqfs/dir_reader/get_path.c
+++ b/lib/sqfs/src/dir_reader/get_path.c
diff --git a/lib/sqfs/dir_reader/internal.h b/lib/sqfs/src/dir_reader/internal.h
index 471d197..471d197 100644
--- a/lib/sqfs/dir_reader/internal.h
+++ b/lib/sqfs/src/dir_reader/internal.h
diff --git a/lib/sqfs/dir_reader/read_tree.c b/lib/sqfs/src/dir_reader/read_tree.c
index 91cc2c0..91cc2c0 100644
--- a/lib/sqfs/dir_reader/read_tree.c
+++ b/lib/sqfs/src/dir_reader/read_tree.c
diff --git a/lib/sqfs/dir_writer.c b/lib/sqfs/src/dir_writer.c
index d2b72df..d2b72df 100644
--- a/lib/sqfs/dir_writer.c
+++ b/lib/sqfs/src/dir_writer.c
diff --git a/lib/sqfs/frag_table.c b/lib/sqfs/src/frag_table.c
index 151df28..151df28 100644
--- a/lib/sqfs/frag_table.c
+++ b/lib/sqfs/src/frag_table.c
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/src/id_table.c
index ec3fdfe..ec3fdfe 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/src/id_table.c
diff --git a/lib/sqfs/inode.c b/lib/sqfs/src/inode.c
index ce51cf5..ce51cf5 100644
--- a/lib/sqfs/inode.c
+++ b/lib/sqfs/src/inode.c
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/src/meta_reader.c
index e431d40..e431d40 100644
--- a/lib/sqfs/meta_reader.c
+++ b/lib/sqfs/src/meta_reader.c
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/src/meta_writer.c
index bf3f426..bf3f426 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/src/meta_writer.c
diff --git a/lib/sqfs/misc.c b/lib/sqfs/src/misc.c
index 74a4203..74a4203 100644
--- a/lib/sqfs/misc.c
+++ b/lib/sqfs/src/misc.c
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/src/read_inode.c
index 12bef48..12bef48 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/src/read_inode.c
diff --git a/lib/sqfs/read_super.c b/lib/sqfs/src/read_super.c
index 11bc314..11bc314 100644
--- a/lib/sqfs/read_super.c
+++ b/lib/sqfs/src/read_super.c
diff --git a/lib/sqfs/read_table.c b/lib/sqfs/src/read_table.c
index c6a9bbe..c6a9bbe 100644
--- a/lib/sqfs/read_table.c
+++ b/lib/sqfs/src/read_table.c
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/src/readdir.c
index e2dbcd4..e2dbcd4 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/src/readdir.c
diff --git a/lib/sqfs/super.c b/lib/sqfs/src/super.c
index 470c06a..470c06a 100644
--- a/lib/sqfs/super.c
+++ b/lib/sqfs/src/super.c
diff --git a/lib/sqfs/unix/io_file.c b/lib/sqfs/src/unix/io_file.c
index e1fb9db..e1fb9db 100644
--- a/lib/sqfs/unix/io_file.c
+++ b/lib/sqfs/src/unix/io_file.c
diff --git a/lib/sqfs/win32/io_file.c b/lib/sqfs/src/win32/io_file.c
index 548a246..548a246 100644
--- a/lib/sqfs/win32/io_file.c
+++ b/lib/sqfs/src/win32/io_file.c
diff --git a/lib/sqfs/write_inode.c b/lib/sqfs/src/write_inode.c
index 118b713..118b713 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfs/src/write_inode.c
diff --git a/lib/sqfs/write_super.c b/lib/sqfs/src/write_super.c
index 35127da..35127da 100644
--- a/lib/sqfs/write_super.c
+++ b/lib/sqfs/src/write_super.c
diff --git a/lib/sqfs/write_table.c b/lib/sqfs/src/write_table.c
index 6f28a75..6f28a75 100644
--- a/lib/sqfs/write_table.c
+++ b/lib/sqfs/src/write_table.c
diff --git a/lib/sqfs/xattr/xattr.c b/lib/sqfs/src/xattr/xattr.c
index 29ecebf..29ecebf 100644
--- a/lib/sqfs/xattr/xattr.c
+++ b/lib/sqfs/src/xattr/xattr.c
diff --git a/lib/sqfs/xattr/xattr_reader.c b/lib/sqfs/src/xattr/xattr_reader.c
index 9e3ea76..9e3ea76 100644
--- a/lib/sqfs/xattr/xattr_reader.c
+++ b/lib/sqfs/src/xattr/xattr_reader.c
diff --git a/lib/sqfs/xattr/xattr_writer.c b/lib/sqfs/src/xattr/xattr_writer.c
index 39e1b05..39e1b05 100644
--- a/lib/sqfs/xattr/xattr_writer.c
+++ b/lib/sqfs/src/xattr/xattr_writer.c
diff --git a/lib/sqfs/xattr/xattr_writer.h b/lib/sqfs/src/xattr/xattr_writer.h
index 792cfae..792cfae 100644
--- a/lib/sqfs/xattr/xattr_writer.h
+++ b/lib/sqfs/src/xattr/xattr_writer.h
diff --git a/lib/sqfs/xattr/xattr_writer_flush.c b/lib/sqfs/src/xattr/xattr_writer_flush.c
index a06463f..a06463f 100644
--- a/lib/sqfs/xattr/xattr_writer_flush.c
+++ b/lib/sqfs/src/xattr/xattr_writer_flush.c
diff --git a/lib/sqfs/xattr/xattr_writer_record.c b/lib/sqfs/src/xattr/xattr_writer_record.c
index 81bbf6b..81bbf6b 100644
--- a/lib/sqfs/xattr/xattr_writer_record.c
+++ b/lib/sqfs/src/xattr/xattr_writer_record.c
diff --git a/lib/tar/Makemodule.am b/lib/tar/Makemodule.am
index 7f93d13..1db02f1 100644
--- a/lib/tar/Makemodule.am
+++ b/lib/tar/Makemodule.am
@@ -1,11 +1,8 @@
-libtar_a_SOURCES = lib/tar/read_header.c lib/tar/write_header.c
-libtar_a_SOURCES += lib/tar/number.c lib/tar/checksum.c lib/tar/cleanup.c
-libtar_a_SOURCES += lib/tar/read_sparse_map_old.c
-libtar_a_SOURCES += lib/tar/internal.h
-libtar_a_SOURCES += lib/tar/padd_file.c lib/tar/record_to_memory.c
-libtar_a_SOURCES += lib/tar/pax_header.c lib/tar/read_sparse_map_new.c
-libtar_a_SOURCES += include/tar/tar.h include/tar/format.h
-libtar_a_CFLAGS = $(AM_CFLAGS)
-libtar_a_CPPFLAGS = $(AM_CPPFLAGS)
+libtar_a_SOURCES = lib/tar/src/read_header.c lib/tar/src/write_header.c \
+	lib/tar/src/number.c lib/tar/src/checksum.c lib/tar/src/cleanup.c \
+	lib/tar/src/read_sparse_map_old.c lib/tar/src/internal.h \
+	lib/tar/src/padd_file.c lib/tar/src/record_to_memory.c \
+	lib/tar/src/pax_header.c lib/tar/src/read_sparse_map_new.c \
+	include/tar/tar.h include/tar/format.h
 
 noinst_LIBRARIES += libtar.a
diff --git a/lib/tar/checksum.c b/lib/tar/src/checksum.c
index 6541373..6541373 100644
--- a/lib/tar/checksum.c
+++ b/lib/tar/src/checksum.c
diff --git a/lib/tar/cleanup.c b/lib/tar/src/cleanup.c
index 9f33336..9f33336 100644
--- a/lib/tar/cleanup.c
+++ b/lib/tar/src/cleanup.c
diff --git a/lib/tar/internal.h b/lib/tar/src/internal.h
index c5483fe..c5483fe 100644
--- a/lib/tar/internal.h
+++ b/lib/tar/src/internal.h
diff --git a/lib/tar/number.c b/lib/tar/src/number.c
index 2f179df..2f179df 100644
--- a/lib/tar/number.c
+++ b/lib/tar/src/number.c
diff --git a/lib/tar/padd_file.c b/lib/tar/src/padd_file.c
index 053ff1e..053ff1e 100644
--- a/lib/tar/padd_file.c
+++ b/lib/tar/src/padd_file.c
diff --git a/lib/tar/pax_header.c b/lib/tar/src/pax_header.c
index b61aab6..b61aab6 100644
--- a/lib/tar/pax_header.c
+++ b/lib/tar/src/pax_header.c
diff --git a/lib/tar/read_header.c b/lib/tar/src/read_header.c
index ea4873b..ea4873b 100644
--- a/lib/tar/read_header.c
+++ b/lib/tar/src/read_header.c
diff --git a/lib/tar/read_sparse_map_new.c b/lib/tar/src/read_sparse_map_new.c
index de1b6a4..de1b6a4 100644
--- a/lib/tar/read_sparse_map_new.c
+++ b/lib/tar/src/read_sparse_map_new.c
diff --git a/lib/tar/read_sparse_map_old.c b/lib/tar/src/read_sparse_map_old.c
index 3dd3300..3dd3300 100644
--- a/lib/tar/read_sparse_map_old.c
+++ b/lib/tar/src/read_sparse_map_old.c
diff --git a/lib/tar/record_to_memory.c b/lib/tar/src/record_to_memory.c
index ba422de..ba422de 100644
--- a/lib/tar/record_to_memory.c
+++ b/lib/tar/src/record_to_memory.c
diff --git a/lib/tar/write_header.c b/lib/tar/src/write_header.c
index b0711b3..b0711b3 100644
--- a/lib/tar/write_header.c
+++ b/lib/tar/src/write_header.c
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index ec38b7a..35e8078 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,21 +1,14 @@
-libutil_a_SOURCES = include/util/util.h include/util/str_table.h
-libutil_a_SOURCES += include/util/hash_table.h include/util/test.h
-libutil_a_SOURCES += lib/util/str_table.c lib/util/alloc.c
-libutil_a_SOURCES += lib/util/rbtree.c include/util/rbtree.h
-libutil_a_SOURCES += lib/util/array.c include/util/array.h
-libutil_a_SOURCES += lib/util/xxhash.c lib/util/hash_table.c
-libutil_a_SOURCES += lib/util/fast_urem_by_const.h
-libutil_a_SOURCES += include/util/threadpool.h
-libutil_a_SOURCES += include/util/w32threadwrap.h
-libutil_a_SOURCES += lib/util/threadpool_serial.c
-libutil_a_SOURCES += lib/util/is_memory_zero.c
-libutil_a_SOURCES += lib/util/mkdir_p.c
-libutil_a_SOURCES += lib/util/canonicalize_name.c
-libutil_a_SOURCES += lib/util/filename_sane.c
-libutil_a_SOURCES += lib/util/source_date_epoch.c
-libutil_a_SOURCES += lib/util/file_cmp.c
-libutil_a_SOURCES += lib/util/hex_decode.c
-libutil_a_SOURCES += lib/util/base64_decode.c
+libutil_a_SOURCES = include/util/util.h include/util/str_table.h \
+	include/util/hash_table.h include/util/test.h include/util/rbtree.h \
+	include/util/array.h include/util/threadpool.h \
+	include/util/w32threadwrap.h include/util/mempool.h \
+	lib/util/src/str_table.c lib/util/src/alloc.c lib/util/src/rbtree.c \
+	lib/util/src/array.c lib/util/src/xxhash.c lib/util/src/hash_table.c \
+	lib/util/src/fast_urem_by_const.h lib/util/src/threadpool_serial.c \
+	lib/util/src/is_memory_zero.c lib/util/src/mkdir_p.c \
+	lib/util/src/canonicalize_name.c lib/util/src/filename_sane.c \
+	lib/util/src/source_date_epoch.c lib/util/src/file_cmp.c \
+	lib/util/src/hex_decode.c lib/util/src/base64_decode.c
 libutil_a_CFLAGS = $(AM_CFLAGS)
 libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
 
@@ -24,18 +17,18 @@ libutil_a_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600
 endif
 
 if HAVE_PTHREAD
-libutil_a_SOURCES += lib/util/threadpool.c
+libutil_a_SOURCES += lib/util/src/threadpool.c
 libutil_a_CFLAGS += $(PTHREAD_CFLAGS)
 else
 if WINDOWS
-libutil_a_SOURCES += lib/util/threadpool.c
+libutil_a_SOURCES += lib/util/src/threadpool.c
 else
 libutil_a_CPPFLAGS += -DNO_THREAD_IMPL
 endif
 endif
 
 if CUSTOM_ALLOC
-libutil_a_SOURCES += lib/util/mempool.c include/util/mempool.h
+libutil_a_SOURCES += lib/util/src/mempool.c
 endif
 
 noinst_LIBRARIES += libutil.a
diff --git a/lib/util/alloc.c b/lib/util/src/alloc.c
index 359fef5..359fef5 100644
--- a/lib/util/alloc.c
+++ b/lib/util/src/alloc.c
diff --git a/lib/util/array.c b/lib/util/src/array.c
index 40bac50..40bac50 100644
--- a/lib/util/array.c
+++ b/lib/util/src/array.c
diff --git a/lib/util/base64_decode.c b/lib/util/src/base64_decode.c
index b1cf5b6..b1cf5b6 100644
--- a/lib/util/base64_decode.c
+++ b/lib/util/src/base64_decode.c
diff --git a/lib/util/canonicalize_name.c b/lib/util/src/canonicalize_name.c
index 534e89e..534e89e 100644
--- a/lib/util/canonicalize_name.c
+++ b/lib/util/src/canonicalize_name.c
diff --git a/lib/util/fast_urem_by_const.h b/lib/util/src/fast_urem_by_const.h
index 4fb78d3..4fb78d3 100644
--- a/lib/util/fast_urem_by_const.h
+++ b/lib/util/src/fast_urem_by_const.h
diff --git a/lib/util/file_cmp.c b/lib/util/src/file_cmp.c
index 2aa0cc2..2aa0cc2 100644
--- a/lib/util/file_cmp.c
+++ b/lib/util/src/file_cmp.c
diff --git a/lib/util/filename_sane.c b/lib/util/src/filename_sane.c
index b52ce4d..b52ce4d 100644
--- a/lib/util/filename_sane.c
+++ b/lib/util/src/filename_sane.c
diff --git a/lib/util/hash_table.c b/lib/util/src/hash_table.c
index 0010e9f..0010e9f 100644
--- a/lib/util/hash_table.c
+++ b/lib/util/src/hash_table.c
diff --git a/lib/util/hex_decode.c b/lib/util/src/hex_decode.c
index ee4b21c..ee4b21c 100644
--- a/lib/util/hex_decode.c
+++ b/lib/util/src/hex_decode.c
diff --git a/lib/util/is_memory_zero.c b/lib/util/src/is_memory_zero.c
index aabd45d..aabd45d 100644
--- a/lib/util/is_memory_zero.c
+++ b/lib/util/src/is_memory_zero.c
diff --git a/lib/util/mempool.c b/lib/util/src/mempool.c
index e2ddaf0..e2ddaf0 100644
--- a/lib/util/mempool.c
+++ b/lib/util/src/mempool.c
diff --git a/lib/util/mkdir_p.c b/lib/util/src/mkdir_p.c
index 993d8ec..993d8ec 100644
--- a/lib/util/mkdir_p.c
+++ b/lib/util/src/mkdir_p.c
diff --git a/lib/util/rbtree.c b/lib/util/src/rbtree.c
index 8b43e43..8b43e43 100644
--- a/lib/util/rbtree.c
+++ b/lib/util/src/rbtree.c
diff --git a/lib/util/source_date_epoch.c b/lib/util/src/source_date_epoch.c
index 26e5530..26e5530 100644
--- a/lib/util/source_date_epoch.c
+++ b/lib/util/src/source_date_epoch.c
diff --git a/lib/util/str_table.c b/lib/util/src/str_table.c
index 2d3e354..2d3e354 100644
--- a/lib/util/str_table.c
+++ b/lib/util/src/str_table.c
diff --git a/lib/util/threadpool.c b/lib/util/src/threadpool.c
index c7357cd..c7357cd 100644
--- a/lib/util/threadpool.c
+++ b/lib/util/src/threadpool.c
diff --git a/lib/util/threadpool_serial.c b/lib/util/src/threadpool_serial.c
index fb24ee8..fb24ee8 100644
--- a/lib/util/threadpool_serial.c
+++ b/lib/util/src/threadpool_serial.c
diff --git a/lib/util/xxhash.c b/lib/util/src/xxhash.c
index 60467fb..60467fb 100644
--- a/lib/util/xxhash.c
+++ b/lib/util/src/xxhash.c
diff --git a/lib/xfrm/Makemodule.am b/lib/xfrm/Makemodule.am
index a344820..ad446f6 100644
--- a/lib/xfrm/Makemodule.am
+++ b/lib/xfrm/Makemodule.am
@@ -1,25 +1,25 @@
-libxfrm_a_SOURCES = include/xfrm/stream.h include/xfrm/compress.h
-libxfrm_a_SOURCES += lib/xfrm/compress.c
+libxfrm_a_SOURCES = include/xfrm/stream.h include/xfrm/compress.h \
+	lib/xfrm/src/compress.c
 libxfrm_a_CFLAGS = $(AM_CFLAGS)
 
 if WITH_XZ
-libxfrm_a_SOURCES += lib/xfrm/xz.c
+libxfrm_a_SOURCES += lib/xfrm/src/xz.c
 libxfrm_a_CFLAGS += $(XZ_CFLAGS) -DWITH_XZ
 endif
 
 if WITH_BZIP2
-libxfrm_a_SOURCES += lib/xfrm/bzip2.c
+libxfrm_a_SOURCES += lib/xfrm/src/bzip2.c
 libxfrm_a_CFLAGS += $(BZIP2_CFLAGS) -DWITH_BZIP2
 endif
 
 if WITH_GZIP
-libxfrm_a_SOURCES += lib/xfrm/gzip.c
+libxfrm_a_SOURCES += lib/xfrm/src/gzip.c
 libxfrm_a_CFLAGS += $(ZLIB_CFLAGS) -DWITH_GZIP
 endif
 
 if WITH_ZSTD
 if HAVE_ZSTD_STREAM
-libxfrm_a_SOURCES += lib/xfrm/zstd.c
+libxfrm_a_SOURCES += lib/xfrm/src/zstd.c
 libxfrm_a_CFLAGS += $(ZSTD_CFLAGS) -DWITH_ZSTD
 endif
 endif
diff --git a/lib/xfrm/bzip2.c b/lib/xfrm/src/bzip2.c
index 7e5807d..7e5807d 100644
--- a/lib/xfrm/bzip2.c
+++ b/lib/xfrm/src/bzip2.c
diff --git a/lib/xfrm/compress.c b/lib/xfrm/src/compress.c
index fbd6987..fbd6987 100644
--- a/lib/xfrm/compress.c
+++ b/lib/xfrm/src/compress.c
diff --git a/lib/xfrm/gzip.c b/lib/xfrm/src/gzip.c
index 67224f7..67224f7 100644
--- a/lib/xfrm/gzip.c
+++ b/lib/xfrm/src/gzip.c
diff --git a/lib/xfrm/xz.c b/lib/xfrm/src/xz.c
index 5adb6f3..5adb6f3 100644
--- a/lib/xfrm/xz.c
+++ b/lib/xfrm/src/xz.c
diff --git a/lib/xfrm/zstd.c b/lib/xfrm/src/zstd.c
index 70666c1..70666c1 100644
--- a/lib/xfrm/zstd.c
+++ b/lib/xfrm/src/zstd.c
diff --git a/tests/gensquashfs/Makemodule.am b/tests/gensquashfs/Makemodule.am
index 553f2a8..9dd9d76 100644
--- a/tests/gensquashfs/Makemodule.am
+++ b/tests/gensquashfs/Makemodule.am
@@ -1,49 +1,51 @@
 GENDATADIR=$(top_srcdir)/tests/gensquashfs
 
 test_filemap_xattr_SOURCES = tests/gensquashfs/filemap_xattr.c \
-				bin/gensquashfs/filemap_xattr.c \
-				bin/gensquashfs/mkfs.h
-test_filemap_xattr_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+				bin/gensquashfs/src/filemap_xattr.c \
+				bin/gensquashfs/src/mkfs.h
+test_filemap_xattr_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_filemap_xattr_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/xattr1.txt
 test_filemap_xattr_LDADD = libsquashfs.la libfstree.a libutil.a
 test_filemap_xattr_LDADD += libio.a libcompat.a
 
 test_fstree_from_file_SOURCES = tests/gensquashfs/fstree_from_file.c \
-				bin/gensquashfs/fstree_from_file.c \
-				bin/gensquashfs/fstree_from_dir.c \
-				bin/gensquashfs/mkfs.h
-test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+				bin/gensquashfs/src/fstree_from_file.c \
+				bin/gensquashfs/src/fstree_from_dir.c \
+				bin/gensquashfs/src/mkfs.h
+test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS)
+test_fstree_from_file_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src
 test_fstree_from_file_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/fstree1.txt
 test_fstree_from_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_fstree_glob1_SOURCES = tests/gensquashfs/fstree_glob1.c \
-				bin/gensquashfs/fstree_from_file.c \
-				bin/gensquashfs/fstree_from_dir.c \
-				bin/gensquashfs/mkfs.h
-test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+				bin/gensquashfs/src/fstree_from_file.c \
+				bin/gensquashfs/src/fstree_from_dir.c \
+				bin/gensquashfs/src/mkfs.h
+test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR)
 test_fstree_glob1_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_fstree_from_dir_SOURCES = tests/gensquashfs/fstree_from_dir.c \
-				bin/gensquashfs/fstree_from_dir.c \
-				bin/gensquashfs/mkfs.h
-test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+				bin/gensquashfs/src/fstree_from_dir.c \
+				bin/gensquashfs/src/mkfs.h
+test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS)
+test_fstree_from_dir_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src
 test_fstree_from_dir_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/testdir
 test_fstree_from_dir_LDADD = libfstree.a libutil.a libcompat.a
 
 test_sort_file_SOURCES = tests/gensquashfs/sort_file.c \
-				bin/gensquashfs/fstree_from_file.c \
-				bin/gensquashfs/fstree_from_dir.c \
-				bin/gensquashfs/sort_by_file.c \
-				bin/gensquashfs/mkfs.h
-test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+				bin/gensquashfs/src/fstree_from_file.c \
+				bin/gensquashfs/src/fstree_from_dir.c \
+				bin/gensquashfs/src/sort_by_file.c \
+				bin/gensquashfs/src/mkfs.h
+test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_sort_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 fstree_fuzz_SOURCES = tests/gensquashfs/fstree_fuzz.c \
-			bin/gensquashfs/fstree_from_file.c \
-			bin/gensquashfs/fstree_from_dir.c \
-			bin/gensquashfs/mkfs.h
-fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+			bin/gensquashfs/src/fstree_from_file.c \
+			bin/gensquashfs/src/fstree_from_dir.c \
+			bin/gensquashfs/src/mkfs.h
+fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 fstree_fuzz_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 GENSQUASHFS_TESTS = \
diff --git a/tests/libutil/Makemodule.am b/tests/libutil/Makemodule.am
index c84f722..4cec465 100644
--- a/tests/libutil/Makemodule.am
+++ b/tests/libutil/Makemodule.am
@@ -24,11 +24,11 @@ test_canonicalize_name_SOURCES = tests/libutil/canonicalize_name.c
 test_canonicalize_name_LDADD = libutil.a libcompat.a
 
 test_filename_sane_SOURCES = tests/libutil/filename_sane.c
-test_filename_sane_SOURCES += lib/util/filename_sane.c
+test_filename_sane_SOURCES += lib/util/src/filename_sane.c
 test_filename_sane_LDADD = libcompat.a libutil.a
 
 test_filename_sane_w32_SOURCES = tests/libutil/filename_sane.c
-test_filename_sane_w32_SOURCES += lib/util/filename_sane.c
+test_filename_sane_w32_SOURCES += lib/util/src/filename_sane.c
 test_filename_sane_w32_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_WIN32=1
 test_filename_sane_w32_LDADD = libcompat.a