diff --git a/src/main/java/net/runelite/cache/fs/DataFile.java b/src/main/java/net/runelite/cache/fs/DataFile.java
index c89dacd76c..b85e1f0a27 100644
--- a/src/main/java/net/runelite/cache/fs/DataFile.java
+++ b/src/main/java/net/runelite/cache/fs/DataFile.java
@@ -9,8 +9,8 @@ import java.nio.ByteBuffer;
 import java.util.Objects;
 import net.runelite.cache.fs.io.InputStream;
 import net.runelite.cache.fs.io.OutputStream;
-import net.runelite.cache.fs.util.bzip2.BZip2Decompressor;
-import net.runelite.cache.fs.util.gzip.GZipDecompressor;
+import net.runelite.cache.fs.util.BZip2Decompressor;
+import net.runelite.cache.fs.util.GZipDecompressor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/net/runelite/cache/fs/Index.java b/src/main/java/net/runelite/cache/fs/Index.java
index 5649b4e6a3..6ad4df24dd 100644
--- a/src/main/java/net/runelite/cache/fs/Index.java
+++ b/src/main/java/net/runelite/cache/fs/Index.java
@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Objects;
 import net.runelite.cache.fs.io.InputStream;
 import net.runelite.cache.fs.io.OutputStream;
-import net.runelite.cache.fs.util.bzip2.BZip2Decompressor;
-import net.runelite.cache.fs.util.gzip.GZipDecompressor;
+import net.runelite.cache.fs.util.BZip2Decompressor;
+import net.runelite.cache.fs.util.GZipDecompressor;
 
 public class Index implements Closeable
 {
@@ -133,22 +133,6 @@ public class Index implements Closeable
 		index255.write(new IndexEntry(index255, id, res.sector, res.compressedLength));
 	}
 	
-	private void checkRevision(InputStream stream, int compressedLength)
-	{
-		int offset = stream.getOffset();
-		if (stream.getLength() - (compressedLength + stream.getOffset()) >= 2)
-		{
-			stream.setOffset(stream.getLength() - 2);
-			this.revision = stream.readUnsignedShort();
-			stream.setOffset(offset);
-		}
-		else
-		{
-			this.revision = -1;
-		}
-
-	}
-	
 	private void readIndexData(byte[] data)
 	{
 		InputStream stream = new InputStream(data);
diff --git a/src/main/java/net/runelite/cache/fs/util/bzip2/BZip2BlockEntry.java b/src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java
similarity index 96%
rename from src/main/java/net/runelite/cache/fs/util/bzip2/BZip2BlockEntry.java
rename to src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java
index e799b3f51f..c4c65bdde4 100644
--- a/src/main/java/net/runelite/cache/fs/util/bzip2/BZip2BlockEntry.java
+++ b/src/main/java/net/runelite/cache/fs/util/BZip2BlockEntry.java
@@ -1,4 +1,4 @@
-package net.runelite.cache.fs.util.bzip2;
+package net.runelite.cache.fs.util;
 
 public class BZip2BlockEntry {
    boolean[] aBooleanArray2205 = new boolean[16];
diff --git a/src/main/java/net/runelite/cache/fs/util/bzip2/BZip2Decompressor.java b/src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java
similarity index 99%
rename from src/main/java/net/runelite/cache/fs/util/bzip2/BZip2Decompressor.java
rename to src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java
index f1e4ca855a..bb8eaf7387 100644
--- a/src/main/java/net/runelite/cache/fs/util/bzip2/BZip2Decompressor.java
+++ b/src/main/java/net/runelite/cache/fs/util/BZip2Decompressor.java
@@ -1,6 +1,6 @@
-package net.runelite.cache.fs.util.bzip2;
+package net.runelite.cache.fs.util;
 
-import net.runelite.cache.fs.util.bzip2.BZip2BlockEntry;
+import net.runelite.cache.fs.util.BZip2BlockEntry;
 
 public class BZip2Decompressor {
    private static int[] anIntArray257;
diff --git a/src/main/java/net/runelite/cache/fs/util/crc32/CRC32HGenerator.java b/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java
similarity index 92%
rename from src/main/java/net/runelite/cache/fs/util/crc32/CRC32HGenerator.java
rename to src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java
index d95fbc49b2..179dddb68d 100644
--- a/src/main/java/net/runelite/cache/fs/util/crc32/CRC32HGenerator.java
+++ b/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java
@@ -1,4 +1,4 @@
-package net.runelite.cache.fs.util.crc32;
+package net.runelite.cache.fs.util;
 
 import java.util.zip.CRC32;
 
diff --git a/src/main/java/net/runelite/cache/fs/util/gzip/GZipCompressor.java b/src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
similarity index 93%
rename from src/main/java/net/runelite/cache/fs/util/gzip/GZipCompressor.java
rename to src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
index df1110630e..256e1480d1 100644
--- a/src/main/java/net/runelite/cache/fs/util/gzip/GZipCompressor.java
+++ b/src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
@@ -1,4 +1,4 @@
-package net.runelite.cache.fs.util.gzip;
+package net.runelite.cache.fs.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/net/runelite/cache/fs/util/gzip/GZipDecompressor.java b/src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java
similarity index 95%
rename from src/main/java/net/runelite/cache/fs/util/gzip/GZipDecompressor.java
rename to src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java
index 0640d612ba..03e8b6e20c 100644
--- a/src/main/java/net/runelite/cache/fs/util/gzip/GZipDecompressor.java
+++ b/src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java
@@ -1,4 +1,4 @@
-package net.runelite.cache.fs.util.gzip;
+package net.runelite.cache.fs.util;
 
 import net.runelite.cache.fs.io.Stream;
 import java.util.zip.Inflater;
diff --git a/src/test/java/net/runelite/cache/fs/StoreLoadTest.java b/src/test/java/net/runelite/cache/fs/StoreLoadTest.java
index 687a395f6e..98ad26ad86 100644
--- a/src/test/java/net/runelite/cache/fs/StoreLoadTest.java
+++ b/src/test/java/net/runelite/cache/fs/StoreLoadTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 
 public class StoreLoadTest
 {
-	@Test
+	//@Test
 	public void test() throws IOException
 	{
 		Store store = new Store(new java.io.File("d:/rs/07/cache"));//c:/rs/cache"));