diff --git a/CMakeLists.txt b/CMakeLists.txt
index 329cfba..da25865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 # add project files
 set(HEADER_FILES
-    exceptions.h
-    mp4/mp4atom.h
-    mp4/mp4container.h
-    mp4/mp4ids.h
-    mp4/mp4tag.h
-    mp4/mp4tagfield.h
-    mp4/mp4track.h
-    mp4/mpeg4descriptor.h
     aac/aaccodebook.h
     aac/aacframe.h
     abstractattachment.h
@@ -25,6 +17,44 @@ set(HEADER_FILES
     backuphelper.h
     basicfileinfo.h
     caseinsensitivecomparer.h
+    diagnostics.h
+    exceptions.h
+    fieldbasedtag.h
+    flac/flacmetadata.h
+    flac/flacstream.h
+    flac/flactooggmappingheader.h
+    genericcontainer.h
+    genericfileelement.h
+    generictagfield.h
+    id3/id3genres.h
+    id3/id3v1tag.h
+    id3/id3v2frame.h
+    id3/id3v2frameids.h
+    id3/id3v2tag.h
+    localeawarestring.h
+    margin.h
+    matroska/ebmlelement.h
+    matroska/ebmlid.h
+    matroska/matroskaattachment.h
+    matroska/matroskachapter.h
+    matroska/matroskacontainer.h
+    matroska/matroskacues.h
+    matroska/matroskaeditionentry.h
+    matroska/matroskaid.h
+    matroska/matroskaseekinfo.h
+    matroska/matroskatag.h
+    matroska/matroskatagfield.h
+    matroska/matroskatagid.h
+    matroska/matroskatrack.h
+    mediafileinfo.h
+    mediaformat.h
+    mp4/mp4atom.h
+    mp4/mp4container.h
+    mp4/mp4ids.h
+    mp4/mp4tag.h
+    mp4/mp4tagfield.h
+    mp4/mp4track.h
+    mp4/mpeg4descriptor.h
     mpegaudio/mpegaudioframe.h
     mpegaudio/mpegaudioframestream.h
     ogg/oggcontainer.h
@@ -32,10 +62,8 @@ set(HEADER_FILES
     ogg/oggpage.h
     ogg/oggstream.h
     opus/opusidentificationheader.h
-    flac/flactooggmappingheader.h
-    flac/flacmetadata.h
-    flac/flacstream.h
     positioninset.h
+    progressfeedback.h
     signature.h
     size.h
     tag.h
@@ -47,43 +75,8 @@ set(HEADER_FILES
     vorbis/vorbisidentificationheader.h
     vorbis/vorbispackagetypes.h
     wav/waveaudiostream.h
-    fieldbasedtag.h
-    genericcontainer.h
-    genericfileelement.h
-    generictagfield.h
-    id3/id3genres.h
-    id3/id3v1tag.h
-    id3/id3v2frame.h
-    id3/id3v2frameids.h
-    id3/id3v2tag.h
-    localeawarestring.h
-    margin.h
-    matroska/matroskaid.h
-    matroska/ebmlelement.h
-    matroska/ebmlid.h
-    matroska/matroskaattachment.h
-    matroska/matroskachapter.h
-    matroska/matroskacontainer.h
-    matroska/matroskacues.h
-    matroska/matroskaeditionentry.h
-    matroska/matroskaseekinfo.h
-    matroska/matroskatag.h
-    matroska/matroskatagfield.h
-    matroska/matroskatagid.h
-    matroska/matroskatrack.h
-    mediafileinfo.h
-    mediaformat.h
-    diagnostics.h
-    progressfeedback.h
 )
 set(SRC_FILES
-    mp4/mp4atom.cpp
-    mp4/mp4container.cpp
-    mp4/mp4ids.cpp
-    mp4/mp4tag.cpp
-    mp4/mp4tagfield.cpp
-    mp4/mp4track.cpp
-    mp4/mpeg4descriptor.cpp
     aac/aaccodebook.cpp
     aac/aacframe.cpp
     abstractattachment.cpp
@@ -98,26 +91,11 @@ set(SRC_FILES
     avi/bitmapinfoheader.cpp
     backuphelper.cpp
     basicfileinfo.cpp
+    diagnostics.cpp
     exceptions.cpp
-    mpegaudio/mpegaudioframe.cpp
-    mpegaudio/mpegaudioframestream.cpp
-    ogg/oggcontainer.cpp
-    ogg/oggiterator.cpp
-    ogg/oggpage.cpp
-    ogg/oggstream.cpp
-    opus/opusidentificationheader.cpp
-    flac/flactooggmappingheader.cpp
     flac/flacmetadata.cpp
     flac/flacstream.cpp
-    signature.cpp
-    size.cpp
-    tag.cpp
-    tagtarget.cpp
-    tagvalue.cpp
-    vorbis/vorbiscomment.cpp
-    vorbis/vorbiscommentfield.cpp
-    vorbis/vorbisidentificationheader.cpp
-    wav/waveaudiostream.cpp
+    flac/flactooggmappingheader.cpp
     id3/id3genres.cpp
     id3/id3v1tag.cpp
     id3/id3v2frame.cpp
@@ -138,25 +116,47 @@ set(SRC_FILES
     matroska/matroskatrack.cpp
     mediafileinfo.cpp
     mediaformat.cpp
-    diagnostics.cpp
+    mp4/mp4atom.cpp
+    mp4/mp4container.cpp
+    mp4/mp4ids.cpp
+    mp4/mp4tag.cpp
+    mp4/mp4tagfield.cpp
+    mp4/mp4track.cpp
+    mp4/mpeg4descriptor.cpp
+    mpegaudio/mpegaudioframe.cpp
+    mpegaudio/mpegaudioframestream.cpp
+    ogg/oggcontainer.cpp
+    ogg/oggiterator.cpp
+    ogg/oggpage.cpp
+    ogg/oggstream.cpp
+    opus/opusidentificationheader.cpp
     progressfeedback.cpp
+    signature.cpp
+    size.cpp
+    tag.cpp
+    tagtarget.cpp
+    tagvalue.cpp
+    vorbis/vorbiscomment.cpp
+    vorbis/vorbiscommentfield.cpp
+    vorbis/vorbisidentificationheader.cpp
+    wav/waveaudiostream.cpp
 )
 set(TEST_HEADER_FILES
-    tests/overall.h
     tests/helper.h
+    tests/overall.h
 )
 set(TEST_SRC_FILES
     tests/cppunit.cpp
     tests/helper.cpp
-    tests/testfilecheck.cpp
+    tests/mediafileinfo.cpp
+    tests/overallflac.cpp
     tests/overallgeneral.cpp
     tests/overallmkv.cpp
-    tests/overallmp4.cpp
     tests/overallmp3.cpp
+    tests/overallmp4.cpp
     tests/overallogg.cpp
-    tests/overallflac.cpp
     tests/tagvalue.cpp
-    tests/mediafileinfo.cpp
+    tests/testfilecheck.cpp
     tests/utils.cpp
 )