diff --git a/source/FreeTypeGX.cpp b/source/utils/FreeTypeGX.cpp
similarity index 100%
rename from source/FreeTypeGX.cpp
rename to source/utils/FreeTypeGX.cpp
diff --git a/source/FreeTypeGX.h b/source/utils/FreeTypeGX.h
similarity index 100%
rename from source/FreeTypeGX.h
rename to source/utils/FreeTypeGX.h
diff --git a/source/Metaphrasis.cpp b/source/utils/Metaphrasis.cpp
similarity index 100%
rename from source/Metaphrasis.cpp
rename to source/utils/Metaphrasis.cpp
diff --git a/source/Metaphrasis.h b/source/utils/Metaphrasis.h
similarity index 100%
rename from source/Metaphrasis.h
rename to source/utils/Metaphrasis.h
diff --git a/source/gettext.cpp b/source/utils/gettext.cpp
similarity index 100%
rename from source/gettext.cpp
rename to source/utils/gettext.cpp
diff --git a/source/gettext.h b/source/utils/gettext.h
similarity index 100%
rename from source/gettext.h
rename to source/utils/gettext.h
diff --git a/source/http.cpp b/source/utils/http.cpp
similarity index 100%
rename from source/http.cpp
rename to source/utils/http.cpp
diff --git a/source/http.h b/source/utils/http.h
similarity index 100%
rename from source/http.h
rename to source/utils/http.h
diff --git a/source/oggplayer.c b/source/utils/oggplayer.c
similarity index 100%
rename from source/oggplayer.c
rename to source/utils/oggplayer.c
diff --git a/source/oggplayer.h b/source/utils/oggplayer.h
similarity index 100%
rename from source/oggplayer.h
rename to source/utils/oggplayer.h
diff --git a/source/pngu.c b/source/utils/pngu.c
similarity index 100%
rename from source/pngu.c
rename to source/utils/pngu.c
diff --git a/source/pngu.h b/source/utils/pngu.h
similarity index 100%
rename from source/pngu.h
rename to source/utils/pngu.h
diff --git a/source/sz/7zAlloc.c b/source/utils/sz/7zAlloc.c
similarity index 100%
rename from source/sz/7zAlloc.c
rename to source/utils/sz/7zAlloc.c
diff --git a/source/sz/7zAlloc.h b/source/utils/sz/7zAlloc.h
similarity index 100%
rename from source/sz/7zAlloc.h
rename to source/utils/sz/7zAlloc.h
diff --git a/source/sz/7zBuffer.c b/source/utils/sz/7zBuffer.c
similarity index 100%
rename from source/sz/7zBuffer.c
rename to source/utils/sz/7zBuffer.c
diff --git a/source/sz/7zBuffer.h b/source/utils/sz/7zBuffer.h
similarity index 100%
rename from source/sz/7zBuffer.h
rename to source/utils/sz/7zBuffer.h
diff --git a/source/sz/7zCrc.c b/source/utils/sz/7zCrc.c
similarity index 100%
rename from source/sz/7zCrc.c
rename to source/utils/sz/7zCrc.c
diff --git a/source/sz/7zCrc.h b/source/utils/sz/7zCrc.h
similarity index 100%
rename from source/sz/7zCrc.h
rename to source/utils/sz/7zCrc.h
diff --git a/source/sz/7zDecode.c b/source/utils/sz/7zDecode.c
similarity index 100%
rename from source/sz/7zDecode.c
rename to source/utils/sz/7zDecode.c
diff --git a/source/sz/7zDecode.h b/source/utils/sz/7zDecode.h
similarity index 100%
rename from source/sz/7zDecode.h
rename to source/utils/sz/7zDecode.h
diff --git a/source/sz/7zExtract.c b/source/utils/sz/7zExtract.c
similarity index 100%
rename from source/sz/7zExtract.c
rename to source/utils/sz/7zExtract.c
diff --git a/source/sz/7zExtract.h b/source/utils/sz/7zExtract.h
similarity index 100%
rename from source/sz/7zExtract.h
rename to source/utils/sz/7zExtract.h
diff --git a/source/sz/7zHeader.c b/source/utils/sz/7zHeader.c
similarity index 100%
rename from source/sz/7zHeader.c
rename to source/utils/sz/7zHeader.c
diff --git a/source/sz/7zHeader.h b/source/utils/sz/7zHeader.h
similarity index 100%
rename from source/sz/7zHeader.h
rename to source/utils/sz/7zHeader.h
diff --git a/source/sz/7zIn.c b/source/utils/sz/7zIn.c
similarity index 100%
rename from source/sz/7zIn.c
rename to source/utils/sz/7zIn.c
diff --git a/source/sz/7zIn.h b/source/utils/sz/7zIn.h
similarity index 100%
rename from source/sz/7zIn.h
rename to source/utils/sz/7zIn.h
diff --git a/source/sz/7zItem.c b/source/utils/sz/7zItem.c
similarity index 100%
rename from source/sz/7zItem.c
rename to source/utils/sz/7zItem.c
diff --git a/source/sz/7zItem.h b/source/utils/sz/7zItem.h
similarity index 100%
rename from source/sz/7zItem.h
rename to source/utils/sz/7zItem.h
diff --git a/source/sz/7zMethodID.c b/source/utils/sz/7zMethodID.c
similarity index 100%
rename from source/sz/7zMethodID.c
rename to source/utils/sz/7zMethodID.c
diff --git a/source/sz/7zMethodID.h b/source/utils/sz/7zMethodID.h
similarity index 100%
rename from source/sz/7zMethodID.h
rename to source/utils/sz/7zMethodID.h
diff --git a/source/sz/7zTypes.h b/source/utils/sz/7zTypes.h
similarity index 100%
rename from source/sz/7zTypes.h
rename to source/utils/sz/7zTypes.h
diff --git a/source/sz/LzmaDecode.c b/source/utils/sz/LzmaDecode.c
similarity index 100%
rename from source/sz/LzmaDecode.c
rename to source/utils/sz/LzmaDecode.c
diff --git a/source/sz/LzmaDecode.h b/source/utils/sz/LzmaDecode.h
similarity index 100%
rename from source/sz/LzmaDecode.h
rename to source/utils/sz/LzmaDecode.h
diff --git a/source/sz/LzmaTypes.h b/source/utils/sz/LzmaTypes.h
similarity index 100%
rename from source/sz/LzmaTypes.h
rename to source/utils/sz/LzmaTypes.h
diff --git a/source/unzip/crypt.h b/source/utils/unzip/crypt.h
similarity index 100%
rename from source/unzip/crypt.h
rename to source/utils/unzip/crypt.h
diff --git a/source/unzip/ioapi.c b/source/utils/unzip/ioapi.c
similarity index 100%
rename from source/unzip/ioapi.c
rename to source/utils/unzip/ioapi.c
diff --git a/source/unzip/ioapi.h b/source/utils/unzip/ioapi.h
similarity index 100%
rename from source/unzip/ioapi.h
rename to source/utils/unzip/ioapi.h
diff --git a/source/unzip/miniunz.cpp b/source/utils/unzip/miniunz.cpp
similarity index 100%
rename from source/unzip/miniunz.cpp
rename to source/utils/unzip/miniunz.cpp
diff --git a/source/unzip/miniunz.h b/source/utils/unzip/miniunz.h
similarity index 100%
rename from source/unzip/miniunz.h
rename to source/utils/unzip/miniunz.h
diff --git a/source/unzip/unzip.c b/source/utils/unzip/unzip.c
similarity index 100%
rename from source/unzip/unzip.c
rename to source/utils/unzip/unzip.c
diff --git a/source/unzip/unzip.h b/source/utils/unzip/unzip.h
similarity index 100%
rename from source/unzip/unzip.h
rename to source/utils/unzip/unzip.h