diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile
new file mode 100644
index 0000000..935846f
--- /dev/null
+++ b/e2fsprogs/Makefile
@@ -0,0 +1,379 @@
+# By YZBruh
+
+# Copyright 2024 Partition Manager
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#####
+# sub-make for building e2fsprogs (built-in mke2fs)
+#####
+
+# Include required files
+include ../../build/config/env.mk
+ifeq ($(INC_OLDENV),true)
+include ../../build/config/oldenv.mk
+endif
+
+# Some variables, flags etc.
+E := @ echo
+INCLUDE := $(realpath ../../include/e2fsprogs)
+E2FSPROGS_DEFAULT_CFLAGS = \
+	-std=c17 \
+	-Wall \
+	-Werror \
+	-Wno-pointer-arith \
+	-Wno-sign-compare \
+	-Wno-type-limits \
+	-Wno-typedef-redefinition \
+	-Wno-unused-parameter \
+	-Wno-unused-command-line-argument \
+	-fPIC \
+	-pthread
+INCLUDE_DIRS := \
+	$(INCLUDE)/misc \
+	$(INCLUDE)/blkid \
+	$(INCLUDE)/e2p \
+	$(INCLUDE)/et \
+	$(INCLUDE)/ext2fs \
+	$(INCLUDE)/ss \
+	$(INCLUDE)/support \
+	$(INCLUDE)/uuid \
+	$(INCLUDE)/e2fsck \
+	$(INCLUDE)
+INC_DIRS := $(foreach dir,$(INCLUDE_DIRS),$(shell echo -I$(dir)))
+CFLAGS := $(E2FSPROGS_DEFAULT_CFLAGS) $(INC_DIRS)
+ARFLAGS := rcs
+OUT := $(realpath ../../out/e2fsprogs)
+MKE2FS := $(CURDIR)/mke2fs
+LIB := $(CURDIR)/lib
+LIBEXT2FS := $(LIB)/ext2fs
+LIBEXT2_UUID := $(LIB)/uuid
+LIBEXT2_E2P := $(LIB)/e2p
+LIBEXT2_QUOTA := $(LIB)/support
+LIBEXT2_MISC := $(LIB)/misc
+LIBEXT2_COM_ERR := $(LIB)/et
+LIBEXT2_BLKID := $(LIB)/blkid
+
+# Source list of mke2fs
+MKE2FS_SRCS := \
+	$(MKE2FS)/default_profile.c \
+	$(MKE2FS)/mk_hugefiles.c \
+	$(MKE2FS)/mke2fs.c \
+	$(MKE2FS)/util.c
+
+# Source list of libext2fs
+LIBEXT2FS_SRCS := \
+	$(LIBEXT2FS)/alloc.c \
+	$(LIBEXT2FS)/alloc_sb.c \
+	$(LIBEXT2FS)/alloc_stats.c \
+	$(LIBEXT2FS)/alloc_tables.c \
+	$(LIBEXT2FS)/atexit.c \
+	$(LIBEXT2FS)/badblocks.c \
+	$(LIBEXT2FS)/bb_inode.c \
+	$(LIBEXT2FS)/bitmaps.c \
+	$(LIBEXT2FS)/bitops.c \
+	$(LIBEXT2FS)/blkmap64_ba.c \
+	$(LIBEXT2FS)/blkmap64_rb.c \
+	$(LIBEXT2FS)/blknum.c \
+	$(LIBEXT2FS)/block.c \
+	$(LIBEXT2FS)/bmap.c \
+	$(LIBEXT2FS)/check_desc.c \
+	$(LIBEXT2FS)/crc16.c \
+	$(LIBEXT2FS)/crc32c.c \
+	$(LIBEXT2FS)/csum.c \
+	$(LIBEXT2FS)/closefs.c \
+	$(LIBEXT2FS)/dblist.c \
+	$(LIBEXT2FS)/dblist_dir.c \
+	$(LIBEXT2FS)/digest_encode.c \
+	$(LIBEXT2FS)/dirblock.c \
+	$(LIBEXT2FS)/dirhash.c \
+	$(LIBEXT2FS)/dir_iterate.c \
+	$(LIBEXT2FS)/dupfs.c \
+	$(LIBEXT2FS)/expanddir.c \
+	$(LIBEXT2FS)/ext2_err.c \
+	$(LIBEXT2FS)/ext_attr.c \
+	$(LIBEXT2FS)/extent.c \
+	$(LIBEXT2FS)/fallocate.c \
+	$(LIBEXT2FS)/fileio.c \
+	$(LIBEXT2FS)/finddev.c \
+	$(LIBEXT2FS)/flushb.c \
+	$(LIBEXT2FS)/freefs.c \
+	$(LIBEXT2FS)/gen_bitmap.c \
+	$(LIBEXT2FS)/gen_bitmap64.c \
+	$(LIBEXT2FS)/get_num_dirs.c \
+	$(LIBEXT2FS)/get_pathname.c \
+	$(LIBEXT2FS)/getsize.c \
+	$(LIBEXT2FS)/getsectsize.c \
+	$(LIBEXT2FS)/hashmap.c \
+	$(LIBEXT2FS)/i_block.c \
+	$(LIBEXT2FS)/icount.c \
+	$(LIBEXT2FS)/imager.c \
+	$(LIBEXT2FS)/ind_block.c \
+	$(LIBEXT2FS)/initialize.c \
+	$(LIBEXT2FS)/inline.c \
+	$(LIBEXT2FS)/inline_data.c \
+	$(LIBEXT2FS)/inode.c \
+	$(LIBEXT2FS)/io_manager.c \
+	$(LIBEXT2FS)/ismounted.c \
+	$(LIBEXT2FS)/link.c \
+	$(LIBEXT2FS)/llseek.c \
+	$(LIBEXT2FS)/lookup.c \
+	$(LIBEXT2FS)/mmp.c \
+	$(LIBEXT2FS)/mkdir.c \
+	$(LIBEXT2FS)/mkjournal.c \
+	$(LIBEXT2FS)/namei.c \
+	$(LIBEXT2FS)/native.c \
+	$(LIBEXT2FS)/newdir.c \
+	$(LIBEXT2FS)/nls_utf8.c \
+	$(LIBEXT2FS)/openfs.c \
+	$(LIBEXT2FS)/progress.c \
+	$(LIBEXT2FS)/punch.c \
+	$(LIBEXT2FS)/qcow2.c \
+	$(LIBEXT2FS)/rbtree.c \
+	$(LIBEXT2FS)/read_bb.c \
+	$(LIBEXT2FS)/read_bb_file.c \
+	$(LIBEXT2FS)/res_gdt.c \
+	$(LIBEXT2FS)/rw_bitmaps.c \
+	$(LIBEXT2FS)/sha256.c \
+	$(LIBEXT2FS)/sha512.c \
+	$(LIBEXT2FS)/swapfs.c \
+	$(LIBEXT2FS)/symlink.c \
+	$(LIBEXT2FS)/undo_io.c \
+	$(LIBEXT2FS)/unix_io.c \
+	$(LIBEXT2FS)/sparse_io.c \
+	$(LIBEXT2FS)/unlink.c \
+	$(LIBEXT2FS)/valid_blk.c \
+	$(LIBEXT2FS)/version.c \
+	$(LIBEXT2FS)/test_io.c
+
+# Source list of libext2_uuid
+LIBEXT2_UUID_SRCS := \
+	$(LIBEXT2_UUID)/clear.c \
+	$(LIBEXT2_UUID)/compare.c \
+	$(LIBEXT2_UUID)/copy.c \
+	$(LIBEXT2_UUID)/gen_uuid.c \
+	$(LIBEXT2_UUID)/isnull.c \
+	$(LIBEXT2_UUID)/pack.c \
+	$(LIBEXT2_UUID)/parse.c \
+	$(LIBEXT2_UUID)/unpack.c \
+	$(LIBEXT2_UUID)/unparse.c \
+	$(LIBEXT2_UUID)/uuid_time.c
+
+# Source list of libext2_blkid
+LIBEXT2_BLKID_SRCS := \
+	$(LIBEXT2_BLKID)/cache.c \
+	$(LIBEXT2_BLKID)/dev.c \
+	$(LIBEXT2_BLKID)/devname.c \
+	$(LIBEXT2_BLKID)/devno.c \
+	$(LIBEXT2_BLKID)/getsize.c \
+	$(LIBEXT2_BLKID)/llseek.c \
+	$(LIBEXT2_BLKID)/probe.c \
+	$(LIBEXT2_BLKID)/read.c \
+	$(LIBEXT2_BLKID)/resolve.c \
+	$(LIBEXT2_BLKID)/save.c \
+	$(LIBEXT2_BLKID)/tag.c \
+	$(LIBEXT2_BLKID)/version.c
+
+# Source list of libext2_e2p
+LIBEXT2_E2P_SRCS := \
+	$(LIBEXT2_E2P)/crypto_mode.c \
+	$(LIBEXT2_E2P)/encoding.c \
+	$(LIBEXT2_E2P)/errcode.c \
+	$(LIBEXT2_E2P)/feature.c \
+	$(LIBEXT2_E2P)/fgetflags.c \
+	$(LIBEXT2_E2P)/fgetproject.c \
+	$(LIBEXT2_E2P)/fgetversion.c \
+	$(LIBEXT2_E2P)/fsetflags.c \
+	$(LIBEXT2_E2P)/fsetproject.c \
+	$(LIBEXT2_E2P)/fsetversion.c \
+	$(LIBEXT2_E2P)/getflags.c \
+	$(LIBEXT2_E2P)/getversion.c \
+	$(LIBEXT2_E2P)/hashstr.c \
+	$(LIBEXT2_E2P)/iod.c \
+	$(LIBEXT2_E2P)/ljs.c \
+	$(LIBEXT2_E2P)/ls.c \
+	$(LIBEXT2_E2P)/mntopts.c \
+	$(LIBEXT2_E2P)/ostype.c \
+	$(LIBEXT2_E2P)/parse_num.c \
+	$(LIBEXT2_E2P)/pe.c \
+	$(LIBEXT2_E2P)/percent.c \
+	$(LIBEXT2_E2P)/pf.c \
+	$(LIBEXT2_E2P)/ps.c \
+	$(LIBEXT2_E2P)/setflags.c \
+	$(LIBEXT2_E2P)/setversion.c \
+	$(LIBEXT2_E2P)/uuid.c
+
+# Source list of libext2_quota
+LIBEXT2_QUOTA_SRCS := \
+	$(LIBEXT2_QUOTA)/devname.c \
+	$(LIBEXT2_QUOTA)/dict.c \
+	$(LIBEXT2_QUOTA)/mkquota.c \
+	$(LIBEXT2_QUOTA)/parse_qtype.c \
+	$(LIBEXT2_QUOTA)/plausible.c \
+	$(LIBEXT2_QUOTA)/prof_err.c \
+	$(LIBEXT2_QUOTA)/profile.c \
+	$(LIBEXT2_QUOTA)/profile_helpers.c \
+	$(LIBEXT2_QUOTA)/quotaio.c \
+	$(LIBEXT2_QUOTA)/quotaio_tree.c \
+	$(LIBEXT2_QUOTA)/quotaio_v2.c
+
+# Source od libext2_misc
+LIBEXT2_MISC_SRCS := $(LIBEXT2_MISC)/create_inode.c
+
+# Source list of libext2_com_err
+LIBEXT2_COM_ERR_SRCS := \
+	$(LIBEXT2_COM_ERR)/com_err.c \
+	$(LIBEXT2_COM_ERR)/com_right.c \
+	$(LIBEXT2_COM_ERR)/error_message.c \
+	$(LIBEXT2_COM_ERR)/et_name.c \
+	$(LIBEXT2_COM_ERR)/init_et.c
+
+# Object lists
+MKE2FS_OBJS := $(MKE2FS_SRCS:.c=.o)
+LIBEXT2FS_OBJS := $(LIBEXT2FS_SRCS:.c=.o)
+LIBEXT2_UUID_OBJS := $(LIBEXT2_UUID_SRCS:.c=.o)
+LIBEXT2_BLKID_OBJS := $(LIBEXT2_BLKID_SRCS:.c=.o)
+LIBEXT2_E2P_OBJS := $(LIBEXT2_E2P_SRCS:.c=.o)
+LIBEXT2_QUOTA_OBJS := $(LIBEXT2_QUOTA_SRCS:.c=.o)
+LIBEXT2_MISC_OBJS := $(LIBEXT2_MISC_SRCS:.c=.o)
+LIBEXT2_COM_ERR_OBJS := $(LIBEXT2_COM_ERR_SRCS:.c=.o)
+
+# Compiler flags (CFLAGS)
+LIBEXT2FS_CFLAGS := -Wno-unused-but-set-variable
+LIBEXT2_E2P_CFLAGS := -Wno-error=attributes
+LIBEXT2_MISC_CFLAGS := -Wno-error=format-extra-args
+LIBEXT2_BLKID_CFLAGS := \
+	-Wno-error=attributes \
+	-Wno-error=pointer-sign \
+	-Wno-unused-but-set-variable \
+	-fno-strict-aliasing
+
+# Full object list
+OBJS_ALL := \
+	$(MKE2FS_OBJS) \
+	$(LIBEXT2FS_OBJS) \
+	$(LIBEXT2_BLKID_OBJS) \
+	$(LIBEXT2_UUID_OBJS) \
+	$(LIBEXT2_E2P_OBJS) \
+	$(LIBEXT2_QUOTA_OBJS) \
+	$(LIBEXT2_MISC_OBJS) \
+	$(LIBEXT2_COM_ERR_OBJS)
+
+# Progress list
+PROGRESS_LIST := \
+	$(LIBEXT2_BLKID_OBJS) \
+	libext2_blkid_ar \
+	$(LIBEXT2_UUID_OBJS) \
+	libext2_uuid_ar \
+	$(LIBEXT2_E2P_OBJS) \
+	libext2_e2p_ar \
+	$(LIBEXT2FS_OBJS) \
+	libext2fs_ar \
+	$(LIBEXT2_QUOTA_OBJS) \
+	libext2_quota_ar \
+	$(LIBEXT2_MISC_OBJS) \
+	libext2_misc_ar \
+	$(LIBEXT2_COM_ERR_OBJS) \
+	libext2_com_err_ar \
+	$(MKE2FS_OBJS) \
+	mke2fs_dummy_ld
+
+.PHONY: all
+all: $(PROGRESS_LIST)
+
+# Cleaner 
+.PHONY: clean
+clean:
+	@ rm -rf $(OBJS_ALL)
+
+#######################################
+# 'MAKE' TARGETS FOR BUILDING OBJECTS #
+#######################################
+
+$(MKE2FS)/%.o: $(MKE2FS)/%.c
+	$(E) "   CC    e2fsprogs/`basename $(MKE2FS)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) $(MKE2FS_CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2FS)/%.o: $(LIBEXT2FS)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2FS)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) $(LIBEXT2FS_CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_BLKID)/%.o: $(LIBEXT2_BLKID)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_BLKID)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) $(LIBEXT2_BLKID_CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_E2P)/%.o: $(LIBEXT2_E2P)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_E2P)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_UUID)/%.o: $(LIBEXT2_UUID)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_UUID)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_QUOTA)/%.o: $(LIBEXT2_QUOTA)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_QUOTA)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_MISC)/%.o: $(LIBEXT2_MISC)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_MISC)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) $(LIBEXT2_MISC_CFLAGS) "$<" -o "$@" || exit 1
+
+$(LIBEXT2_COM_ERR)/%.o: $(LIBEXT2_COM_ERR)/%.c
+	$(E) "   CC    e2fsprogs/lib/`basename $(LIBEXT2_COM_ERR)`/`basename $@`"
+	@ $(CC) -c $(CFLAGS) "$<" -o "$@" || exit 1
+
+#############################################
+# 'MAKE' TARGETS FOR GENERATING STATIC LIBS #
+#############################################
+
+libext2fs_ar: $(LIBEXT2FS_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2fs.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2fs.a $^ || exit 1
+	$(E) "   ----------- libext2_quota -----------"
+
+libext2_blkid_ar: $(LIBEXT2_BLKID_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_blkid.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_blkid.a $^ || exit 1
+	$(E) "   ----------- libext2_uuid ---------"
+
+libext2_e2p_ar: $(LIBEXT2_E2P_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_e2p.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_e2p.a $^ || exit 1
+	$(E) "   ----------- libext2fs -----------"
+
+libext2_uuid_ar: $(LIBEXT2_UUID_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_uuid.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_uuid.a $^ || exit 1
+	$(E) "   ----------- libext2_e2p -----------"
+
+libext2_quota_ar: $(LIBEXT2_QUOTA_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_quota.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_quota.a $^ || exit 1
+	$(E) "   ----------- libext2_misc -----------"
+
+libext2_misc_ar: $(LIBEXT2_MISC_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_misc.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_misc.a $^ || exit 1
+	$(E) "   ----------- libext2_com_err -----------"
+
+libext2_com_err_ar: $(LIBEXT2_COM_ERR_OBJS)
+	$(E) "   AR    out/e2fsprogs/libext2_com_err.a"
+	@ $(AR) $(ARFLAGS) $(OUT)/libext2_com_err.a $^ || exit 1
+	$(E) "   ----------- mke2fs -----------"
+
+#############################################
+# DUMMY 'MAKE' TARGET FOR DISPLAYING MKE2FS #
+#############################################
+
+mke2fs_dummy_ld:
+	$(E) "   DMY   mke2fs"
diff --git a/jni/e2fsprogs/NOTICE b/e2fsprogs/NOTICE
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/NOTICE
rename to e2fsprogs/NOTICE
diff --git a/jni/e2fsprogs/lib/blkid/cache.c b/e2fsprogs/lib/blkid/cache.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/cache.c
rename to e2fsprogs/lib/blkid/cache.c
diff --git a/jni/e2fsprogs/lib/blkid/dev.c b/e2fsprogs/lib/blkid/dev.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/dev.c
rename to e2fsprogs/lib/blkid/dev.c
diff --git a/jni/e2fsprogs/lib/blkid/devname.c b/e2fsprogs/lib/blkid/devname.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/devname.c
rename to e2fsprogs/lib/blkid/devname.c
diff --git a/jni/e2fsprogs/lib/blkid/devno.c b/e2fsprogs/lib/blkid/devno.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/devno.c
rename to e2fsprogs/lib/blkid/devno.c
diff --git a/jni/e2fsprogs/lib/blkid/getsize.c b/e2fsprogs/lib/blkid/getsize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/getsize.c
rename to e2fsprogs/lib/blkid/getsize.c
diff --git a/jni/e2fsprogs/lib/blkid/llseek.c b/e2fsprogs/lib/blkid/llseek.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/llseek.c
rename to e2fsprogs/lib/blkid/llseek.c
diff --git a/jni/e2fsprogs/lib/blkid/probe.c b/e2fsprogs/lib/blkid/probe.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/probe.c
rename to e2fsprogs/lib/blkid/probe.c
diff --git a/jni/e2fsprogs/lib/blkid/read.c b/e2fsprogs/lib/blkid/read.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/read.c
rename to e2fsprogs/lib/blkid/read.c
diff --git a/jni/e2fsprogs/lib/blkid/resolve.c b/e2fsprogs/lib/blkid/resolve.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/resolve.c
rename to e2fsprogs/lib/blkid/resolve.c
diff --git a/jni/e2fsprogs/lib/blkid/save.c b/e2fsprogs/lib/blkid/save.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/save.c
rename to e2fsprogs/lib/blkid/save.c
diff --git a/jni/e2fsprogs/lib/blkid/tag.c b/e2fsprogs/lib/blkid/tag.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/tag.c
rename to e2fsprogs/lib/blkid/tag.c
diff --git a/jni/e2fsprogs/lib/blkid/version.c b/e2fsprogs/lib/blkid/version.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/blkid/version.c
rename to e2fsprogs/lib/blkid/version.c
diff --git a/jni/e2fsprogs/lib/e2p/crypto_mode.c b/e2fsprogs/lib/e2p/crypto_mode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/crypto_mode.c
rename to e2fsprogs/lib/e2p/crypto_mode.c
diff --git a/jni/e2fsprogs/lib/e2p/encoding.c b/e2fsprogs/lib/e2p/encoding.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/encoding.c
rename to e2fsprogs/lib/e2p/encoding.c
diff --git a/jni/e2fsprogs/lib/e2p/errcode.c b/e2fsprogs/lib/e2p/errcode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/errcode.c
rename to e2fsprogs/lib/e2p/errcode.c
diff --git a/jni/e2fsprogs/lib/e2p/feature.c b/e2fsprogs/lib/e2p/feature.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/feature.c
rename to e2fsprogs/lib/e2p/feature.c
diff --git a/jni/e2fsprogs/lib/e2p/fgetflags.c b/e2fsprogs/lib/e2p/fgetflags.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fgetflags.c
rename to e2fsprogs/lib/e2p/fgetflags.c
diff --git a/jni/e2fsprogs/lib/e2p/fgetproject.c b/e2fsprogs/lib/e2p/fgetproject.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fgetproject.c
rename to e2fsprogs/lib/e2p/fgetproject.c
diff --git a/jni/e2fsprogs/lib/e2p/fgetversion.c b/e2fsprogs/lib/e2p/fgetversion.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fgetversion.c
rename to e2fsprogs/lib/e2p/fgetversion.c
diff --git a/jni/e2fsprogs/lib/e2p/fsetflags.c b/e2fsprogs/lib/e2p/fsetflags.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fsetflags.c
rename to e2fsprogs/lib/e2p/fsetflags.c
diff --git a/jni/e2fsprogs/lib/e2p/fsetproject.c b/e2fsprogs/lib/e2p/fsetproject.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fsetproject.c
rename to e2fsprogs/lib/e2p/fsetproject.c
diff --git a/jni/e2fsprogs/lib/e2p/fsetversion.c b/e2fsprogs/lib/e2p/fsetversion.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/fsetversion.c
rename to e2fsprogs/lib/e2p/fsetversion.c
diff --git a/jni/e2fsprogs/lib/e2p/getflags.c b/e2fsprogs/lib/e2p/getflags.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/getflags.c
rename to e2fsprogs/lib/e2p/getflags.c
diff --git a/jni/e2fsprogs/lib/e2p/getversion.c b/e2fsprogs/lib/e2p/getversion.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/getversion.c
rename to e2fsprogs/lib/e2p/getversion.c
diff --git a/jni/e2fsprogs/lib/e2p/hashstr.c b/e2fsprogs/lib/e2p/hashstr.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/hashstr.c
rename to e2fsprogs/lib/e2p/hashstr.c
diff --git a/jni/e2fsprogs/lib/e2p/iod.c b/e2fsprogs/lib/e2p/iod.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/iod.c
rename to e2fsprogs/lib/e2p/iod.c
diff --git a/jni/e2fsprogs/lib/e2p/ljs.c b/e2fsprogs/lib/e2p/ljs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/ljs.c
rename to e2fsprogs/lib/e2p/ljs.c
diff --git a/jni/e2fsprogs/lib/e2p/ls.c b/e2fsprogs/lib/e2p/ls.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/ls.c
rename to e2fsprogs/lib/e2p/ls.c
diff --git a/jni/e2fsprogs/lib/e2p/mntopts.c b/e2fsprogs/lib/e2p/mntopts.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/mntopts.c
rename to e2fsprogs/lib/e2p/mntopts.c
diff --git a/jni/e2fsprogs/lib/e2p/ostype.c b/e2fsprogs/lib/e2p/ostype.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/ostype.c
rename to e2fsprogs/lib/e2p/ostype.c
diff --git a/jni/e2fsprogs/lib/e2p/parse_num.c b/e2fsprogs/lib/e2p/parse_num.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/parse_num.c
rename to e2fsprogs/lib/e2p/parse_num.c
diff --git a/jni/e2fsprogs/lib/e2p/pe.c b/e2fsprogs/lib/e2p/pe.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/pe.c
rename to e2fsprogs/lib/e2p/pe.c
diff --git a/jni/e2fsprogs/lib/e2p/percent.c b/e2fsprogs/lib/e2p/percent.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/percent.c
rename to e2fsprogs/lib/e2p/percent.c
diff --git a/jni/e2fsprogs/lib/e2p/pf.c b/e2fsprogs/lib/e2p/pf.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/pf.c
rename to e2fsprogs/lib/e2p/pf.c
diff --git a/jni/e2fsprogs/lib/e2p/ps.c b/e2fsprogs/lib/e2p/ps.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/ps.c
rename to e2fsprogs/lib/e2p/ps.c
diff --git a/jni/e2fsprogs/lib/e2p/setflags.c b/e2fsprogs/lib/e2p/setflags.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/setflags.c
rename to e2fsprogs/lib/e2p/setflags.c
diff --git a/jni/e2fsprogs/lib/e2p/setversion.c b/e2fsprogs/lib/e2p/setversion.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/setversion.c
rename to e2fsprogs/lib/e2p/setversion.c
diff --git a/jni/e2fsprogs/lib/e2p/uuid.c b/e2fsprogs/lib/e2p/uuid.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/e2p/uuid.c
rename to e2fsprogs/lib/e2p/uuid.c
diff --git a/jni/e2fsprogs/lib/et/com_err.c b/e2fsprogs/lib/et/com_err.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/et/com_err.c
rename to e2fsprogs/lib/et/com_err.c
diff --git a/jni/e2fsprogs/lib/et/com_right.c b/e2fsprogs/lib/et/com_right.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/et/com_right.c
rename to e2fsprogs/lib/et/com_right.c
diff --git a/jni/e2fsprogs/lib/et/error_message.c b/e2fsprogs/lib/et/error_message.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/et/error_message.c
rename to e2fsprogs/lib/et/error_message.c
diff --git a/jni/e2fsprogs/lib/et/et_name.c b/e2fsprogs/lib/et/et_name.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/et/et_name.c
rename to e2fsprogs/lib/et/et_name.c
diff --git a/jni/e2fsprogs/lib/et/init_et.c b/e2fsprogs/lib/et/init_et.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/et/init_et.c
rename to e2fsprogs/lib/et/init_et.c
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc.c b/e2fsprogs/lib/ext2fs/alloc.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/alloc.c
rename to e2fsprogs/lib/ext2fs/alloc.c
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_sb.c b/e2fsprogs/lib/ext2fs/alloc_sb.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/alloc_sb.c
rename to e2fsprogs/lib/ext2fs/alloc_sb.c
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_stats.c b/e2fsprogs/lib/ext2fs/alloc_stats.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/alloc_stats.c
rename to e2fsprogs/lib/ext2fs/alloc_stats.c
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_tables.c b/e2fsprogs/lib/ext2fs/alloc_tables.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/alloc_tables.c
rename to e2fsprogs/lib/ext2fs/alloc_tables.c
diff --git a/jni/e2fsprogs/lib/ext2fs/atexit.c b/e2fsprogs/lib/ext2fs/atexit.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/atexit.c
rename to e2fsprogs/lib/ext2fs/atexit.c
diff --git a/jni/e2fsprogs/lib/ext2fs/badblocks.c b/e2fsprogs/lib/ext2fs/badblocks.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/badblocks.c
rename to e2fsprogs/lib/ext2fs/badblocks.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bb_compat.c b/e2fsprogs/lib/ext2fs/bb_compat.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bb_compat.c
rename to e2fsprogs/lib/ext2fs/bb_compat.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bb_inode.c b/e2fsprogs/lib/ext2fs/bb_inode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bb_inode.c
rename to e2fsprogs/lib/ext2fs/bb_inode.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bitmaps.c b/e2fsprogs/lib/ext2fs/bitmaps.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bitmaps.c
rename to e2fsprogs/lib/ext2fs/bitmaps.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bitops.c b/e2fsprogs/lib/ext2fs/bitops.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bitops.c
rename to e2fsprogs/lib/ext2fs/bitops.c
diff --git a/jni/e2fsprogs/lib/ext2fs/blkmap64_ba.c b/e2fsprogs/lib/ext2fs/blkmap64_ba.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/blkmap64_ba.c
rename to e2fsprogs/lib/ext2fs/blkmap64_ba.c
diff --git a/jni/e2fsprogs/lib/ext2fs/blkmap64_rb.c b/e2fsprogs/lib/ext2fs/blkmap64_rb.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/blkmap64_rb.c
rename to e2fsprogs/lib/ext2fs/blkmap64_rb.c
diff --git a/jni/e2fsprogs/lib/ext2fs/blknum.c b/e2fsprogs/lib/ext2fs/blknum.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/blknum.c
rename to e2fsprogs/lib/ext2fs/blknum.c
diff --git a/jni/e2fsprogs/lib/ext2fs/block.c b/e2fsprogs/lib/ext2fs/block.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/block.c
rename to e2fsprogs/lib/ext2fs/block.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bmap.c b/e2fsprogs/lib/ext2fs/bmap.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bmap.c
rename to e2fsprogs/lib/ext2fs/bmap.c
diff --git a/jni/e2fsprogs/lib/ext2fs/bmove.c b/e2fsprogs/lib/ext2fs/bmove.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/bmove.c
rename to e2fsprogs/lib/ext2fs/bmove.c
diff --git a/jni/e2fsprogs/lib/ext2fs/brel_ma.c b/e2fsprogs/lib/ext2fs/brel_ma.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/brel_ma.c
rename to e2fsprogs/lib/ext2fs/brel_ma.c
diff --git a/jni/e2fsprogs/lib/ext2fs/check_desc.c b/e2fsprogs/lib/ext2fs/check_desc.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/check_desc.c
rename to e2fsprogs/lib/ext2fs/check_desc.c
diff --git a/jni/e2fsprogs/lib/ext2fs/closefs.c b/e2fsprogs/lib/ext2fs/closefs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/closefs.c
rename to e2fsprogs/lib/ext2fs/closefs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/crc16.c b/e2fsprogs/lib/ext2fs/crc16.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/crc16.c
rename to e2fsprogs/lib/ext2fs/crc16.c
diff --git a/jni/e2fsprogs/lib/ext2fs/crc32c.c b/e2fsprogs/lib/ext2fs/crc32c.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/crc32c.c
rename to e2fsprogs/lib/ext2fs/crc32c.c
diff --git a/jni/e2fsprogs/lib/ext2fs/csum.c b/e2fsprogs/lib/ext2fs/csum.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/csum.c
rename to e2fsprogs/lib/ext2fs/csum.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dblist.c b/e2fsprogs/lib/ext2fs/dblist.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dblist.c
rename to e2fsprogs/lib/ext2fs/dblist.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dblist_dir.c b/e2fsprogs/lib/ext2fs/dblist_dir.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dblist_dir.c
rename to e2fsprogs/lib/ext2fs/dblist_dir.c
diff --git a/jni/e2fsprogs/lib/ext2fs/digest_encode.c b/e2fsprogs/lib/ext2fs/digest_encode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/digest_encode.c
rename to e2fsprogs/lib/ext2fs/digest_encode.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dir_iterate.c b/e2fsprogs/lib/ext2fs/dir_iterate.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dir_iterate.c
rename to e2fsprogs/lib/ext2fs/dir_iterate.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dirblock.c b/e2fsprogs/lib/ext2fs/dirblock.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dirblock.c
rename to e2fsprogs/lib/ext2fs/dirblock.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dirhash.c b/e2fsprogs/lib/ext2fs/dirhash.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dirhash.c
rename to e2fsprogs/lib/ext2fs/dirhash.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dosio.c b/e2fsprogs/lib/ext2fs/dosio.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dosio.c
rename to e2fsprogs/lib/ext2fs/dosio.c
diff --git a/jni/e2fsprogs/lib/ext2fs/dupfs.c b/e2fsprogs/lib/ext2fs/dupfs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/dupfs.c
rename to e2fsprogs/lib/ext2fs/dupfs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/expanddir.c b/e2fsprogs/lib/ext2fs/expanddir.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/expanddir.c
rename to e2fsprogs/lib/ext2fs/expanddir.c
diff --git a/jni/e2fsprogs/lib/ext2fs/ext2_err.c b/e2fsprogs/lib/ext2fs/ext2_err.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/ext2_err.c
rename to e2fsprogs/lib/ext2fs/ext2_err.c
diff --git a/jni/e2fsprogs/lib/ext2fs/ext_attr.c b/e2fsprogs/lib/ext2fs/ext_attr.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/ext_attr.c
rename to e2fsprogs/lib/ext2fs/ext_attr.c
diff --git a/jni/e2fsprogs/lib/ext2fs/extent.c b/e2fsprogs/lib/ext2fs/extent.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/extent.c
rename to e2fsprogs/lib/ext2fs/extent.c
diff --git a/jni/e2fsprogs/lib/ext2fs/fallocate.c b/e2fsprogs/lib/ext2fs/fallocate.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/fallocate.c
rename to e2fsprogs/lib/ext2fs/fallocate.c
diff --git a/jni/e2fsprogs/lib/ext2fs/fileio.c b/e2fsprogs/lib/ext2fs/fileio.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/fileio.c
rename to e2fsprogs/lib/ext2fs/fileio.c
diff --git a/jni/e2fsprogs/lib/ext2fs/finddev.c b/e2fsprogs/lib/ext2fs/finddev.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/finddev.c
rename to e2fsprogs/lib/ext2fs/finddev.c
diff --git a/jni/e2fsprogs/lib/ext2fs/flushb.c b/e2fsprogs/lib/ext2fs/flushb.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/flushb.c
rename to e2fsprogs/lib/ext2fs/flushb.c
diff --git a/jni/e2fsprogs/lib/ext2fs/freefs.c b/e2fsprogs/lib/ext2fs/freefs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/freefs.c
rename to e2fsprogs/lib/ext2fs/freefs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/gen_bitmap.c b/e2fsprogs/lib/ext2fs/gen_bitmap.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/gen_bitmap.c
rename to e2fsprogs/lib/ext2fs/gen_bitmap.c
diff --git a/jni/e2fsprogs/lib/ext2fs/gen_bitmap64.c b/e2fsprogs/lib/ext2fs/gen_bitmap64.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/gen_bitmap64.c
rename to e2fsprogs/lib/ext2fs/gen_bitmap64.c
diff --git a/jni/e2fsprogs/lib/ext2fs/gen_crc32ctable.c b/e2fsprogs/lib/ext2fs/gen_crc32ctable.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/gen_crc32ctable.c
rename to e2fsprogs/lib/ext2fs/gen_crc32ctable.c
diff --git a/jni/e2fsprogs/lib/ext2fs/get_num_dirs.c b/e2fsprogs/lib/ext2fs/get_num_dirs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/get_num_dirs.c
rename to e2fsprogs/lib/ext2fs/get_num_dirs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/get_pathname.c b/e2fsprogs/lib/ext2fs/get_pathname.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/get_pathname.c
rename to e2fsprogs/lib/ext2fs/get_pathname.c
diff --git a/jni/e2fsprogs/lib/ext2fs/getsectsize.c b/e2fsprogs/lib/ext2fs/getsectsize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/getsectsize.c
rename to e2fsprogs/lib/ext2fs/getsectsize.c
diff --git a/jni/e2fsprogs/lib/ext2fs/getsize.c b/e2fsprogs/lib/ext2fs/getsize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/getsize.c
rename to e2fsprogs/lib/ext2fs/getsize.c
diff --git a/jni/e2fsprogs/lib/ext2fs/hashmap.c b/e2fsprogs/lib/ext2fs/hashmap.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/hashmap.c
rename to e2fsprogs/lib/ext2fs/hashmap.c
diff --git a/jni/e2fsprogs/lib/ext2fs/i_block.c b/e2fsprogs/lib/ext2fs/i_block.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/i_block.c
rename to e2fsprogs/lib/ext2fs/i_block.c
diff --git a/jni/e2fsprogs/lib/ext2fs/icount.c b/e2fsprogs/lib/ext2fs/icount.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/icount.c
rename to e2fsprogs/lib/ext2fs/icount.c
diff --git a/jni/e2fsprogs/lib/ext2fs/imager.c b/e2fsprogs/lib/ext2fs/imager.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/imager.c
rename to e2fsprogs/lib/ext2fs/imager.c
diff --git a/jni/e2fsprogs/lib/ext2fs/ind_block.c b/e2fsprogs/lib/ext2fs/ind_block.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/ind_block.c
rename to e2fsprogs/lib/ext2fs/ind_block.c
diff --git a/jni/e2fsprogs/lib/ext2fs/initialize.c b/e2fsprogs/lib/ext2fs/initialize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/initialize.c
rename to e2fsprogs/lib/ext2fs/initialize.c
diff --git a/jni/e2fsprogs/lib/ext2fs/inline.c b/e2fsprogs/lib/ext2fs/inline.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/inline.c
rename to e2fsprogs/lib/ext2fs/inline.c
diff --git a/jni/e2fsprogs/lib/ext2fs/inline_data.c b/e2fsprogs/lib/ext2fs/inline_data.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/inline_data.c
rename to e2fsprogs/lib/ext2fs/inline_data.c
diff --git a/jni/e2fsprogs/lib/ext2fs/inode.c b/e2fsprogs/lib/ext2fs/inode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/inode.c
rename to e2fsprogs/lib/ext2fs/inode.c
diff --git a/jni/e2fsprogs/lib/ext2fs/io_manager.c b/e2fsprogs/lib/ext2fs/io_manager.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/io_manager.c
rename to e2fsprogs/lib/ext2fs/io_manager.c
diff --git a/jni/e2fsprogs/lib/ext2fs/irel_ma.c b/e2fsprogs/lib/ext2fs/irel_ma.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/irel_ma.c
rename to e2fsprogs/lib/ext2fs/irel_ma.c
diff --git a/jni/e2fsprogs/lib/ext2fs/ismounted.c b/e2fsprogs/lib/ext2fs/ismounted.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/ismounted.c
rename to e2fsprogs/lib/ext2fs/ismounted.c
diff --git a/jni/e2fsprogs/lib/ext2fs/link.c b/e2fsprogs/lib/ext2fs/link.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/link.c
rename to e2fsprogs/lib/ext2fs/link.c
diff --git a/jni/e2fsprogs/lib/ext2fs/llseek.c b/e2fsprogs/lib/ext2fs/llseek.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/llseek.c
rename to e2fsprogs/lib/ext2fs/llseek.c
diff --git a/jni/e2fsprogs/lib/ext2fs/lookup.c b/e2fsprogs/lib/ext2fs/lookup.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/lookup.c
rename to e2fsprogs/lib/ext2fs/lookup.c
diff --git a/jni/e2fsprogs/lib/ext2fs/mkdir.c b/e2fsprogs/lib/ext2fs/mkdir.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/mkdir.c
rename to e2fsprogs/lib/ext2fs/mkdir.c
diff --git a/jni/e2fsprogs/lib/ext2fs/mkjournal.c b/e2fsprogs/lib/ext2fs/mkjournal.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/mkjournal.c
rename to e2fsprogs/lib/ext2fs/mkjournal.c
diff --git a/jni/e2fsprogs/lib/ext2fs/mmp.c b/e2fsprogs/lib/ext2fs/mmp.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/mmp.c
rename to e2fsprogs/lib/ext2fs/mmp.c
diff --git a/jni/e2fsprogs/lib/ext2fs/namei.c b/e2fsprogs/lib/ext2fs/namei.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/namei.c
rename to e2fsprogs/lib/ext2fs/namei.c
diff --git a/jni/e2fsprogs/lib/ext2fs/native.c b/e2fsprogs/lib/ext2fs/native.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/native.c
rename to e2fsprogs/lib/ext2fs/native.c
diff --git a/jni/e2fsprogs/lib/ext2fs/newdir.c b/e2fsprogs/lib/ext2fs/newdir.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/newdir.c
rename to e2fsprogs/lib/ext2fs/newdir.c
diff --git a/jni/e2fsprogs/lib/ext2fs/nls_utf8.c b/e2fsprogs/lib/ext2fs/nls_utf8.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/nls_utf8.c
rename to e2fsprogs/lib/ext2fs/nls_utf8.c
diff --git a/jni/e2fsprogs/lib/ext2fs/nt_io.c b/e2fsprogs/lib/ext2fs/nt_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/nt_io.c
rename to e2fsprogs/lib/ext2fs/nt_io.c
diff --git a/jni/e2fsprogs/lib/ext2fs/openfs.c b/e2fsprogs/lib/ext2fs/openfs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/openfs.c
rename to e2fsprogs/lib/ext2fs/openfs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/progress.c b/e2fsprogs/lib/ext2fs/progress.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/progress.c
rename to e2fsprogs/lib/ext2fs/progress.c
diff --git a/jni/e2fsprogs/lib/ext2fs/punch.c b/e2fsprogs/lib/ext2fs/punch.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/punch.c
rename to e2fsprogs/lib/ext2fs/punch.c
diff --git a/jni/e2fsprogs/lib/ext2fs/qcow2.c b/e2fsprogs/lib/ext2fs/qcow2.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/qcow2.c
rename to e2fsprogs/lib/ext2fs/qcow2.c
diff --git a/jni/e2fsprogs/lib/ext2fs/qcow2.h b/e2fsprogs/lib/ext2fs/qcow2.h
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/qcow2.h
rename to e2fsprogs/lib/ext2fs/qcow2.h
diff --git a/jni/e2fsprogs/lib/ext2fs/rbtree.c b/e2fsprogs/lib/ext2fs/rbtree.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/rbtree.c
rename to e2fsprogs/lib/ext2fs/rbtree.c
diff --git a/jni/e2fsprogs/lib/ext2fs/rbtree.h b/e2fsprogs/lib/ext2fs/rbtree.h
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/rbtree.h
rename to e2fsprogs/lib/ext2fs/rbtree.h
diff --git a/jni/e2fsprogs/lib/ext2fs/read_bb.c b/e2fsprogs/lib/ext2fs/read_bb.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/read_bb.c
rename to e2fsprogs/lib/ext2fs/read_bb.c
diff --git a/jni/e2fsprogs/lib/ext2fs/read_bb_file.c b/e2fsprogs/lib/ext2fs/read_bb_file.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/read_bb_file.c
rename to e2fsprogs/lib/ext2fs/read_bb_file.c
diff --git a/jni/e2fsprogs/lib/ext2fs/res_gdt.c b/e2fsprogs/lib/ext2fs/res_gdt.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/res_gdt.c
rename to e2fsprogs/lib/ext2fs/res_gdt.c
diff --git a/jni/e2fsprogs/lib/ext2fs/rw_bitmaps.c b/e2fsprogs/lib/ext2fs/rw_bitmaps.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/rw_bitmaps.c
rename to e2fsprogs/lib/ext2fs/rw_bitmaps.c
diff --git a/jni/e2fsprogs/lib/ext2fs/sha256.c b/e2fsprogs/lib/ext2fs/sha256.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/sha256.c
rename to e2fsprogs/lib/ext2fs/sha256.c
diff --git a/jni/e2fsprogs/lib/ext2fs/sha512.c b/e2fsprogs/lib/ext2fs/sha512.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/sha512.c
rename to e2fsprogs/lib/ext2fs/sha512.c
diff --git a/jni/e2fsprogs/lib/ext2fs/sparse_io.c b/e2fsprogs/lib/ext2fs/sparse_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/sparse_io.c
rename to e2fsprogs/lib/ext2fs/sparse_io.c
diff --git a/jni/e2fsprogs/lib/ext2fs/swapfs.c b/e2fsprogs/lib/ext2fs/swapfs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/swapfs.c
rename to e2fsprogs/lib/ext2fs/swapfs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/symlink.c b/e2fsprogs/lib/ext2fs/symlink.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/symlink.c
rename to e2fsprogs/lib/ext2fs/symlink.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tdb.c b/e2fsprogs/lib/ext2fs/tdb.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tdb.c
rename to e2fsprogs/lib/ext2fs/tdb.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tdb.h b/e2fsprogs/lib/ext2fs/tdb.h
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tdb.h
rename to e2fsprogs/lib/ext2fs/tdb.h
diff --git a/jni/e2fsprogs/lib/ext2fs/tdbtool.c b/e2fsprogs/lib/ext2fs/tdbtool.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tdbtool.c
rename to e2fsprogs/lib/ext2fs/tdbtool.c
diff --git a/jni/e2fsprogs/lib/ext2fs/test_io.c b/e2fsprogs/lib/ext2fs/test_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/test_io.c
rename to e2fsprogs/lib/ext2fs/test_io.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_badblocks.c b/e2fsprogs/lib/ext2fs/tst_badblocks.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_badblocks.c
rename to e2fsprogs/lib/ext2fs/tst_badblocks.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_bitmaps.c b/e2fsprogs/lib/ext2fs/tst_bitmaps.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_bitmaps.c
rename to e2fsprogs/lib/ext2fs/tst_bitmaps.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_bitmaps_cmd.ct b/e2fsprogs/lib/ext2fs/tst_bitmaps_cmd.ct
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_bitmaps_cmd.ct
rename to e2fsprogs/lib/ext2fs/tst_bitmaps_cmd.ct
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_bitmaps_cmds b/e2fsprogs/lib/ext2fs/tst_bitmaps_cmds
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_bitmaps_cmds
rename to e2fsprogs/lib/ext2fs/tst_bitmaps_cmds
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_bitmaps_exp b/e2fsprogs/lib/ext2fs/tst_bitmaps_exp
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_bitmaps_exp
rename to e2fsprogs/lib/ext2fs/tst_bitmaps_exp
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_bitops.c b/e2fsprogs/lib/ext2fs/tst_bitops.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_bitops.c
rename to e2fsprogs/lib/ext2fs/tst_bitops.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_byteswap.c b/e2fsprogs/lib/ext2fs/tst_byteswap.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_byteswap.c
rename to e2fsprogs/lib/ext2fs/tst_byteswap.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_cmds.ct b/e2fsprogs/lib/ext2fs/tst_cmds.ct
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_cmds.ct
rename to e2fsprogs/lib/ext2fs/tst_cmds.ct
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_fs_struct.c b/e2fsprogs/lib/ext2fs/tst_fs_struct.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_fs_struct.c
rename to e2fsprogs/lib/ext2fs/tst_fs_struct.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_getsectsize.c b/e2fsprogs/lib/ext2fs/tst_getsectsize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_getsectsize.c
rename to e2fsprogs/lib/ext2fs/tst_getsectsize.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_getsize.c b/e2fsprogs/lib/ext2fs/tst_getsize.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_getsize.c
rename to e2fsprogs/lib/ext2fs/tst_getsize.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_inode_size.c b/e2fsprogs/lib/ext2fs/tst_inode_size.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_inode_size.c
rename to e2fsprogs/lib/ext2fs/tst_inode_size.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_iscan.c b/e2fsprogs/lib/ext2fs/tst_iscan.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_iscan.c
rename to e2fsprogs/lib/ext2fs/tst_iscan.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_libext2fs.c b/e2fsprogs/lib/ext2fs/tst_libext2fs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_libext2fs.c
rename to e2fsprogs/lib/ext2fs/tst_libext2fs.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_super_size.c b/e2fsprogs/lib/ext2fs/tst_super_size.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_super_size.c
rename to e2fsprogs/lib/ext2fs/tst_super_size.c
diff --git a/jni/e2fsprogs/lib/ext2fs/tst_types.c b/e2fsprogs/lib/ext2fs/tst_types.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/tst_types.c
rename to e2fsprogs/lib/ext2fs/tst_types.c
diff --git a/jni/e2fsprogs/lib/ext2fs/undo_io.c b/e2fsprogs/lib/ext2fs/undo_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/undo_io.c
rename to e2fsprogs/lib/ext2fs/undo_io.c
diff --git a/jni/e2fsprogs/lib/ext2fs/unix_io.c b/e2fsprogs/lib/ext2fs/unix_io.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/unix_io.c
rename to e2fsprogs/lib/ext2fs/unix_io.c
diff --git a/jni/e2fsprogs/lib/ext2fs/unlink.c b/e2fsprogs/lib/ext2fs/unlink.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/unlink.c
rename to e2fsprogs/lib/ext2fs/unlink.c
diff --git a/jni/e2fsprogs/lib/ext2fs/valid_blk.c b/e2fsprogs/lib/ext2fs/valid_blk.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/valid_blk.c
rename to e2fsprogs/lib/ext2fs/valid_blk.c
diff --git a/jni/e2fsprogs/lib/ext2fs/version.c b/e2fsprogs/lib/ext2fs/version.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/ext2fs/version.c
rename to e2fsprogs/lib/ext2fs/version.c
diff --git a/jni/e2fsprogs/lib/misc/create_inode.c b/e2fsprogs/lib/misc/create_inode.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/misc/create_inode.c
rename to e2fsprogs/lib/misc/create_inode.c
diff --git a/jni/e2fsprogs/lib/support/devname.c b/e2fsprogs/lib/support/devname.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/devname.c
rename to e2fsprogs/lib/support/devname.c
diff --git a/jni/e2fsprogs/lib/support/dict.c b/e2fsprogs/lib/support/dict.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/dict.c
rename to e2fsprogs/lib/support/dict.c
diff --git a/jni/e2fsprogs/lib/support/mkquota.c b/e2fsprogs/lib/support/mkquota.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/mkquota.c
rename to e2fsprogs/lib/support/mkquota.c
diff --git a/jni/e2fsprogs/lib/support/parse_qtype.c b/e2fsprogs/lib/support/parse_qtype.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/parse_qtype.c
rename to e2fsprogs/lib/support/parse_qtype.c
diff --git a/jni/e2fsprogs/lib/support/plausible.c b/e2fsprogs/lib/support/plausible.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/plausible.c
rename to e2fsprogs/lib/support/plausible.c
diff --git a/jni/e2fsprogs/lib/support/prof_err.c b/e2fsprogs/lib/support/prof_err.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/prof_err.c
rename to e2fsprogs/lib/support/prof_err.c
diff --git a/jni/e2fsprogs/lib/support/profile.c b/e2fsprogs/lib/support/profile.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/profile.c
rename to e2fsprogs/lib/support/profile.c
diff --git a/jni/e2fsprogs/lib/support/profile_helpers.c b/e2fsprogs/lib/support/profile_helpers.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/profile_helpers.c
rename to e2fsprogs/lib/support/profile_helpers.c
diff --git a/jni/e2fsprogs/lib/support/quotaio.c b/e2fsprogs/lib/support/quotaio.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/quotaio.c
rename to e2fsprogs/lib/support/quotaio.c
diff --git a/jni/e2fsprogs/lib/support/quotaio_tree.c b/e2fsprogs/lib/support/quotaio_tree.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/quotaio_tree.c
rename to e2fsprogs/lib/support/quotaio_tree.c
diff --git a/jni/e2fsprogs/lib/support/quotaio_v2.c b/e2fsprogs/lib/support/quotaio_v2.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/support/quotaio_v2.c
rename to e2fsprogs/lib/support/quotaio_v2.c
diff --git a/jni/e2fsprogs/lib/uuid/clear.c b/e2fsprogs/lib/uuid/clear.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/clear.c
rename to e2fsprogs/lib/uuid/clear.c
diff --git a/jni/e2fsprogs/lib/uuid/compare.c b/e2fsprogs/lib/uuid/compare.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/compare.c
rename to e2fsprogs/lib/uuid/compare.c
diff --git a/jni/e2fsprogs/lib/uuid/copy.c b/e2fsprogs/lib/uuid/copy.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/copy.c
rename to e2fsprogs/lib/uuid/copy.c
diff --git a/jni/e2fsprogs/lib/uuid/gen_uuid.c b/e2fsprogs/lib/uuid/gen_uuid.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/gen_uuid.c
rename to e2fsprogs/lib/uuid/gen_uuid.c
diff --git a/jni/e2fsprogs/lib/uuid/isnull.c b/e2fsprogs/lib/uuid/isnull.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/isnull.c
rename to e2fsprogs/lib/uuid/isnull.c
diff --git a/jni/e2fsprogs/lib/uuid/pack.c b/e2fsprogs/lib/uuid/pack.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/pack.c
rename to e2fsprogs/lib/uuid/pack.c
diff --git a/jni/e2fsprogs/lib/uuid/parse.c b/e2fsprogs/lib/uuid/parse.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/parse.c
rename to e2fsprogs/lib/uuid/parse.c
diff --git a/jni/e2fsprogs/lib/uuid/unpack.c b/e2fsprogs/lib/uuid/unpack.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/unpack.c
rename to e2fsprogs/lib/uuid/unpack.c
diff --git a/jni/e2fsprogs/lib/uuid/unparse.c b/e2fsprogs/lib/uuid/unparse.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/unparse.c
rename to e2fsprogs/lib/uuid/unparse.c
diff --git a/jni/e2fsprogs/lib/uuid/uuid_time.c b/e2fsprogs/lib/uuid/uuid_time.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/lib/uuid/uuid_time.c
rename to e2fsprogs/lib/uuid/uuid_time.c
diff --git a/jni/e2fsprogs/mke2fs/default_profile.c b/e2fsprogs/mke2fs/default_profile.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/mke2fs/default_profile.c
rename to e2fsprogs/mke2fs/default_profile.c
diff --git a/jni/e2fsprogs/mke2fs/mk_hugefiles.c b/e2fsprogs/mke2fs/mk_hugefiles.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/mke2fs/mk_hugefiles.c
rename to e2fsprogs/mke2fs/mk_hugefiles.c
diff --git a/jni/e2fsprogs/mke2fs/mke2fs.c b/e2fsprogs/mke2fs/mke2fs.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/mke2fs/mke2fs.c
rename to e2fsprogs/mke2fs/mke2fs.c
diff --git a/jni/e2fsprogs/mke2fs/util.c b/e2fsprogs/mke2fs/util.c
old mode 100755
new mode 100644
similarity index 100%
rename from jni/e2fsprogs/mke2fs/util.c
rename to e2fsprogs/mke2fs/util.c
diff --git a/jni/e2fsprogs/lib/blkid/cache.o b/jni/e2fsprogs/lib/blkid/cache.o
deleted file mode 100755
index 1014bfb..0000000
Binary files a/jni/e2fsprogs/lib/blkid/cache.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/dev.o b/jni/e2fsprogs/lib/blkid/dev.o
deleted file mode 100755
index cd29104..0000000
Binary files a/jni/e2fsprogs/lib/blkid/dev.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/devname.o b/jni/e2fsprogs/lib/blkid/devname.o
deleted file mode 100755
index d964c07..0000000
Binary files a/jni/e2fsprogs/lib/blkid/devname.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/devno.o b/jni/e2fsprogs/lib/blkid/devno.o
deleted file mode 100755
index e03d5bd..0000000
Binary files a/jni/e2fsprogs/lib/blkid/devno.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/getsize.o b/jni/e2fsprogs/lib/blkid/getsize.o
deleted file mode 100755
index 15f475e..0000000
Binary files a/jni/e2fsprogs/lib/blkid/getsize.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/llseek.o b/jni/e2fsprogs/lib/blkid/llseek.o
deleted file mode 100755
index e93eb75..0000000
Binary files a/jni/e2fsprogs/lib/blkid/llseek.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/probe.o b/jni/e2fsprogs/lib/blkid/probe.o
deleted file mode 100755
index 29b31a5..0000000
Binary files a/jni/e2fsprogs/lib/blkid/probe.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/read.o b/jni/e2fsprogs/lib/blkid/read.o
deleted file mode 100755
index 4bff33f..0000000
Binary files a/jni/e2fsprogs/lib/blkid/read.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/resolve.o b/jni/e2fsprogs/lib/blkid/resolve.o
deleted file mode 100755
index cac8a5d..0000000
Binary files a/jni/e2fsprogs/lib/blkid/resolve.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/save.o b/jni/e2fsprogs/lib/blkid/save.o
deleted file mode 100755
index c060809..0000000
Binary files a/jni/e2fsprogs/lib/blkid/save.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/tag.o b/jni/e2fsprogs/lib/blkid/tag.o
deleted file mode 100755
index 3b6039f..0000000
Binary files a/jni/e2fsprogs/lib/blkid/tag.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/blkid/version.o b/jni/e2fsprogs/lib/blkid/version.o
deleted file mode 100755
index 1162dae..0000000
Binary files a/jni/e2fsprogs/lib/blkid/version.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/crypto_mode.o b/jni/e2fsprogs/lib/e2p/crypto_mode.o
deleted file mode 100755
index f5e9789..0000000
Binary files a/jni/e2fsprogs/lib/e2p/crypto_mode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/encoding.o b/jni/e2fsprogs/lib/e2p/encoding.o
deleted file mode 100755
index 99d5f52..0000000
Binary files a/jni/e2fsprogs/lib/e2p/encoding.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/errcode.o b/jni/e2fsprogs/lib/e2p/errcode.o
deleted file mode 100755
index c2171b3..0000000
Binary files a/jni/e2fsprogs/lib/e2p/errcode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/feature.o b/jni/e2fsprogs/lib/e2p/feature.o
deleted file mode 100755
index 496fbd7..0000000
Binary files a/jni/e2fsprogs/lib/e2p/feature.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fgetflags.o b/jni/e2fsprogs/lib/e2p/fgetflags.o
deleted file mode 100755
index 7d0f2cc..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fgetflags.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fgetproject.o b/jni/e2fsprogs/lib/e2p/fgetproject.o
deleted file mode 100755
index 67ae644..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fgetproject.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fgetversion.o b/jni/e2fsprogs/lib/e2p/fgetversion.o
deleted file mode 100755
index fffba91..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fgetversion.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fsetflags.o b/jni/e2fsprogs/lib/e2p/fsetflags.o
deleted file mode 100755
index 93502b1..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fsetflags.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fsetproject.o b/jni/e2fsprogs/lib/e2p/fsetproject.o
deleted file mode 100755
index 291bc7e..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fsetproject.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/fsetversion.o b/jni/e2fsprogs/lib/e2p/fsetversion.o
deleted file mode 100755
index f9c15d0..0000000
Binary files a/jni/e2fsprogs/lib/e2p/fsetversion.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/getflags.o b/jni/e2fsprogs/lib/e2p/getflags.o
deleted file mode 100755
index 9a97a07..0000000
Binary files a/jni/e2fsprogs/lib/e2p/getflags.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/getversion.o b/jni/e2fsprogs/lib/e2p/getversion.o
deleted file mode 100755
index 8c668b5..0000000
Binary files a/jni/e2fsprogs/lib/e2p/getversion.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/hashstr.o b/jni/e2fsprogs/lib/e2p/hashstr.o
deleted file mode 100755
index c2bbd3e..0000000
Binary files a/jni/e2fsprogs/lib/e2p/hashstr.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/iod.o b/jni/e2fsprogs/lib/e2p/iod.o
deleted file mode 100755
index 2d19873..0000000
Binary files a/jni/e2fsprogs/lib/e2p/iod.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/ljs.o b/jni/e2fsprogs/lib/e2p/ljs.o
deleted file mode 100755
index b6939dc..0000000
Binary files a/jni/e2fsprogs/lib/e2p/ljs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/ls.o b/jni/e2fsprogs/lib/e2p/ls.o
deleted file mode 100755
index 3e7b7ee..0000000
Binary files a/jni/e2fsprogs/lib/e2p/ls.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/mntopts.o b/jni/e2fsprogs/lib/e2p/mntopts.o
deleted file mode 100755
index 8248ecd..0000000
Binary files a/jni/e2fsprogs/lib/e2p/mntopts.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/ostype.o b/jni/e2fsprogs/lib/e2p/ostype.o
deleted file mode 100755
index 9d6d778..0000000
Binary files a/jni/e2fsprogs/lib/e2p/ostype.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/parse_num.o b/jni/e2fsprogs/lib/e2p/parse_num.o
deleted file mode 100755
index 23fa2e1..0000000
Binary files a/jni/e2fsprogs/lib/e2p/parse_num.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/pe.o b/jni/e2fsprogs/lib/e2p/pe.o
deleted file mode 100755
index 4192c99..0000000
Binary files a/jni/e2fsprogs/lib/e2p/pe.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/percent.o b/jni/e2fsprogs/lib/e2p/percent.o
deleted file mode 100755
index 3b64678..0000000
Binary files a/jni/e2fsprogs/lib/e2p/percent.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/pf.o b/jni/e2fsprogs/lib/e2p/pf.o
deleted file mode 100755
index fbe3c8f..0000000
Binary files a/jni/e2fsprogs/lib/e2p/pf.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/ps.o b/jni/e2fsprogs/lib/e2p/ps.o
deleted file mode 100755
index 8ad54a6..0000000
Binary files a/jni/e2fsprogs/lib/e2p/ps.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/setflags.o b/jni/e2fsprogs/lib/e2p/setflags.o
deleted file mode 100755
index d408527..0000000
Binary files a/jni/e2fsprogs/lib/e2p/setflags.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/setversion.o b/jni/e2fsprogs/lib/e2p/setversion.o
deleted file mode 100755
index 4edca4d..0000000
Binary files a/jni/e2fsprogs/lib/e2p/setversion.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/e2p/uuid.o b/jni/e2fsprogs/lib/e2p/uuid.o
deleted file mode 100755
index 27969f7..0000000
Binary files a/jni/e2fsprogs/lib/e2p/uuid.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/et/com_err.o b/jni/e2fsprogs/lib/et/com_err.o
deleted file mode 100755
index 26ed6c3..0000000
Binary files a/jni/e2fsprogs/lib/et/com_err.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/et/com_right.o b/jni/e2fsprogs/lib/et/com_right.o
deleted file mode 100755
index 8217af3..0000000
Binary files a/jni/e2fsprogs/lib/et/com_right.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/et/error_message.o b/jni/e2fsprogs/lib/et/error_message.o
deleted file mode 100755
index 89db085..0000000
Binary files a/jni/e2fsprogs/lib/et/error_message.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/et/et_name.o b/jni/e2fsprogs/lib/et/et_name.o
deleted file mode 100755
index 5bbfd81..0000000
Binary files a/jni/e2fsprogs/lib/et/et_name.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/et/init_et.o b/jni/e2fsprogs/lib/et/init_et.o
deleted file mode 100755
index 2e41255..0000000
Binary files a/jni/e2fsprogs/lib/et/init_et.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc.o b/jni/e2fsprogs/lib/ext2fs/alloc.o
deleted file mode 100755
index 40afdaf..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/alloc.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_sb.o b/jni/e2fsprogs/lib/ext2fs/alloc_sb.o
deleted file mode 100755
index 2502155..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/alloc_sb.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_stats.o b/jni/e2fsprogs/lib/ext2fs/alloc_stats.o
deleted file mode 100755
index 11baba0..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/alloc_stats.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/alloc_tables.o b/jni/e2fsprogs/lib/ext2fs/alloc_tables.o
deleted file mode 100755
index 0b51baf..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/alloc_tables.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/atexit.o b/jni/e2fsprogs/lib/ext2fs/atexit.o
deleted file mode 100755
index 06cc371..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/atexit.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/badblocks.o b/jni/e2fsprogs/lib/ext2fs/badblocks.o
deleted file mode 100755
index 78656c2..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/badblocks.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/bb_inode.o b/jni/e2fsprogs/lib/ext2fs/bb_inode.o
deleted file mode 100755
index 26fa820..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/bb_inode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/bitmaps.o b/jni/e2fsprogs/lib/ext2fs/bitmaps.o
deleted file mode 100755
index d9ab1fb..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/bitmaps.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/bitops.o b/jni/e2fsprogs/lib/ext2fs/bitops.o
deleted file mode 100755
index 3399d95..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/bitops.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/blkmap64_ba.o b/jni/e2fsprogs/lib/ext2fs/blkmap64_ba.o
deleted file mode 100755
index 468abb6..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/blkmap64_ba.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/blkmap64_rb.o b/jni/e2fsprogs/lib/ext2fs/blkmap64_rb.o
deleted file mode 100755
index 5e67b5f..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/blkmap64_rb.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/blknum.o b/jni/e2fsprogs/lib/ext2fs/blknum.o
deleted file mode 100755
index 3ffd170..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/blknum.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/block.o b/jni/e2fsprogs/lib/ext2fs/block.o
deleted file mode 100755
index c43b00d..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/block.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/bmap.o b/jni/e2fsprogs/lib/ext2fs/bmap.o
deleted file mode 100755
index 96edf78..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/bmap.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/check_desc.o b/jni/e2fsprogs/lib/ext2fs/check_desc.o
deleted file mode 100755
index 4596be7..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/check_desc.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/closefs.o b/jni/e2fsprogs/lib/ext2fs/closefs.o
deleted file mode 100755
index 04e5686..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/closefs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/crc16.o b/jni/e2fsprogs/lib/ext2fs/crc16.o
deleted file mode 100755
index 29b87d4..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/crc16.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/crc32c.o b/jni/e2fsprogs/lib/ext2fs/crc32c.o
deleted file mode 100755
index b1c07c4..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/crc32c.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/csum.o b/jni/e2fsprogs/lib/ext2fs/csum.o
deleted file mode 100755
index b54f279..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/csum.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dblist.o b/jni/e2fsprogs/lib/ext2fs/dblist.o
deleted file mode 100755
index a87a527..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dblist.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dblist_dir.o b/jni/e2fsprogs/lib/ext2fs/dblist_dir.o
deleted file mode 100755
index 6f8a5cf..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dblist_dir.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/digest_encode.o b/jni/e2fsprogs/lib/ext2fs/digest_encode.o
deleted file mode 100755
index c6ce843..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/digest_encode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dir_iterate.o b/jni/e2fsprogs/lib/ext2fs/dir_iterate.o
deleted file mode 100755
index 1def5ec..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dir_iterate.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dirblock.o b/jni/e2fsprogs/lib/ext2fs/dirblock.o
deleted file mode 100755
index 53358fc..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dirblock.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dirhash.o b/jni/e2fsprogs/lib/ext2fs/dirhash.o
deleted file mode 100755
index 3dfde58..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dirhash.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/dupfs.o b/jni/e2fsprogs/lib/ext2fs/dupfs.o
deleted file mode 100755
index 23349d4..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/dupfs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/expanddir.o b/jni/e2fsprogs/lib/ext2fs/expanddir.o
deleted file mode 100755
index d237cbb..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/expanddir.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/ext2_err.o b/jni/e2fsprogs/lib/ext2fs/ext2_err.o
deleted file mode 100755
index cfeca8d..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/ext2_err.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/ext_attr.o b/jni/e2fsprogs/lib/ext2fs/ext_attr.o
deleted file mode 100755
index ec7a43e..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/ext_attr.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/extent.o b/jni/e2fsprogs/lib/ext2fs/extent.o
deleted file mode 100755
index 950cd72..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/extent.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/fallocate.o b/jni/e2fsprogs/lib/ext2fs/fallocate.o
deleted file mode 100755
index e45810a..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/fallocate.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/fileio.o b/jni/e2fsprogs/lib/ext2fs/fileio.o
deleted file mode 100755
index ae3fc74..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/fileio.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/finddev.o b/jni/e2fsprogs/lib/ext2fs/finddev.o
deleted file mode 100755
index bc817ca..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/finddev.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/flushb.o b/jni/e2fsprogs/lib/ext2fs/flushb.o
deleted file mode 100755
index 75d0f20..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/flushb.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/freefs.o b/jni/e2fsprogs/lib/ext2fs/freefs.o
deleted file mode 100755
index 2cedfab..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/freefs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/gen_bitmap.o b/jni/e2fsprogs/lib/ext2fs/gen_bitmap.o
deleted file mode 100755
index 8c531f0..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/gen_bitmap.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/gen_bitmap64.o b/jni/e2fsprogs/lib/ext2fs/gen_bitmap64.o
deleted file mode 100755
index e4882f2..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/gen_bitmap64.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/get_num_dirs.o b/jni/e2fsprogs/lib/ext2fs/get_num_dirs.o
deleted file mode 100755
index fd00874..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/get_num_dirs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/get_pathname.o b/jni/e2fsprogs/lib/ext2fs/get_pathname.o
deleted file mode 100755
index 6c4d113..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/get_pathname.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/getsectsize.o b/jni/e2fsprogs/lib/ext2fs/getsectsize.o
deleted file mode 100755
index d19562a..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/getsectsize.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/getsize.o b/jni/e2fsprogs/lib/ext2fs/getsize.o
deleted file mode 100755
index 18bdf42..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/getsize.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/hashmap.o b/jni/e2fsprogs/lib/ext2fs/hashmap.o
deleted file mode 100755
index 3f86fb3..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/hashmap.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/i_block.o b/jni/e2fsprogs/lib/ext2fs/i_block.o
deleted file mode 100755
index 9a651d0..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/i_block.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/icount.o b/jni/e2fsprogs/lib/ext2fs/icount.o
deleted file mode 100755
index 086ef85..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/icount.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/imager.o b/jni/e2fsprogs/lib/ext2fs/imager.o
deleted file mode 100755
index cdb8eb6..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/imager.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/ind_block.o b/jni/e2fsprogs/lib/ext2fs/ind_block.o
deleted file mode 100755
index 0bebd1d..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/ind_block.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/initialize.o b/jni/e2fsprogs/lib/ext2fs/initialize.o
deleted file mode 100755
index 192123c..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/initialize.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/inline.o b/jni/e2fsprogs/lib/ext2fs/inline.o
deleted file mode 100755
index a299772..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/inline.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/inline_data.o b/jni/e2fsprogs/lib/ext2fs/inline_data.o
deleted file mode 100755
index 9401be2..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/inline_data.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/inode.o b/jni/e2fsprogs/lib/ext2fs/inode.o
deleted file mode 100755
index dd421c0..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/inode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/io_manager.o b/jni/e2fsprogs/lib/ext2fs/io_manager.o
deleted file mode 100755
index 0757c4d..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/io_manager.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/ismounted.o b/jni/e2fsprogs/lib/ext2fs/ismounted.o
deleted file mode 100755
index d14fc83..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/ismounted.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/link.o b/jni/e2fsprogs/lib/ext2fs/link.o
deleted file mode 100755
index 1aa3f87..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/link.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/llseek.o b/jni/e2fsprogs/lib/ext2fs/llseek.o
deleted file mode 100755
index 9fc712e..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/llseek.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/lookup.o b/jni/e2fsprogs/lib/ext2fs/lookup.o
deleted file mode 100755
index fe5f695..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/lookup.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/mkdir.o b/jni/e2fsprogs/lib/ext2fs/mkdir.o
deleted file mode 100755
index d757ab1..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/mkdir.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/mkjournal.o b/jni/e2fsprogs/lib/ext2fs/mkjournal.o
deleted file mode 100755
index eab2064..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/mkjournal.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/mmp.o b/jni/e2fsprogs/lib/ext2fs/mmp.o
deleted file mode 100755
index 84eb0c2..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/mmp.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/namei.o b/jni/e2fsprogs/lib/ext2fs/namei.o
deleted file mode 100755
index 26fdc14..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/namei.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/native.o b/jni/e2fsprogs/lib/ext2fs/native.o
deleted file mode 100755
index c84fdd2..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/native.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/newdir.o b/jni/e2fsprogs/lib/ext2fs/newdir.o
deleted file mode 100755
index 7353c18..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/newdir.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/nls_utf8.o b/jni/e2fsprogs/lib/ext2fs/nls_utf8.o
deleted file mode 100755
index b4a4205..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/nls_utf8.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/openfs.o b/jni/e2fsprogs/lib/ext2fs/openfs.o
deleted file mode 100755
index 1a81f45..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/openfs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/progress.o b/jni/e2fsprogs/lib/ext2fs/progress.o
deleted file mode 100755
index 119b629..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/progress.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/punch.o b/jni/e2fsprogs/lib/ext2fs/punch.o
deleted file mode 100755
index 2993554..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/punch.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/qcow2.o b/jni/e2fsprogs/lib/ext2fs/qcow2.o
deleted file mode 100755
index 9418fec..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/qcow2.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/rbtree.o b/jni/e2fsprogs/lib/ext2fs/rbtree.o
deleted file mode 100755
index b744656..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/rbtree.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/read_bb.o b/jni/e2fsprogs/lib/ext2fs/read_bb.o
deleted file mode 100755
index b26247c..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/read_bb.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/read_bb_file.o b/jni/e2fsprogs/lib/ext2fs/read_bb_file.o
deleted file mode 100755
index 7383a44..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/read_bb_file.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/res_gdt.o b/jni/e2fsprogs/lib/ext2fs/res_gdt.o
deleted file mode 100755
index 1620017..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/res_gdt.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/rw_bitmaps.o b/jni/e2fsprogs/lib/ext2fs/rw_bitmaps.o
deleted file mode 100755
index b7abdd1..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/rw_bitmaps.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/sha256.o b/jni/e2fsprogs/lib/ext2fs/sha256.o
deleted file mode 100755
index 3c4a158..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/sha256.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/sha512.o b/jni/e2fsprogs/lib/ext2fs/sha512.o
deleted file mode 100755
index 5673065..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/sha512.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/sparse_io.o b/jni/e2fsprogs/lib/ext2fs/sparse_io.o
deleted file mode 100755
index 5ec99b3..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/sparse_io.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/swapfs.o b/jni/e2fsprogs/lib/ext2fs/swapfs.o
deleted file mode 100755
index faf6ad4..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/swapfs.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/symlink.o b/jni/e2fsprogs/lib/ext2fs/symlink.o
deleted file mode 100755
index 6d28256..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/symlink.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/test_io.o b/jni/e2fsprogs/lib/ext2fs/test_io.o
deleted file mode 100755
index bc93bb1..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/test_io.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/undo_io.o b/jni/e2fsprogs/lib/ext2fs/undo_io.o
deleted file mode 100755
index 251031e..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/undo_io.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/unix_io.o b/jni/e2fsprogs/lib/ext2fs/unix_io.o
deleted file mode 100755
index c2c4433..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/unix_io.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/unlink.o b/jni/e2fsprogs/lib/ext2fs/unlink.o
deleted file mode 100755
index c373219..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/unlink.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/valid_blk.o b/jni/e2fsprogs/lib/ext2fs/valid_blk.o
deleted file mode 100755
index 3f47ca7..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/valid_blk.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/ext2fs/version.o b/jni/e2fsprogs/lib/ext2fs/version.o
deleted file mode 100755
index 33c4ed3..0000000
Binary files a/jni/e2fsprogs/lib/ext2fs/version.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/misc/create_inode.o b/jni/e2fsprogs/lib/misc/create_inode.o
deleted file mode 100755
index 8352cd6..0000000
Binary files a/jni/e2fsprogs/lib/misc/create_inode.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/devname.o b/jni/e2fsprogs/lib/support/devname.o
deleted file mode 100755
index defc34d..0000000
Binary files a/jni/e2fsprogs/lib/support/devname.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/dict.o b/jni/e2fsprogs/lib/support/dict.o
deleted file mode 100755
index cb1888c..0000000
Binary files a/jni/e2fsprogs/lib/support/dict.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/mkquota.o b/jni/e2fsprogs/lib/support/mkquota.o
deleted file mode 100755
index c1d086e..0000000
Binary files a/jni/e2fsprogs/lib/support/mkquota.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/parse_qtype.o b/jni/e2fsprogs/lib/support/parse_qtype.o
deleted file mode 100755
index 32923f2..0000000
Binary files a/jni/e2fsprogs/lib/support/parse_qtype.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/plausible.o b/jni/e2fsprogs/lib/support/plausible.o
deleted file mode 100755
index 89f67ee..0000000
Binary files a/jni/e2fsprogs/lib/support/plausible.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/prof_err.o b/jni/e2fsprogs/lib/support/prof_err.o
deleted file mode 100755
index e965fca..0000000
Binary files a/jni/e2fsprogs/lib/support/prof_err.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/profile.o b/jni/e2fsprogs/lib/support/profile.o
deleted file mode 100755
index 88ac9a6..0000000
Binary files a/jni/e2fsprogs/lib/support/profile.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/profile_helpers.o b/jni/e2fsprogs/lib/support/profile_helpers.o
deleted file mode 100755
index 49ab841..0000000
Binary files a/jni/e2fsprogs/lib/support/profile_helpers.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/quotaio.o b/jni/e2fsprogs/lib/support/quotaio.o
deleted file mode 100755
index 8c722a7..0000000
Binary files a/jni/e2fsprogs/lib/support/quotaio.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/quotaio_tree.o b/jni/e2fsprogs/lib/support/quotaio_tree.o
deleted file mode 100755
index 7565e67..0000000
Binary files a/jni/e2fsprogs/lib/support/quotaio_tree.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/support/quotaio_v2.o b/jni/e2fsprogs/lib/support/quotaio_v2.o
deleted file mode 100755
index 2c5c17e..0000000
Binary files a/jni/e2fsprogs/lib/support/quotaio_v2.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/clear.o b/jni/e2fsprogs/lib/uuid/clear.o
deleted file mode 100755
index 2fb594d..0000000
Binary files a/jni/e2fsprogs/lib/uuid/clear.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/compare.o b/jni/e2fsprogs/lib/uuid/compare.o
deleted file mode 100755
index 45782c8..0000000
Binary files a/jni/e2fsprogs/lib/uuid/compare.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/copy.o b/jni/e2fsprogs/lib/uuid/copy.o
deleted file mode 100755
index 597ae5b..0000000
Binary files a/jni/e2fsprogs/lib/uuid/copy.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/gen_uuid.o b/jni/e2fsprogs/lib/uuid/gen_uuid.o
deleted file mode 100755
index 3a5ebd4..0000000
Binary files a/jni/e2fsprogs/lib/uuid/gen_uuid.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/isnull.o b/jni/e2fsprogs/lib/uuid/isnull.o
deleted file mode 100755
index badcb8c..0000000
Binary files a/jni/e2fsprogs/lib/uuid/isnull.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/pack.o b/jni/e2fsprogs/lib/uuid/pack.o
deleted file mode 100755
index 3961473..0000000
Binary files a/jni/e2fsprogs/lib/uuid/pack.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/parse.o b/jni/e2fsprogs/lib/uuid/parse.o
deleted file mode 100755
index cf0ea0e..0000000
Binary files a/jni/e2fsprogs/lib/uuid/parse.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/unpack.o b/jni/e2fsprogs/lib/uuid/unpack.o
deleted file mode 100755
index 2cd750b..0000000
Binary files a/jni/e2fsprogs/lib/uuid/unpack.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/unparse.o b/jni/e2fsprogs/lib/uuid/unparse.o
deleted file mode 100755
index 5ae3e9a..0000000
Binary files a/jni/e2fsprogs/lib/uuid/unparse.o and /dev/null differ
diff --git a/jni/e2fsprogs/lib/uuid/uuid_time.o b/jni/e2fsprogs/lib/uuid/uuid_time.o
deleted file mode 100755
index 32f40c7..0000000
Binary files a/jni/e2fsprogs/lib/uuid/uuid_time.o and /dev/null differ
diff --git a/jni/e2fsprogs/mke2fs/default_profile.o b/jni/e2fsprogs/mke2fs/default_profile.o
deleted file mode 100755
index 3fb6be7..0000000
Binary files a/jni/e2fsprogs/mke2fs/default_profile.o and /dev/null differ
diff --git a/jni/e2fsprogs/mke2fs/mk_hugefiles.o b/jni/e2fsprogs/mke2fs/mk_hugefiles.o
deleted file mode 100755
index 120e26e..0000000
Binary files a/jni/e2fsprogs/mke2fs/mk_hugefiles.o and /dev/null differ
diff --git a/jni/e2fsprogs/mke2fs/mke2fs.o b/jni/e2fsprogs/mke2fs/mke2fs.o
deleted file mode 100755
index ed60890..0000000
Binary files a/jni/e2fsprogs/mke2fs/mke2fs.o and /dev/null differ
diff --git a/jni/e2fsprogs/mke2fs/util.o b/jni/e2fsprogs/mke2fs/util.o
deleted file mode 100755
index c3822ed..0000000
Binary files a/jni/e2fsprogs/mke2fs/util.o and /dev/null differ