41 files changed, 21 insertions, 22 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