41 files changed, 39 insertions, 42 deletions
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