diff --git a/abstracttrack.cpp b/abstracttrack.cpp
index a735722..58f1584 100644
--- a/abstracttrack.cpp
+++ b/abstracttrack.cpp
@@ -1,10 +1,11 @@
-#include "mp4/mp4ids.h"
-#include "mpegaudio/mpegaudioframe.h"
-
 #include "abstracttrack.h"
 #include "exceptions.h"
 #include "mediaformat.h"
 
+#include "mp4/mp4ids.h"
+
+#include "mpegaudio/mpegaudioframe.h"
+
 using namespace std;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
diff --git a/adts/adtsframe.cpp b/adts/adtsframe.cpp
index d31c960..ac68ea6 100644
--- a/adts/adtsframe.cpp
+++ b/adts/adtsframe.cpp
@@ -1,5 +1,6 @@
 #include "adtsframe.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 
diff --git a/adts/adtsstream.cpp b/adts/adtsstream.cpp
index 8fc63a4..d941339 100644
--- a/adts/adtsstream.cpp
+++ b/adts/adtsstream.cpp
@@ -1,7 +1,8 @@
 #include "adtsstream.h"
 
-#include "../mp4/mp4ids.h"
-#include "../exceptions.h"
+#include "tagparser/mp4/mp4ids.h"
+
+#include "tagparser/exceptions.h"
 
 #include <string>
 
diff --git a/adts/adtsstream.h b/adts/adtsstream.h
index bc46f0a..12ff311 100644
--- a/adts/adtsstream.h
+++ b/adts/adtsstream.h
@@ -2,7 +2,8 @@
 #define MEDIA_ADTSSTREAM_H
 
 #include "adtsframe.h"
-#include "../abstracttrack.h"
+
+#include "tagparser/abstracttrack.h"
 
 namespace Media {
 
diff --git a/avc/avcinfo.h b/avc/avcinfo.h
index 0089083..f2dbb1b 100644
--- a/avc/avcinfo.h
+++ b/avc/avcinfo.h
@@ -1,8 +1,8 @@
 #ifndef AVCINFO_H
 #define AVCINFO_H
 
-#include "../margin.h"
-#include "../size.h"
+#include "tagparser/margin.h"
+#include "tagparser/size.h"
 
 namespace Media {
 
diff --git a/fieldbasedtag.h b/fieldbasedtag.h
index 56bf1df..b492325 100644
--- a/fieldbasedtag.h
+++ b/fieldbasedtag.h
@@ -6,8 +6,7 @@
 #include <map>
 #include <functional>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \class Media::FieldMapBasedTag
diff --git a/generictagfield.h b/generictagfield.h
index def1b3d..8946f64 100644
--- a/generictagfield.h
+++ b/generictagfield.h
@@ -3,8 +3,7 @@
 
 #include "tagvalue.h"
 
-namespace Media
-{
+namespace Media {
 
 template <class implementationType>
 class TagField;
diff --git a/id3/id3v1tag.cpp b/id3/id3v1tag.cpp
index a188b60..f1f7b40 100644
--- a/id3/id3v1tag.cpp
+++ b/id3/id3v1tag.cpp
@@ -1,6 +1,7 @@
 #include "id3v1tag.h"
 #include "id3genres.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/conversionexception.h>
 
diff --git a/id3/id3v1tag.h b/id3/id3v1tag.h
index 742fa70..9b49b54 100644
--- a/id3/id3v1tag.h
+++ b/id3/id3v1tag.h
@@ -1,7 +1,7 @@
 #ifndef ID3V1TAG_H
 #define ID3V1TAG_H
 
-#include "../tag.h"
+#include "tagparser/tag.h"
 
 namespace Media
 {
diff --git a/id3/id3v2frame.cpp b/id3/id3v2frame.cpp
index 2f058b8..07fa10e 100644
--- a/id3/id3v2frame.cpp
+++ b/id3/id3v2frame.cpp
@@ -1,7 +1,8 @@
 #include "id3v2frame.h"
 #include "id3genres.h"
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/misc/memory.h>
diff --git a/id3/id3v2frame.h b/id3/id3v2frame.h
index 1c1716f..befda26 100644
--- a/id3/id3v2frame.h
+++ b/id3/id3v2frame.h
@@ -2,9 +2,10 @@
 #define ID3V2FRAME_H
 
 #include "id3v2frameids.h"
-#include "../generictagfield.h"
-#include "../tagvalue.h"
-#include "../statusprovider.h"
+
+#include "tagparser/generictagfield.h"
+#include "tagparser/tagvalue.h"
+#include "tagparser/statusprovider.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/id3/id3v2frameids.cpp b/id3/id3v2frameids.cpp
index f35a1e9..51b422c 100644
--- a/id3/id3v2frameids.cpp
+++ b/id3/id3v2frameids.cpp
@@ -1,5 +1,6 @@
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 namespace Media
 {
diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp
index d6daf81..e1f612e 100644
--- a/id3/id3v2tag.cpp
+++ b/id3/id3v2tag.cpp
@@ -1,6 +1,7 @@
 #include "id3v2tag.h"
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 
diff --git a/id3/id3v2tag.h b/id3/id3v2tag.h
index fe66bde..5d191e1 100644
--- a/id3/id3v2tag.h
+++ b/id3/id3v2tag.h
@@ -3,7 +3,7 @@
 
 #include "id3v2frame.h"
 
-#include "../fieldbasedtag.h"
+#include "tagparser/fieldbasedtag.h"
 
 #include <map>
 
diff --git a/matroska/ebmlelement.cpp b/matroska/ebmlelement.cpp
index 716f45b..56b1b24 100644
--- a/matroska/ebmlelement.cpp
+++ b/matroska/ebmlelement.cpp
@@ -2,7 +2,8 @@
 #include "ebmlid.h"
 #include "matroskacontainer.h"
 #include "matroskaid.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/types.h>
 #include <c++utilities/conversion/stringconversion.h>
diff --git a/matroska/ebmlelement.h b/matroska/ebmlelement.h
index 1af8b33..fb0e8fe 100644
--- a/matroska/ebmlelement.h
+++ b/matroska/ebmlelement.h
@@ -3,8 +3,9 @@
 
 #include "ebmlid.h"
 #include "matroskaid.h"
-#include "../statusprovider.h"
-#include "../genericfileelement.h"
+
+#include "tagparser/statusprovider.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/conversion/types.h>
 
diff --git a/matroska/matroskaattachment.h b/matroska/matroskaattachment.h
index 5be2c4b..759c930 100644
--- a/matroska/matroskaattachment.h
+++ b/matroska/matroskaattachment.h
@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKAATTACHMENT_H
 #define MEDIA_MATROSKAATTACHMENT_H
 
-#include "../abstractattachment.h"
+#include "tagparser/abstractattachment.h"
 
 namespace Media {
 
diff --git a/matroska/matroskachapter.h b/matroska/matroskachapter.h
index 44e0a83..64e1cfb 100644
--- a/matroska/matroskachapter.h
+++ b/matroska/matroskachapter.h
@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKACHAPTER_H
 #define MEDIA_MATROSKACHAPTER_H
 
-#include "../abstractchapter.h"
+#include "tagparser/abstractchapter.h"
 
 #include <memory>
 
diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp
index 43641ba..c0214ca 100644
--- a/matroska/matroskacontainer.cpp
+++ b/matroska/matroskacontainer.cpp
@@ -5,9 +5,9 @@
 #include "matroskaeditionentry.h"
 #include "matroskaseekinfo.h"
 
-#include "../mediafileinfo.h"
-#include "../exceptions.h"
-#include "../backuphelper.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/misc/memory.h>
diff --git a/matroska/matroskacontainer.h b/matroska/matroskacontainer.h
index 7b187d8..3e763bf 100644
--- a/matroska/matroskacontainer.h
+++ b/matroska/matroskacontainer.h
@@ -7,7 +7,7 @@
 #include "matroskachapter.h"
 #include "matroskaattachment.h"
 
-#include "../genericcontainer.h"
+#include "tagparser/genericcontainer.h"
 
 #include <c++utilities/conversion/types.h>
 
diff --git a/matroska/matroskaseekinfo.cpp b/matroska/matroskaseekinfo.cpp
index d3f955d..d7ead8a 100644
--- a/matroska/matroskaseekinfo.cpp
+++ b/matroska/matroskaseekinfo.cpp
@@ -1,7 +1,7 @@
 #include "matroskaseekinfo.h"
 #include "matroskaid.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/binaryconversion.h>
 
diff --git a/matroska/matroskaseekinfo.h b/matroska/matroskaseekinfo.h
index 6afba7b..fbc2ef1 100644
--- a/matroska/matroskaseekinfo.h
+++ b/matroska/matroskaseekinfo.h
@@ -3,7 +3,7 @@
 
 #include "ebmlelement.h"
 
-#include "../statusprovider.h"
+#include "tagparser/statusprovider.h"
 
 #include <utility>
 
diff --git a/matroska/matroskatag.h b/matroska/matroskatag.h
index fc70282..aadc737 100644
--- a/matroska/matroskatag.h
+++ b/matroska/matroskatag.h
@@ -2,7 +2,8 @@
 #define MEDIA_MATROSKATAG_H
 
 #include "matroskatagfield.h"
-#include "../fieldbasedtag.h"
+
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media {
 
diff --git a/matroska/matroskatagfield.cpp b/matroska/matroskatagfield.cpp
index 5583d80..6208478 100644
--- a/matroska/matroskatagfield.cpp
+++ b/matroska/matroskatagfield.cpp
@@ -1,7 +1,8 @@
 #include "matroskatagfield.h"
 #include "ebmlelement.h"
 #include "matroskacontainer.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/misc/memory.h>
diff --git a/matroska/matroskatagfield.h b/matroska/matroskatagfield.h
index d406ca9..a6afbaa 100644
--- a/matroska/matroskatagfield.h
+++ b/matroska/matroskatagfield.h
@@ -1,8 +1,8 @@
 #ifndef MEDIA_MATROSKATAGFIELD_H
 #define MEDIA_MATROSKATAGFIELD_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 namespace Media {
 
diff --git a/matroska/matroskatrack.cpp b/matroska/matroskatrack.cpp
index 15c1038..d87da1c 100644
--- a/matroska/matroskatrack.cpp
+++ b/matroska/matroskatrack.cpp
@@ -3,13 +3,15 @@
 #include "matroskacontainer.h"
 #include "matroskaid.h"
 
-#include "../avi/bitmapinfoheader.h"
-#include "../wav/waveaudiostream.h"
-#include "../mp4/mp4ids.h"
-#include "../mp4/mp4track.h"
+#include "tagparser/avi/bitmapinfoheader.h"
 
-#include "../mediaformat.h"
-#include "../exceptions.h"
+#include "tagparser/wav/waveaudiostream.h"
+
+#include "tagparser/mp4/mp4ids.h"
+#include "tagparser/mp4/mp4track.h"
+
+#include "tagparser/mediaformat.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 
diff --git a/matroska/matroskatrack.h b/matroska/matroskatrack.h
index 06c9684..113bd85 100644
--- a/matroska/matroskatrack.h
+++ b/matroska/matroskatrack.h
@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKATRACK_H
 #define MEDIA_MATROSKATRACK_H
 
-#include "../abstracttrack.h"
+#include "tagparser/abstracttrack.h"
 
 namespace Media {
 
diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp
index 2adda4a..9dd813d 100644
--- a/mediafileinfo.cpp
+++ b/mediafileinfo.cpp
@@ -2,23 +2,30 @@
 #include "exceptions.h"
 #include "tag.h"
 #include "signature.h"
+#include "abstracttrack.h"
+#include "backuphelper.h"
+
 #include "id3/id3v1tag.h"
 #include "id3/id3v2tag.h"
+
 #include "wav/waveaudiostream.h"
+
 #include "mpegaudio/mpegaudioframestream.h"
+
 #include "adts/adtsstream.h"
+
 #include "mp4/mp4container.h"
 #include "mp4/mp4atom.h"
 #include "mp4/mp4tag.h"
 #include "mp4/mp4ids.h"
 #include "mp4/mp4track.h"
+
 #include "matroska/ebmlelement.h"
 #include "matroska/matroskacontainer.h"
 #include "matroska/matroskatag.h"
 #include "matroska/matroskatrack.h"
+
 #include "ogg/oggcontainer.h"
-#include "abstracttrack.h"
-#include "backuphelper.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/chrono/timespan.h>
diff --git a/mediafileinfo.h b/mediafileinfo.h
index 257f8a3..cfac652 100644
--- a/mediafileinfo.h
+++ b/mediafileinfo.h
@@ -11,8 +11,7 @@
 #include <vector>
 #include <memory>
 
-namespace Media
-{
+namespace Media {
 
 class Tag;
 class Id3v1Tag;
diff --git a/mp4/mp4atom.cpp b/mp4/mp4atom.cpp
index 4778c5b..a384ce8 100644
--- a/mp4/mp4atom.cpp
+++ b/mp4/mp4atom.cpp
@@ -3,7 +3,8 @@
 #include "mp4atom.h"
 #include "mp4ids.h"
 #include "mp4container.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/mp4/mp4atom.h b/mp4/mp4atom.h
index d3eb9b5..baadb83 100644
--- a/mp4/mp4atom.h
+++ b/mp4/mp4atom.h
@@ -3,7 +3,7 @@
 
 #include "mp4ids.h"
 
-#include "../genericfileelement.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/conversion/types.h>
 #include <c++utilities/conversion/stringconversion.h>
diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp
index 661d162..b7d0db7 100644
--- a/mp4/mp4container.cpp
+++ b/mp4/mp4container.cpp
@@ -1,8 +1,9 @@
 #include "mp4container.h"
 #include "mp4ids.h"
-#include "../exceptions.h"
-#include "../mediafileinfo.h"
-#include "../backuphelper.h"
+
+#include "tagparser/exceptions.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/mp4/mp4container.h b/mp4/mp4container.h
index 0b550ae..b34891b 100644
--- a/mp4/mp4container.h
+++ b/mp4/mp4container.h
@@ -4,7 +4,8 @@
 #include "mp4atom.h"
 #include "mp4tag.h"
 #include "mp4track.h"
-#include "../genericcontainer.h"
+
+#include "tagparser/genericcontainer.h"
 
 #include <c++utilities/conversion/types.h>
 
diff --git a/mp4/mp4ids.cpp b/mp4/mp4ids.cpp
index af44ec0..7f2165c 100644
--- a/mp4/mp4ids.cpp
+++ b/mp4/mp4ids.cpp
@@ -1,6 +1,6 @@
 #include "mp4ids.h"
 
-#include "../mediaformat.h"
+#include "tagparser/mediaformat.h"
 
 namespace Media {
 
diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp
index 9831b6f..041cbe0 100644
--- a/mp4/mp4tag.cpp
+++ b/mp4/mp4tag.cpp
@@ -2,7 +2,8 @@
 #include "mp4tag.h"
 #include "mp4ids.h"
 #include "mp4atom.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/conversion/stringconversion.h>
diff --git a/mp4/mp4tag.h b/mp4/mp4tag.h
index d432857..5974047 100644
--- a/mp4/mp4tag.h
+++ b/mp4/mp4tag.h
@@ -3,7 +3,7 @@
 
 #include "mp4tagfield.h"
 
-#include "../fieldbasedtag.h"
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media
 {
diff --git a/mp4/mp4tagfield.cpp b/mp4/mp4tagfield.cpp
index 015aa8d..9f8afc5 100644
--- a/mp4/mp4tagfield.cpp
+++ b/mp4/mp4tagfield.cpp
@@ -2,7 +2,8 @@
 #include "mp4tagfield.h"
 #include "mp4atom.h"
 #include "mp4ids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/mp4/mp4tagfield.h b/mp4/mp4tagfield.h
index b92ffde..83c18a4 100644
--- a/mp4/mp4tagfield.h
+++ b/mp4/mp4tagfield.h
@@ -1,8 +1,8 @@
 #ifndef MP4TAGATOM_H
 #define MP4TAGATOM_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 #include <vector>
 
diff --git a/mp4/mp4track.cpp b/mp4/mp4track.cpp
index 8ba56b4..a5cf4b3 100644
--- a/mp4/mp4track.cpp
+++ b/mp4/mp4track.cpp
@@ -4,11 +4,11 @@
 #include "mp4ids.h"
 #include "mpeg4descriptor.h"
 
-#include "../mpegaudio/mpegaudioframe.h"
-#include "../mpegaudio/mpegaudioframestream.h"
+#include "tagparser/mpegaudio/mpegaudioframe.h"
+#include "tagparser/mpegaudio/mpegaudioframestream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
@@ -432,6 +432,7 @@ vector<uint64> Mp4Track::readChunkSizes()
     return chunkSizes;
 }
 
+#ifdef UNDER_CONSTRUCTION
 /*!
  * \brief Reads the AVC configuration for the track.
  * \remarks
@@ -486,6 +487,7 @@ AvcConfiguration Mp4Track::parseAvcConfiguration(StatusProvider &statusProvider,
     }
     return config;
 }
+#endif
 
 /*!
  * \brief Reads the MPEG-4 elementary stream descriptor for the track.
diff --git a/mp4/mp4track.h b/mp4/mp4track.h
index a59c050..a1ef6ef 100644
--- a/mp4/mp4track.h
+++ b/mp4/mp4track.h
@@ -1,9 +1,11 @@
 #ifndef MP4TRACK_H
 #define MP4TRACK_H
 
-#include "../avc/avcconfiguration.h"
+#ifdef UNDER_CONSTRUCTION
+#include "tagparser/avc/avcconfiguration.h"
+#endif
 
-#include "../abstracttrack.h"
+#include "tagparser/abstracttrack.h"
 
 #include <vector>
 #include <memory>
@@ -133,7 +135,9 @@ public:
     const Mpeg4ElementaryStreamInfo *mpeg4ElementaryStreamInfo() const;
 
     // methods to parse configuration details from the track header
+#ifdef UNDER_CONSTRUCTION
     static AvcConfiguration parseAvcConfiguration(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, uint64 startOffset, uint64 size);
+#endif
     static std::unique_ptr<Mpeg4ElementaryStreamInfo> parseMpeg4ElementaryStreamInfo(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, Mp4Atom *esDescAtom);
     static std::unique_ptr<Mpeg4AudioSpecificConfig> parseAudioSpecificConfig(StatusProvider &statusProvider, std::istream &stream, uint64 startOffset, uint64 size);
     static std::unique_ptr<Mpeg4VideoSpecificConfig> parseVideoSpecificConfig(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, uint64 startOffset, uint64 size);
diff --git a/mp4/mpeg4descriptor.cpp b/mp4/mpeg4descriptor.cpp
index ad33bed..6090062 100644
--- a/mp4/mpeg4descriptor.cpp
+++ b/mp4/mpeg4descriptor.cpp
@@ -1,6 +1,5 @@
 #include "mpeg4descriptor.h"
 #include "mp4container.h"
-
 #include "mp4ids.h"
 
 #include <c++utilities/io/binaryreader.h>
diff --git a/mp4/mpeg4descriptor.h b/mp4/mpeg4descriptor.h
index efc2b87..d01b4c3 100644
--- a/mp4/mpeg4descriptor.h
+++ b/mp4/mpeg4descriptor.h
@@ -1,7 +1,7 @@
 #ifndef MPEG4DESCRIPTOR_H
 #define MPEG4DESCRIPTOR_H
 
-#include "../genericfileelement.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/misc/memory.h>
 
diff --git a/mpegaudio/mpegaudioframe.cpp b/mpegaudio/mpegaudioframe.cpp
index 5c20675..b9581b9 100644
--- a/mpegaudio/mpegaudioframe.cpp
+++ b/mpegaudio/mpegaudioframe.cpp
@@ -1,5 +1,6 @@
 #include "mpegaudioframe.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 
diff --git a/mpegaudio/mpegaudioframestream.cpp b/mpegaudio/mpegaudioframestream.cpp
index 09dbbd0..b759870 100644
--- a/mpegaudio/mpegaudioframestream.cpp
+++ b/mpegaudio/mpegaudioframestream.cpp
@@ -1,7 +1,7 @@
 #include "mpegaudioframestream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <sstream>
 
diff --git a/mpegaudio/mpegaudioframestream.h b/mpegaudio/mpegaudioframestream.h
index 1809f97..5c375fa 100644
--- a/mpegaudio/mpegaudioframestream.h
+++ b/mpegaudio/mpegaudioframestream.h
@@ -2,7 +2,8 @@
 #define MPEGAUDIOFRAMESTREAM_H
 
 #include "mpegaudioframe.h"
-#include "../abstracttrack.h"
+
+#include "tagparser/abstracttrack.h"
 
 #include <list>
 
diff --git a/notification.h b/notification.h
index f7bbac9..44e9d7d 100644
--- a/notification.h
+++ b/notification.h
@@ -6,8 +6,7 @@
 #include <string>
 #include <list>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the notification type.
diff --git a/ogg/oggcontainer.cpp b/ogg/oggcontainer.cpp
index d9d4235..f0cab3b 100644
--- a/ogg/oggcontainer.cpp
+++ b/ogg/oggcontainer.cpp
@@ -1,7 +1,7 @@
 #include "oggcontainer.h"
 
-#include "../mediafileinfo.h"
-#include "../backuphelper.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/io/copy.h>
 #include <c++utilities/misc/memory.h>
diff --git a/ogg/oggcontainer.h b/ogg/oggcontainer.h
index 94b98df..206f7dd 100644
--- a/ogg/oggcontainer.h
+++ b/ogg/oggcontainer.h
@@ -5,9 +5,9 @@
 #include "oggstream.h"
 #include "oggiterator.h"
 
-#include "../vorbis/vorbiscomment.h"
+#include "tagparser/vorbis/vorbiscomment.h"
 
-#include "../genericcontainer.h"
+#include "tagparser/genericcontainer.h"
 
 #include <unordered_map>
 #include <tuple>
diff --git a/ogg/oggiterator.cpp b/ogg/oggiterator.cpp
index dbe3296..6c1e59b 100644
--- a/ogg/oggiterator.cpp
+++ b/ogg/oggiterator.cpp
@@ -1,6 +1,6 @@
 #include "oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 namespace Media {
 
diff --git a/ogg/oggpage.cpp b/ogg/oggpage.cpp
index f8b1b99..6a8c3d0 100644
--- a/ogg/oggpage.cpp
+++ b/ogg/oggpage.cpp
@@ -1,6 +1,6 @@
 #include "oggpage.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/conversion/binaryconversion.h>
diff --git a/ogg/oggstream.cpp b/ogg/oggstream.cpp
index f7795bf..c2279f1 100644
--- a/ogg/oggstream.cpp
+++ b/ogg/oggstream.cpp
@@ -1,12 +1,12 @@
 #include "oggstream.h"
 #include "oggcontainer.h"
 
-#include "../vorbis/vorbispackagetypes.h"
-#include "../vorbis/vorbisidentificationheader.h"
+#include "tagparser/vorbis/vorbispackagetypes.h"
+#include "tagparser/vorbis/vorbisidentificationheader.h"
 
-#include "../mediafileinfo.h"
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/chrono/timespan.h>
 
diff --git a/ogg/oggstream.h b/ogg/oggstream.h
index dfb86eb..564fda7 100644
--- a/ogg/oggstream.h
+++ b/ogg/oggstream.h
@@ -2,7 +2,7 @@
 #define MEDIA_OGGSTREAM_H
 
 #include "oggpage.h"
-#include "../abstracttrack.h"
+#include "abstracttrack.h"
 
 namespace Media {
 
diff --git a/size.h b/size.h
index 7803f7a..27649c8 100644
--- a/size.h
+++ b/size.h
@@ -7,8 +7,7 @@
 #include <string>
 #include <sstream>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief The Size class defines the size of a two-dimensional object using integer point precision.
diff --git a/tag.h b/tag.h
index 9d3fe33..2a45dc6 100644
--- a/tag.h
+++ b/tag.h
@@ -12,8 +12,7 @@
 #include <type_traits>
 #include <string>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the tag type.
diff --git a/tagparser.pro b/tagparser.pro
index 2641ff7..1989436 100644
--- a/tagparser.pro
+++ b/tagparser.pro
@@ -13,6 +13,10 @@ TEMPLATE = lib
 CONFIG -= qt
 CONFIG += shared
 
+underconstruction {
+    DEFINES += UNDER_CONSTRUCTION
+}
+
 SOURCES += \
     abstractcontainer.cpp \
     abstracttrack.cpp \
diff --git a/tagvalue.cpp b/tagvalue.cpp
index 30001a7..0d54465 100644
--- a/tagvalue.cpp
+++ b/tagvalue.cpp
@@ -1,4 +1,5 @@
 #include "tagvalue.h"
+
 #include "id3/id3genres.h"
 
 #include <c++utilities/conversion/binaryconversion.h>
diff --git a/tagvalue.h b/tagvalue.h
index 08addc8..d16c2a3 100644
--- a/tagvalue.h
+++ b/tagvalue.h
@@ -11,8 +11,7 @@
 #include <string>
 #include <memory>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the text encoding.
diff --git a/vorbis/vorbiscomment.cpp b/vorbis/vorbiscomment.cpp
index 08448a1..db15b98 100644
--- a/vorbis/vorbiscomment.cpp
+++ b/vorbis/vorbiscomment.cpp
@@ -1,9 +1,9 @@
 #include "vorbiscomment.h"
 #include "vorbiscommentids.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/vorbis/vorbiscomment.h b/vorbis/vorbiscomment.h
index fd50463..19f631c 100644
--- a/vorbis/vorbiscomment.h
+++ b/vorbis/vorbiscomment.h
@@ -3,8 +3,8 @@
 
 #include "vorbiscommentfield.h"
 
-#include "../caseinsensitivecomparer.h"
-#include "../fieldbasedtag.h"
+#include "tagparser/caseinsensitivecomparer.h"
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media {
 
diff --git a/vorbis/vorbiscommentfield.cpp b/vorbis/vorbiscommentfield.cpp
index 622f385..f7e85bb 100644
--- a/vorbis/vorbiscommentfield.cpp
+++ b/vorbis/vorbiscommentfield.cpp
@@ -1,11 +1,11 @@
 #include "vorbiscommentfield.h"
 #include "vorbiscommentids.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../id3/id3v2frame.h"
+#include "tagparser/id3/id3v2frame.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
diff --git a/vorbis/vorbiscommentfield.h b/vorbis/vorbiscommentfield.h
index 7281480..bdcc0c6 100644
--- a/vorbis/vorbiscommentfield.h
+++ b/vorbis/vorbiscommentfield.h
@@ -1,8 +1,8 @@
 #ifndef MEDIA_VORBISCOMMENTFIELD_H
 #define MEDIA_VORBISCOMMENTFIELD_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 namespace IoUtilities {
 class BinaryReader;
diff --git a/vorbis/vorbisidentificationheader.cpp b/vorbis/vorbisidentificationheader.cpp
index d876976..36acc52 100644
--- a/vorbis/vorbisidentificationheader.cpp
+++ b/vorbis/vorbisidentificationheader.cpp
@@ -1,9 +1,9 @@
 #include "vorbisidentificationheader.h"
 #include "vorbispackagetypes.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/binaryconversion.h>
 
diff --git a/wav/waveaudiostream.cpp b/wav/waveaudiostream.cpp
index cc17c28..70aa1c2 100644
--- a/wav/waveaudiostream.cpp
+++ b/wav/waveaudiostream.cpp
@@ -1,7 +1,7 @@
 #include "waveaudiostream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/io/binaryreader.h>
 
diff --git a/wav/waveaudiostream.h b/wav/waveaudiostream.h
index ac0e01f..adb06ac 100644
--- a/wav/waveaudiostream.h
+++ b/wav/waveaudiostream.h
@@ -1,7 +1,7 @@
 #ifndef WAVEAUDIOSTREAM_H
 #define WAVEAUDIOSTREAM_H
 
-#include "../abstracttrack.h"
+#include "abstracttrack.h"
 
 #include <fstream>