diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
index 88a441f675bde0416704c167112d945e315b9668..ac77259775965e2ece828e0e9bad9b9323586edc 100644
--- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
@@ -1,5 +1,7 @@
 package cz.it4i.qcmp.cache;
 
+import cz.it4i.qcmp.fileformat.CacheFileHeader;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
index 52c6feef8e3d5388cc564be64d80b3ac11776be2..8903a91635b239149e85168e943074b6889555ee 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
+++ b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
@@ -2,6 +2,7 @@ package cz.it4i.qcmp.cache;
 
 import cz.it4i.qcmp.compression.CompressionOptions;
 import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.fileformat.CacheFileHeader;
 import cz.it4i.qcmp.fileformat.QuantizationType;
 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 5277bbade5c378a4698370f81ccd070544b8fefc..b16e402af4038766bdec5d9e4582bf9f37c7c356 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
@@ -1,5 +1,6 @@
 package cz.it4i.qcmp.cache;
 
+import cz.it4i.qcmp.fileformat.CacheFileHeader;
 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 dce6f3e97e02f16e69565737faf0ed8a88861788..8f4414b178704df91991a96f5cec5e204dbae1bd 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
@@ -1,5 +1,6 @@
 package cz.it4i.qcmp.cache;
 
+import cz.it4i.qcmp.fileformat.CacheFileHeader;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/CacheFileHeader.java b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeader.java
similarity index 98%
rename from src/main/java/cz/it4i/qcmp/cache/CacheFileHeader.java
rename to src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeader.java
index 888c0c2d0d016ad466baab3240b587b4d33b8a1d..ef775618ab74af0657f0ba76ace2beb1c0d091c4 100644
--- a/src/main/java/cz/it4i/qcmp/cache/CacheFileHeader.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeader.java
@@ -1,8 +1,7 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.fileformat;
 
 import cz.it4i.qcmp.data.V2i;
 import cz.it4i.qcmp.data.V3i;
-import cz.it4i.qcmp.fileformat.QuantizationType;
 import cz.it4i.qcmp.utilities.Utils;
 
 import java.io.DataInputStream;