diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1df2b94..e3d08f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,10 +95,10 @@ endif()
 
 add_library(aaruformat SHARED include/aaruformat/consts.h include/aaruformat/enums.h include/aaru.h include/aaruformat.h
             include/aaruformat/decls.h include/aaruformat/structs.h src/identify.c src/open.c include/aaruformat/context.h
-            src/close.c include/aaruformat/errors.h src/read.c include/aaruformat/crc64.h src/cst.c src/ecc_cd.c src/helpers.c
-            src/simd.c include/aaruformat/simd.h src/crc64/crc64.c src/crc64/crc64_clmul.c src/crc64/crc64_vmull.c
-            src/crc64/arm_vmull.c src/crc64/arm_vmull.h src/spamsum.c include/aaruformat/spamsum.h include/aaruformat/flac.h
-            src/flac.c src/lzma.c src/lru.c include/aaruformat/lru.h include/aaruformat/endian.h src/verify.c
+            src/close.c include/aaruformat/errors.h src/read.c include/aaruformat/crc64.h src/compression/cst.c src/checksum/ecc_cd.c src/helpers.c
+            src/checksum/simd.c include/aaruformat/simd.h src/crc64/crc64.c src/crc64/crc64_clmul.c src/crc64/crc64_vmull.c
+            src/crc64/arm_vmull.c src/crc64/arm_vmull.h src/checksum/spamsum.c include/aaruformat/spamsum.h include/aaruformat/flac.h
+            src/compression/flac.c src/compression/lzma.c src/lru.c include/aaruformat/lru.h include/aaruformat/endian.h src/verify.c
             include/aaruformat/structs/header.h
             include/aaruformat/structs/ddt.h
             include/aaruformat/structs/index.h
diff --git a/src/ecc_cd.c b/src/checksum/ecc_cd.c
similarity index 99%
rename from src/ecc_cd.c
rename to src/checksum/ecc_cd.c
index 03ac994..d726a1d 100644
--- a/src/ecc_cd.c
+++ b/src/checksum/ecc_cd.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
 void *aaruf_ecc_cd_init()
 {
diff --git a/src/simd.c b/src/checksum/simd.c
similarity index 99%
rename from src/simd.c
rename to src/checksum/simd.c
index 6ebd9cf..1d4c96a 100644
--- a/src/simd.c
+++ b/src/checksum/simd.c
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
 #if defined(__x86_64__) || defined(__amd64) || defined(_M_AMD64) || defined(_M_X64) || defined(__I386__) || \
     defined(__i386__) || defined(__THW_INTEL) || defined(_M_IX86)
diff --git a/src/spamsum.c b/src/checksum/spamsum.c
similarity index 99%
rename from src/spamsum.c
rename to src/checksum/spamsum.c
index db46417..d85f516 100644
--- a/src/spamsum.c
+++ b/src/checksum/spamsum.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
 #include "spamsum.h"
 
diff --git a/src/cst.c b/src/compression/cst.c
similarity index 99%
rename from src/cst.c
rename to src/compression/cst.c
index 645b3ec..2ffe886 100644
--- a/src/cst.c
+++ b/src/compression/cst.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
 int32_t aaruf_cst_transform(const uint8_t *interleaved, uint8_t *sequential, size_t length)
 {
diff --git a/src/flac.c b/src/compression/flac.c
similarity index 98%
rename from src/flac.c
rename to src/compression/flac.c
index ef40b6c..f93bd71 100644
--- a/src/flac.c
+++ b/src/compression/flac.c
@@ -20,12 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
-#include "../3rdparty/flac/include/FLAC/metadata.h"
-#include "../3rdparty/flac/include/FLAC/stream_decoder.h"
-#include "../3rdparty/flac/include/FLAC/stream_encoder.h"
 #include "flac.h"
+#include "FLAC/metadata.h"
+#include "FLAC/stream_decoder.h"
+#include "FLAC/stream_encoder.h"
 
 static FLAC__StreamDecoderReadStatus  read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[],
                                                     size_t *bytes, void *client_data);
diff --git a/src/lzma.c b/src/compression/lzma.c
similarity index 95%
rename from src/lzma.c
rename to src/compression/lzma.c
index fea43f9..6e2ab87 100644
--- a/src/lzma.c
+++ b/src/compression/lzma.c
@@ -19,9 +19,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <aaruformat.h>
+#include "aaruformat.h"
 
-#include "../3rdparty/lzma-21.03beta/C/LzmaLib.h"
+#include "../../3rdparty/lzma-21.03beta/C/LzmaLib.h"
 
 AARU_EXPORT int32_t AARU_CALL aaruf_lzma_decode_buffer(uint8_t *dst_buffer, size_t *dst_size, const uint8_t *src_buffer,
                                                        size_t *srcLen, const uint8_t *props, size_t propsSize)