diff --git a/Makefile.am b/taglib/Makefile.am
similarity index 100%
rename from Makefile.am
rename to taglib/Makefile.am
diff --git a/ape/CMakeLists.txt b/taglib/ape/CMakeLists.txt
similarity index 100%
rename from ape/CMakeLists.txt
rename to taglib/ape/CMakeLists.txt
diff --git a/ape/Makefile.am b/taglib/ape/Makefile.am
similarity index 100%
rename from ape/Makefile.am
rename to taglib/ape/Makefile.am
diff --git a/ape/ape-tag-format.txt b/taglib/ape/ape-tag-format.txt
similarity index 100%
rename from ape/ape-tag-format.txt
rename to taglib/ape/ape-tag-format.txt
diff --git a/ape/apefooter.cpp b/taglib/ape/apefooter.cpp
similarity index 100%
rename from ape/apefooter.cpp
rename to taglib/ape/apefooter.cpp
diff --git a/ape/apefooter.h b/taglib/ape/apefooter.h
similarity index 100%
rename from ape/apefooter.h
rename to taglib/ape/apefooter.h
diff --git a/ape/apeitem.cpp b/taglib/ape/apeitem.cpp
similarity index 100%
rename from ape/apeitem.cpp
rename to taglib/ape/apeitem.cpp
diff --git a/ape/apeitem.h b/taglib/ape/apeitem.h
similarity index 100%
rename from ape/apeitem.h
rename to taglib/ape/apeitem.h
diff --git a/ape/apetag.cpp b/taglib/ape/apetag.cpp
similarity index 100%
rename from ape/apetag.cpp
rename to taglib/ape/apetag.cpp
diff --git a/ape/apetag.h b/taglib/ape/apetag.h
similarity index 100%
rename from ape/apetag.h
rename to taglib/ape/apetag.h
diff --git a/audioproperties.cpp b/taglib/audioproperties.cpp
similarity index 100%
rename from audioproperties.cpp
rename to taglib/audioproperties.cpp
diff --git a/audioproperties.h b/taglib/audioproperties.h
similarity index 100%
rename from audioproperties.h
rename to taglib/audioproperties.h
diff --git a/fileref.cpp b/taglib/fileref.cpp
similarity index 100%
rename from fileref.cpp
rename to taglib/fileref.cpp
diff --git a/fileref.h b/taglib/fileref.h
similarity index 100%
rename from fileref.h
rename to taglib/fileref.h
diff --git a/flac/CMakeLists.txt b/taglib/flac/CMakeLists.txt
similarity index 100%
rename from flac/CMakeLists.txt
rename to taglib/flac/CMakeLists.txt
diff --git a/flac/Makefile.am b/taglib/flac/Makefile.am
similarity index 100%
rename from flac/Makefile.am
rename to taglib/flac/Makefile.am
diff --git a/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
similarity index 100%
rename from flac/flacfile.cpp
rename to taglib/flac/flacfile.cpp
diff --git a/flac/flacfile.h b/taglib/flac/flacfile.h
similarity index 100%
rename from flac/flacfile.h
rename to taglib/flac/flacfile.h
diff --git a/flac/flacproperties.cpp b/taglib/flac/flacproperties.cpp
similarity index 100%
rename from flac/flacproperties.cpp
rename to taglib/flac/flacproperties.cpp
diff --git a/flac/flacproperties.h b/taglib/flac/flacproperties.h
similarity index 100%
rename from flac/flacproperties.h
rename to taglib/flac/flacproperties.h
diff --git a/flac/flactag.h b/taglib/flac/flactag.h
similarity index 100%
rename from flac/flactag.h
rename to taglib/flac/flactag.h
diff --git a/mpc/CMakeLists.txt b/taglib/mpc/CMakeLists.txt
similarity index 100%
rename from mpc/CMakeLists.txt
rename to taglib/mpc/CMakeLists.txt
diff --git a/mpc/Makefile.am b/taglib/mpc/Makefile.am
similarity index 100%
rename from mpc/Makefile.am
rename to taglib/mpc/Makefile.am
diff --git a/mpc/combinedtag.h b/taglib/mpc/combinedtag.h
similarity index 100%
rename from mpc/combinedtag.h
rename to taglib/mpc/combinedtag.h
diff --git a/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp
similarity index 100%
rename from mpc/mpcfile.cpp
rename to taglib/mpc/mpcfile.cpp
diff --git a/mpc/mpcfile.h b/taglib/mpc/mpcfile.h
similarity index 100%
rename from mpc/mpcfile.h
rename to taglib/mpc/mpcfile.h
diff --git a/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp
similarity index 100%
rename from mpc/mpcproperties.cpp
rename to taglib/mpc/mpcproperties.cpp
diff --git a/mpc/mpcproperties.h b/taglib/mpc/mpcproperties.h
similarity index 100%
rename from mpc/mpcproperties.h
rename to taglib/mpc/mpcproperties.h
diff --git a/mpeg/CMakeLists.txt b/taglib/mpeg/CMakeLists.txt
similarity index 100%
rename from mpeg/CMakeLists.txt
rename to taglib/mpeg/CMakeLists.txt
diff --git a/mpeg/Makefile.am b/taglib/mpeg/Makefile.am
similarity index 100%
rename from mpeg/Makefile.am
rename to taglib/mpeg/Makefile.am
diff --git a/mpeg/id3v1/CMakeLists.txt b/taglib/mpeg/id3v1/CMakeLists.txt
similarity index 100%
rename from mpeg/id3v1/CMakeLists.txt
rename to taglib/mpeg/id3v1/CMakeLists.txt
diff --git a/mpeg/id3v1/Makefile.am b/taglib/mpeg/id3v1/Makefile.am
similarity index 100%
rename from mpeg/id3v1/Makefile.am
rename to taglib/mpeg/id3v1/Makefile.am
diff --git a/mpeg/id3v1/id3v1genres.cpp b/taglib/mpeg/id3v1/id3v1genres.cpp
similarity index 100%
rename from mpeg/id3v1/id3v1genres.cpp
rename to taglib/mpeg/id3v1/id3v1genres.cpp
diff --git a/mpeg/id3v1/id3v1genres.h b/taglib/mpeg/id3v1/id3v1genres.h
similarity index 100%
rename from mpeg/id3v1/id3v1genres.h
rename to taglib/mpeg/id3v1/id3v1genres.h
diff --git a/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp
similarity index 100%
rename from mpeg/id3v1/id3v1tag.cpp
rename to taglib/mpeg/id3v1/id3v1tag.cpp
diff --git a/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h
similarity index 100%
rename from mpeg/id3v1/id3v1tag.h
rename to taglib/mpeg/id3v1/id3v1tag.h
diff --git a/mpeg/id3v2/CMakeLists.txt b/taglib/mpeg/id3v2/CMakeLists.txt
similarity index 100%
rename from mpeg/id3v2/CMakeLists.txt
rename to taglib/mpeg/id3v2/CMakeLists.txt
diff --git a/mpeg/id3v2/Makefile.am b/taglib/mpeg/id3v2/Makefile.am
similarity index 100%
rename from mpeg/id3v2/Makefile.am
rename to taglib/mpeg/id3v2/Makefile.am
diff --git a/mpeg/id3v2/frames/CMakeLists.txt b/taglib/mpeg/id3v2/frames/CMakeLists.txt
similarity index 100%
rename from mpeg/id3v2/frames/CMakeLists.txt
rename to taglib/mpeg/id3v2/frames/CMakeLists.txt
diff --git a/mpeg/id3v2/frames/Makefile.am b/taglib/mpeg/id3v2/frames/Makefile.am
similarity index 100%
rename from mpeg/id3v2/frames/Makefile.am
rename to taglib/mpeg/id3v2/frames/Makefile.am
diff --git a/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/attachedpictureframe.cpp
rename to taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
diff --git a/mpeg/id3v2/frames/attachedpictureframe.h b/taglib/mpeg/id3v2/frames/attachedpictureframe.h
similarity index 100%
rename from mpeg/id3v2/frames/attachedpictureframe.h
rename to taglib/mpeg/id3v2/frames/attachedpictureframe.h
diff --git a/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/commentsframe.cpp
rename to taglib/mpeg/id3v2/frames/commentsframe.cpp
diff --git a/mpeg/id3v2/frames/commentsframe.h b/taglib/mpeg/id3v2/frames/commentsframe.h
similarity index 100%
rename from mpeg/id3v2/frames/commentsframe.h
rename to taglib/mpeg/id3v2/frames/commentsframe.h
diff --git a/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
rename to taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
diff --git a/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
similarity index 100%
rename from mpeg/id3v2/frames/generalencapsulatedobjectframe.h
rename to taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
diff --git a/mpeg/id3v2/frames/relativevolumeframe.cpp b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/relativevolumeframe.cpp
rename to taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
diff --git a/mpeg/id3v2/frames/relativevolumeframe.h b/taglib/mpeg/id3v2/frames/relativevolumeframe.h
similarity index 100%
rename from mpeg/id3v2/frames/relativevolumeframe.h
rename to taglib/mpeg/id3v2/frames/relativevolumeframe.h
diff --git a/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/textidentificationframe.cpp
rename to taglib/mpeg/id3v2/frames/textidentificationframe.cpp
diff --git a/mpeg/id3v2/frames/textidentificationframe.h b/taglib/mpeg/id3v2/frames/textidentificationframe.h
similarity index 100%
rename from mpeg/id3v2/frames/textidentificationframe.h
rename to taglib/mpeg/id3v2/frames/textidentificationframe.h
diff --git a/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/uniquefileidentifierframe.cpp
rename to taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
diff --git a/mpeg/id3v2/frames/uniquefileidentifierframe.h b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
similarity index 100%
rename from mpeg/id3v2/frames/uniquefileidentifierframe.h
rename to taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
diff --git a/mpeg/id3v2/frames/unknownframe.cpp b/taglib/mpeg/id3v2/frames/unknownframe.cpp
similarity index 100%
rename from mpeg/id3v2/frames/unknownframe.cpp
rename to taglib/mpeg/id3v2/frames/unknownframe.cpp
diff --git a/mpeg/id3v2/frames/unknownframe.h b/taglib/mpeg/id3v2/frames/unknownframe.h
similarity index 100%
rename from mpeg/id3v2/frames/unknownframe.h
rename to taglib/mpeg/id3v2/frames/unknownframe.h
diff --git a/mpeg/id3v2/id3v2.4.0-frames.txt b/taglib/mpeg/id3v2/id3v2.4.0-frames.txt
similarity index 100%
rename from mpeg/id3v2/id3v2.4.0-frames.txt
rename to taglib/mpeg/id3v2/id3v2.4.0-frames.txt
diff --git a/mpeg/id3v2/id3v2.4.0-structure.txt b/taglib/mpeg/id3v2/id3v2.4.0-structure.txt
similarity index 100%
rename from mpeg/id3v2/id3v2.4.0-structure.txt
rename to taglib/mpeg/id3v2/id3v2.4.0-structure.txt
diff --git a/mpeg/id3v2/id3v2extendedheader.cpp b/taglib/mpeg/id3v2/id3v2extendedheader.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2extendedheader.cpp
rename to taglib/mpeg/id3v2/id3v2extendedheader.cpp
diff --git a/mpeg/id3v2/id3v2extendedheader.h b/taglib/mpeg/id3v2/id3v2extendedheader.h
similarity index 100%
rename from mpeg/id3v2/id3v2extendedheader.h
rename to taglib/mpeg/id3v2/id3v2extendedheader.h
diff --git a/mpeg/id3v2/id3v2footer.cpp b/taglib/mpeg/id3v2/id3v2footer.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2footer.cpp
rename to taglib/mpeg/id3v2/id3v2footer.cpp
diff --git a/mpeg/id3v2/id3v2footer.h b/taglib/mpeg/id3v2/id3v2footer.h
similarity index 100%
rename from mpeg/id3v2/id3v2footer.h
rename to taglib/mpeg/id3v2/id3v2footer.h
diff --git a/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2frame.cpp
rename to taglib/mpeg/id3v2/id3v2frame.cpp
diff --git a/mpeg/id3v2/id3v2frame.h b/taglib/mpeg/id3v2/id3v2frame.h
similarity index 100%
rename from mpeg/id3v2/id3v2frame.h
rename to taglib/mpeg/id3v2/id3v2frame.h
diff --git a/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2framefactory.cpp
rename to taglib/mpeg/id3v2/id3v2framefactory.cpp
diff --git a/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
similarity index 100%
rename from mpeg/id3v2/id3v2framefactory.h
rename to taglib/mpeg/id3v2/id3v2framefactory.h
diff --git a/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2header.cpp
rename to taglib/mpeg/id3v2/id3v2header.cpp
diff --git a/mpeg/id3v2/id3v2header.h b/taglib/mpeg/id3v2/id3v2header.h
similarity index 100%
rename from mpeg/id3v2/id3v2header.h
rename to taglib/mpeg/id3v2/id3v2header.h
diff --git a/mpeg/id3v2/id3v2synchdata.cpp b/taglib/mpeg/id3v2/id3v2synchdata.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2synchdata.cpp
rename to taglib/mpeg/id3v2/id3v2synchdata.cpp
diff --git a/mpeg/id3v2/id3v2synchdata.h b/taglib/mpeg/id3v2/id3v2synchdata.h
similarity index 100%
rename from mpeg/id3v2/id3v2synchdata.h
rename to taglib/mpeg/id3v2/id3v2synchdata.h
diff --git a/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
similarity index 100%
rename from mpeg/id3v2/id3v2tag.cpp
rename to taglib/mpeg/id3v2/id3v2tag.cpp
diff --git a/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h
similarity index 100%
rename from mpeg/id3v2/id3v2tag.h
rename to taglib/mpeg/id3v2/id3v2tag.h
diff --git a/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
similarity index 100%
rename from mpeg/mpegfile.cpp
rename to taglib/mpeg/mpegfile.cpp
diff --git a/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h
similarity index 100%
rename from mpeg/mpegfile.h
rename to taglib/mpeg/mpegfile.h
diff --git a/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
similarity index 100%
rename from mpeg/mpegheader.cpp
rename to taglib/mpeg/mpegheader.cpp
diff --git a/mpeg/mpegheader.h b/taglib/mpeg/mpegheader.h
similarity index 100%
rename from mpeg/mpegheader.h
rename to taglib/mpeg/mpegheader.h
diff --git a/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
similarity index 100%
rename from mpeg/mpegproperties.cpp
rename to taglib/mpeg/mpegproperties.cpp
diff --git a/mpeg/mpegproperties.h b/taglib/mpeg/mpegproperties.h
similarity index 100%
rename from mpeg/mpegproperties.h
rename to taglib/mpeg/mpegproperties.h
diff --git a/mpeg/xingheader.cpp b/taglib/mpeg/xingheader.cpp
similarity index 100%
rename from mpeg/xingheader.cpp
rename to taglib/mpeg/xingheader.cpp
diff --git a/mpeg/xingheader.h b/taglib/mpeg/xingheader.h
similarity index 100%
rename from mpeg/xingheader.h
rename to taglib/mpeg/xingheader.h
diff --git a/ogg/CMakeLists.txt b/taglib/ogg/CMakeLists.txt
similarity index 100%
rename from ogg/CMakeLists.txt
rename to taglib/ogg/CMakeLists.txt
diff --git a/ogg/Makefile.am b/taglib/ogg/Makefile.am
similarity index 100%
rename from ogg/Makefile.am
rename to taglib/ogg/Makefile.am
diff --git a/ogg/flac/CMakeLists.txt b/taglib/ogg/flac/CMakeLists.txt
similarity index 100%
rename from ogg/flac/CMakeLists.txt
rename to taglib/ogg/flac/CMakeLists.txt
diff --git a/ogg/flac/Makefile.am b/taglib/ogg/flac/Makefile.am
similarity index 100%
rename from ogg/flac/Makefile.am
rename to taglib/ogg/flac/Makefile.am
diff --git a/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
similarity index 100%
rename from ogg/flac/oggflacfile.cpp
rename to taglib/ogg/flac/oggflacfile.cpp
diff --git a/ogg/flac/oggflacfile.h b/taglib/ogg/flac/oggflacfile.h
similarity index 100%
rename from ogg/flac/oggflacfile.h
rename to taglib/ogg/flac/oggflacfile.h
diff --git a/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp
similarity index 100%
rename from ogg/oggfile.cpp
rename to taglib/ogg/oggfile.cpp
diff --git a/ogg/oggfile.h b/taglib/ogg/oggfile.h
similarity index 100%
rename from ogg/oggfile.h
rename to taglib/ogg/oggfile.h
diff --git a/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp
similarity index 100%
rename from ogg/oggpage.cpp
rename to taglib/ogg/oggpage.cpp
diff --git a/ogg/oggpage.h b/taglib/ogg/oggpage.h
similarity index 100%
rename from ogg/oggpage.h
rename to taglib/ogg/oggpage.h
diff --git a/ogg/oggpageheader.cpp b/taglib/ogg/oggpageheader.cpp
similarity index 100%
rename from ogg/oggpageheader.cpp
rename to taglib/ogg/oggpageheader.cpp
diff --git a/ogg/oggpageheader.h b/taglib/ogg/oggpageheader.h
similarity index 100%
rename from ogg/oggpageheader.h
rename to taglib/ogg/oggpageheader.h
diff --git a/ogg/vorbis/CMakeLists.txt b/taglib/ogg/vorbis/CMakeLists.txt
similarity index 100%
rename from ogg/vorbis/CMakeLists.txt
rename to taglib/ogg/vorbis/CMakeLists.txt
diff --git a/ogg/vorbis/Makefile.am b/taglib/ogg/vorbis/Makefile.am
similarity index 100%
rename from ogg/vorbis/Makefile.am
rename to taglib/ogg/vorbis/Makefile.am
diff --git a/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp
similarity index 100%
rename from ogg/vorbis/vorbisfile.cpp
rename to taglib/ogg/vorbis/vorbisfile.cpp
diff --git a/ogg/vorbis/vorbisfile.h b/taglib/ogg/vorbis/vorbisfile.h
similarity index 100%
rename from ogg/vorbis/vorbisfile.h
rename to taglib/ogg/vorbis/vorbisfile.h
diff --git a/ogg/vorbis/vorbisproperties.cpp b/taglib/ogg/vorbis/vorbisproperties.cpp
similarity index 100%
rename from ogg/vorbis/vorbisproperties.cpp
rename to taglib/ogg/vorbis/vorbisproperties.cpp
diff --git a/ogg/vorbis/vorbisproperties.h b/taglib/ogg/vorbis/vorbisproperties.h
similarity index 100%
rename from ogg/vorbis/vorbisproperties.h
rename to taglib/ogg/vorbis/vorbisproperties.h
diff --git a/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
similarity index 100%
rename from ogg/xiphcomment.cpp
rename to taglib/ogg/xiphcomment.cpp
diff --git a/ogg/xiphcomment.h b/taglib/ogg/xiphcomment.h
similarity index 100%
rename from ogg/xiphcomment.h
rename to taglib/ogg/xiphcomment.h
diff --git a/tag.cpp b/taglib/tag.cpp
similarity index 100%
rename from tag.cpp
rename to taglib/tag.cpp
diff --git a/tag.h b/taglib/tag.h
similarity index 100%
rename from tag.h
rename to taglib/tag.h
diff --git a/toolkit/CMakeLists.txt b/taglib/toolkit/CMakeLists.txt
similarity index 100%
rename from toolkit/CMakeLists.txt
rename to taglib/toolkit/CMakeLists.txt
diff --git a/toolkit/Makefile.am b/taglib/toolkit/Makefile.am
similarity index 100%
rename from toolkit/Makefile.am
rename to taglib/toolkit/Makefile.am
diff --git a/toolkit/taglib.h b/taglib/toolkit/taglib.h
similarity index 100%
rename from toolkit/taglib.h
rename to taglib/toolkit/taglib.h
diff --git a/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
similarity index 100%
rename from toolkit/tbytevector.cpp
rename to taglib/toolkit/tbytevector.cpp
diff --git a/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h
similarity index 100%
rename from toolkit/tbytevector.h
rename to taglib/toolkit/tbytevector.h
diff --git a/toolkit/tbytevectorlist.cpp b/taglib/toolkit/tbytevectorlist.cpp
similarity index 100%
rename from toolkit/tbytevectorlist.cpp
rename to taglib/toolkit/tbytevectorlist.cpp
diff --git a/toolkit/tbytevectorlist.h b/taglib/toolkit/tbytevectorlist.h
similarity index 100%
rename from toolkit/tbytevectorlist.h
rename to taglib/toolkit/tbytevectorlist.h
diff --git a/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp
similarity index 100%
rename from toolkit/tdebug.cpp
rename to taglib/toolkit/tdebug.cpp
diff --git a/toolkit/tdebug.h b/taglib/toolkit/tdebug.h
similarity index 100%
rename from toolkit/tdebug.h
rename to taglib/toolkit/tdebug.h
diff --git a/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp
similarity index 100%
rename from toolkit/tfile.cpp
rename to taglib/toolkit/tfile.cpp
diff --git a/toolkit/tfile.h b/taglib/toolkit/tfile.h
similarity index 100%
rename from toolkit/tfile.h
rename to taglib/toolkit/tfile.h
diff --git a/toolkit/tlist.h b/taglib/toolkit/tlist.h
similarity index 100%
rename from toolkit/tlist.h
rename to taglib/toolkit/tlist.h
diff --git a/toolkit/tlist.tcc b/taglib/toolkit/tlist.tcc
similarity index 100%
rename from toolkit/tlist.tcc
rename to taglib/toolkit/tlist.tcc
diff --git a/toolkit/tmap.h b/taglib/toolkit/tmap.h
similarity index 100%
rename from toolkit/tmap.h
rename to taglib/toolkit/tmap.h
diff --git a/toolkit/tmap.tcc b/taglib/toolkit/tmap.tcc
similarity index 100%
rename from toolkit/tmap.tcc
rename to taglib/toolkit/tmap.tcc
diff --git a/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
similarity index 100%
rename from toolkit/tstring.cpp
rename to taglib/toolkit/tstring.cpp
diff --git a/toolkit/tstring.h b/taglib/toolkit/tstring.h
similarity index 100%
rename from toolkit/tstring.h
rename to taglib/toolkit/tstring.h
diff --git a/toolkit/tstringlist.cpp b/taglib/toolkit/tstringlist.cpp
similarity index 100%
rename from toolkit/tstringlist.cpp
rename to taglib/toolkit/tstringlist.cpp
diff --git a/toolkit/tstringlist.h b/taglib/toolkit/tstringlist.h
similarity index 100%
rename from toolkit/tstringlist.h
rename to taglib/toolkit/tstringlist.h
diff --git a/toolkit/unicode.cpp b/taglib/toolkit/unicode.cpp
similarity index 100%
rename from toolkit/unicode.cpp
rename to taglib/toolkit/unicode.cpp
diff --git a/toolkit/unicode.h b/taglib/toolkit/unicode.h
similarity index 100%
rename from toolkit/unicode.h
rename to taglib/toolkit/unicode.h