diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
index 555175588b53b52744e09f1be636a92ec3803adb..a2cd2251cc5d3c88f4f0901cb5bdfd2b84295c7d 100644
--- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
index 2cb096855733b517823834102416721a45dd94b5..6fb310ede0a72cf0ba719c627df93ccca251d48a 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
+++ b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
@@ -2,8 +2,8 @@ package cz.it4i.qcmp.cache;
 
 import cz.it4i.qcmp.compression.CompressionOptions;
 import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.fileformat.QuantizationType;
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.scalar.SQCodebook;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
diff --git a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
index 1847f5e75d6d6c805d335170544269dbbf91e8cc..db5d68c7693e0ff161080f3a7a65c3abca96f300 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.scalar.SQCodebook;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
index 6f062a5e13d9d234cf80a61542e8071f166c4241..e7c8cc6a1de510ec24ff238dc52967ce70f0ba44 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
similarity index 97%
rename from src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java
rename to src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
index 4538418ac61f48d576574ee40eb9ae18d55277ac..988479bd62c8ba0b706908aef238f4032634364c 100644
--- a/src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
@@ -1,9 +1,7 @@
-package cz.it4i.qcmp.fileformat.cache;
+package cz.it4i.qcmp.fileformat;
 
 import cz.it4i.qcmp.data.V2i;
 import cz.it4i.qcmp.data.V3i;
-import cz.it4i.qcmp.fileformat.IFileHeader;
-import cz.it4i.qcmp.fileformat.QuantizationType;
 import cz.it4i.qcmp.io.RawDataIO;
 import cz.it4i.qcmp.utilities.Utils;