diff --git a/poetry.lock b/poetry.lock
index c8488543f9..162dc16b37 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -164,8 +164,8 @@ develop = false
 [package.source]
 type = "git"
 url = "https://github.com/IoT-Inspector/jefferson.git"
-reference = "1a0ee577d7c7238303b8d76abb9a44422ac062f5"
-resolved_reference = "1a0ee577d7c7238303b8d76abb9a44422ac062f5"
+reference = "ddbc592edd81e8d53e5d49668da095e7a9293ade"
+resolved_reference = "ddbc592edd81e8d53e5d49668da095e7a9293ade"
 
 [[package]]
 name = "lark"
@@ -482,7 +482,7 @@ resolved_reference = "24e6e453a36a02144ae2d159eb3229f9c6312828"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "fde38081bb27e6f0fde95da12a3ed635167721fdad6189482c1bc743ad5f4a9a"
+content-hash = "fd92b2091e94581d5dd26ef1004d77738271f9ae226f58a69d62b9954e3e3262"
 
 [metadata.files]
 arpy = [
diff --git a/pyproject.toml b/pyproject.toml
index c7125cd14a..1f234ceb6f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ rarfile = "^4.0"
 ubi-reader = { git = "https://github.com/IoT-Inspector/ubi_reader.git", rev = "8c956d47b28af4085366e2acfee8d3ba016f6e90" }
 python-lzo = "^1.14"
 cstruct = "2.1"
-jefferson = { git = "https://github.com/IoT-Inspector/jefferson.git", rev = "1a0ee577d7c7238303b8d76abb9a44422ac062f5" }
+jefferson = { git = "https://github.com/IoT-Inspector/jefferson.git", rev = "ddbc592edd81e8d53e5d49668da095e7a9293ade" }
 yaffshiv = { git = "https://github.com/IoT-Inspector/yaffshiv.git", rev = "24e6e453a36a02144ae2d159eb3229f9c6312828" }
 plotext = "^4.1.5"
 pluggy = "^1.0.0"
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.lzo.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.nocomp.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.rtime.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.be.zlib.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.lzo.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.rtime.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_new/__output__/fruits.new.le.zlib.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.lzo.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.nocomp.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.lzo.padded.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.rtime.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.nocomp.padded.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/apple.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.be.zlib.padded.jffs2_extract/fs_1/apple.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/apple.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.rtime.padded.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/apple.txt
new file mode 100644
index 0000000000..c485016d8f
--- /dev/null
+++ b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/apple.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e4b42e0760637553dc125300052985ac4e68fbf5c341191fb980a22db7b3aae
+size 26
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/banana.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/banana.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/banana.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/banana.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/cherry.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/cherry.txt
similarity index 100%
rename from tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/cherry.txt
rename to tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/cherry.txt
diff --git a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/apple.txt b/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/apple.txt
deleted file mode 100644
index 7cb8f6335a..0000000000
--- a/tests/integration/filesystem/jffs2/jffs2_old/__output__/fruits.old.le.zlib.padded.jffs2_extract/fs_1/apple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1c520551a1a5890fab0d252f7535c498f8e91aeb22b5cf8ab0d34d25c086f31
-size 26