Page Menu
Home
Phabricator (Chris)
Search
Configure Global Search
Log In
Files
F129985
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
91 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/util/argument.h b/include/argument.h
similarity index 100%
rename from util/argument.h
rename to include/argument.h
diff --git a/util/compress.h b/include/compress.h
similarity index 100%
rename from util/compress.h
rename to include/compress.h
diff --git a/util/configuration.h b/include/configuration.h
similarity index 100%
rename from util/configuration.h
rename to include/configuration.h
diff --git a/util/console.h b/include/console.h
similarity index 100%
rename from util/console.h
rename to include/console.h
diff --git a/util/debug.h b/include/debug.h
similarity index 100%
rename from util/debug.h
rename to include/debug.h
diff --git a/util/ebox.h b/include/ebox.h
similarity index 100%
rename from util/ebox.h
rename to include/ebox.h
diff --git a/util/events.h b/include/events.h
similarity index 100%
rename from util/events.h
rename to include/events.h
diff --git a/util/file-system.h b/include/file-system.h
similarity index 100%
rename from util/file-system.h
rename to include/file-system.h
diff --git a/util/font.h b/include/font.h
similarity index 100%
rename from util/font.h
rename to include/font.h
diff --git a/util/font_factory.h b/include/font_factory.h
similarity index 100%
rename from util/font_factory.h
rename to include/font_factory.h
diff --git a/util/ftalleg.h b/include/ftalleg.h
similarity index 100%
rename from util/ftalleg.h
rename to include/ftalleg.h
diff --git a/util/funcs.h b/include/funcs.h
similarity index 100%
rename from util/funcs.h
rename to include/funcs.h
diff --git a/util/init.h b/include/init.h
similarity index 100%
rename from util/init.h
rename to include/init.h
diff --git a/util/language-string.h b/include/language-string.h
similarity index 100%
rename from util/language-string.h
rename to include/language-string.h
diff --git a/util/loading.h b/include/loading.h
similarity index 100%
rename from util/loading.h
rename to include/loading.h
diff --git a/util/main.h b/include/main.h
similarity index 100%
rename from util/main.h
rename to include/main.h
diff --git a/util/memory.h b/include/memory.h
similarity index 100%
rename from util/memory.h
rename to include/memory.h
diff --git a/util/message-queue.h b/include/message-queue.h
similarity index 100%
rename from util/message-queue.h
rename to include/message-queue.h
diff --git a/util/messages.h b/include/messages.h
similarity index 100%
rename from util/messages.h
rename to include/messages.h
diff --git a/util/parameter.h b/include/parameter.h
similarity index 100%
rename from util/parameter.h
rename to include/parameter.h
diff --git a/util/pointer.h b/include/pointer.h
similarity index 100%
rename from util/pointer.h
rename to include/pointer.h
diff --git a/util/reader.h b/include/reader.h
similarity index 100%
rename from util/reader.h
rename to include/reader.h
diff --git a/util/regex.h b/include/regex.h
similarity index 100%
rename from util/regex.h
rename to include/regex.h
diff --git a/util/resource.h b/include/resource.h
similarity index 100%
rename from util/resource.h
rename to include/resource.h
diff --git a/util/scale.h b/include/scale.h
similarity index 100%
rename from util/scale.h
rename to include/scale.h
diff --git a/util/scale2x.h b/include/scale2x.h
similarity index 100%
rename from util/scale2x.h
rename to include/scale2x.h
diff --git a/util/system.h b/include/system.h
similarity index 100%
rename from util/system.h
rename to include/system.h
diff --git a/util/thread.h b/include/thread.h
similarity index 100%
rename from util/thread.h
rename to include/thread.h
diff --git a/util/timedifference.h b/include/timedifference.h
similarity index 100%
rename from util/timedifference.h
rename to include/timedifference.h
diff --git a/util/timer.h b/include/timer.h
similarity index 100%
rename from util/timer.h
rename to include/timer.h
diff --git a/util/token.h b/include/token.h
similarity index 100%
rename from util/token.h
rename to include/token.h
diff --git a/util/token_exception.h b/include/token_exception.h
similarity index 100%
rename from util/token_exception.h
rename to include/token_exception.h
diff --git a/util/tokenreader.h b/include/tokenreader.h
similarity index 100%
rename from util/tokenreader.h
rename to include/tokenreader.h
diff --git a/util/utf.h b/include/utf.h
similarity index 100%
rename from util/utf.h
rename to include/utf.h
diff --git a/util/version.h b/include/version.h
similarity index 100%
rename from util/version.h
rename to include/version.h
diff --git a/util/SConscript b/src/SConscript
similarity index 100%
rename from util/SConscript
rename to src/SConscript
diff --git a/util/argument.cpp b/src/argument.cpp
similarity index 100%
rename from util/argument.cpp
rename to src/argument.cpp
diff --git a/util/compress.cpp b/src/compress.cpp
similarity index 100%
rename from util/compress.cpp
rename to src/compress.cpp
diff --git a/util/configuration.cpp b/src/configuration.cpp
similarity index 100%
rename from util/configuration.cpp
rename to src/configuration.cpp
diff --git a/util/console.cpp b/src/console.cpp
similarity index 100%
rename from util/console.cpp
rename to src/console.cpp
diff --git a/util/debug.cpp b/src/debug.cpp
similarity index 100%
rename from util/debug.cpp
rename to src/debug.cpp
diff --git a/util/directory.cpp b/src/directory.cpp
similarity index 100%
rename from util/directory.cpp
rename to src/directory.cpp
diff --git a/util/ebox.cpp b/src/ebox.cpp
similarity index 100%
rename from util/ebox.cpp
rename to src/ebox.cpp
diff --git a/util/events.cpp b/src/events.cpp
similarity index 100%
rename from util/events.cpp
rename to src/events.cpp
diff --git a/util/file-system.cpp b/src/file-system.cpp
similarity index 100%
rename from util/file-system.cpp
rename to src/file-system.cpp
diff --git a/util/font.cpp b/src/font.cpp
similarity index 100%
rename from util/font.cpp
rename to src/font.cpp
diff --git a/util/font_factory.cpp b/src/font_factory.cpp
similarity index 100%
rename from util/font_factory.cpp
rename to src/font_factory.cpp
diff --git a/util/ftalleg.cpp b/src/ftalleg.cpp
similarity index 100%
rename from util/ftalleg.cpp
rename to src/ftalleg.cpp
diff --git a/util/funcs.cpp b/src/funcs.cpp
similarity index 100%
rename from util/funcs.cpp
rename to src/funcs.cpp
diff --git a/util/init.cpp b/src/init.cpp
similarity index 100%
rename from util/init.cpp
rename to src/init.cpp
diff --git a/util/language-string.cpp b/src/language-string.cpp
similarity index 100%
rename from util/language-string.cpp
rename to src/language-string.cpp
diff --git a/util/7z/7z.h b/src/libs/7z/7z.h
similarity index 100%
rename from util/7z/7z.h
rename to src/libs/7z/7z.h
diff --git a/util/7z/7zAlloc.c b/src/libs/7z/7zAlloc.c
similarity index 100%
rename from util/7z/7zAlloc.c
rename to src/libs/7z/7zAlloc.c
diff --git a/util/7z/7zAlloc.h b/src/libs/7z/7zAlloc.h
similarity index 100%
rename from util/7z/7zAlloc.h
rename to src/libs/7z/7zAlloc.h
diff --git a/util/7z/7zBuf.c b/src/libs/7z/7zBuf.c
similarity index 100%
rename from util/7z/7zBuf.c
rename to src/libs/7z/7zBuf.c
diff --git a/util/7z/7zBuf.h b/src/libs/7z/7zBuf.h
similarity index 100%
rename from util/7z/7zBuf.h
rename to src/libs/7z/7zBuf.h
diff --git a/util/7z/7zBuf2.c b/src/libs/7z/7zBuf2.c
similarity index 100%
rename from util/7z/7zBuf2.c
rename to src/libs/7z/7zBuf2.c
diff --git a/util/7z/7zCrc.c b/src/libs/7z/7zCrc.c
similarity index 100%
rename from util/7z/7zCrc.c
rename to src/libs/7z/7zCrc.c
diff --git a/util/7z/7zCrc.h b/src/libs/7z/7zCrc.h
similarity index 100%
rename from util/7z/7zCrc.h
rename to src/libs/7z/7zCrc.h
diff --git a/util/7z/7zCrcOpt.c b/src/libs/7z/7zCrcOpt.c
similarity index 100%
rename from util/7z/7zCrcOpt.c
rename to src/libs/7z/7zCrcOpt.c
diff --git a/util/7z/7zDec.c b/src/libs/7z/7zDec.c
similarity index 100%
rename from util/7z/7zDec.c
rename to src/libs/7z/7zDec.c
diff --git a/util/7z/7zFile.c b/src/libs/7z/7zFile.c
similarity index 100%
rename from util/7z/7zFile.c
rename to src/libs/7z/7zFile.c
diff --git a/util/7z/7zFile.h b/src/libs/7z/7zFile.h
similarity index 100%
rename from util/7z/7zFile.h
rename to src/libs/7z/7zFile.h
diff --git a/util/7z/7zIn.c b/src/libs/7z/7zIn.c
similarity index 100%
rename from util/7z/7zIn.c
rename to src/libs/7z/7zIn.c
diff --git a/util/7z/7zStream.c b/src/libs/7z/7zStream.c
similarity index 100%
rename from util/7z/7zStream.c
rename to src/libs/7z/7zStream.c
diff --git a/util/7z/7zVersion.h b/src/libs/7z/7zVersion.h
similarity index 100%
rename from util/7z/7zVersion.h
rename to src/libs/7z/7zVersion.h
diff --git a/util/7z/Alloc.c b/src/libs/7z/Alloc.c
similarity index 100%
rename from util/7z/Alloc.c
rename to src/libs/7z/Alloc.c
diff --git a/util/7z/Alloc.h b/src/libs/7z/Alloc.h
similarity index 100%
rename from util/7z/Alloc.h
rename to src/libs/7z/Alloc.h
diff --git a/util/7z/Bcj2.c b/src/libs/7z/Bcj2.c
similarity index 100%
rename from util/7z/Bcj2.c
rename to src/libs/7z/Bcj2.c
diff --git a/util/7z/Bcj2.h b/src/libs/7z/Bcj2.h
similarity index 100%
rename from util/7z/Bcj2.h
rename to src/libs/7z/Bcj2.h
diff --git a/util/7z/Bra.c b/src/libs/7z/Bra.c
similarity index 100%
rename from util/7z/Bra.c
rename to src/libs/7z/Bra.c
diff --git a/util/7z/Bra.h b/src/libs/7z/Bra.h
similarity index 100%
rename from util/7z/Bra.h
rename to src/libs/7z/Bra.h
diff --git a/util/7z/Bra86.c b/src/libs/7z/Bra86.c
similarity index 100%
rename from util/7z/Bra86.c
rename to src/libs/7z/Bra86.c
diff --git a/util/7z/BraIA64.c b/src/libs/7z/BraIA64.c
similarity index 100%
rename from util/7z/BraIA64.c
rename to src/libs/7z/BraIA64.c
diff --git a/util/7z/CMakeLists.txt b/src/libs/7z/CMakeLists.txt
similarity index 100%
rename from util/7z/CMakeLists.txt
rename to src/libs/7z/CMakeLists.txt
diff --git a/util/7z/CpuArch.c b/src/libs/7z/CpuArch.c
similarity index 100%
rename from util/7z/CpuArch.c
rename to src/libs/7z/CpuArch.c
diff --git a/util/7z/CpuArch.h b/src/libs/7z/CpuArch.h
similarity index 100%
rename from util/7z/CpuArch.h
rename to src/libs/7z/CpuArch.h
diff --git a/util/7z/Delta.c b/src/libs/7z/Delta.c
similarity index 100%
rename from util/7z/Delta.c
rename to src/libs/7z/Delta.c
diff --git a/util/7z/Delta.h b/src/libs/7z/Delta.h
similarity index 100%
rename from util/7z/Delta.h
rename to src/libs/7z/Delta.h
diff --git a/util/7z/LzFind.c b/src/libs/7z/LzFind.c
similarity index 100%
rename from util/7z/LzFind.c
rename to src/libs/7z/LzFind.c
diff --git a/util/7z/LzFind.h b/src/libs/7z/LzFind.h
similarity index 100%
rename from util/7z/LzFind.h
rename to src/libs/7z/LzFind.h
diff --git a/util/7z/LzFindMt.c b/src/libs/7z/LzFindMt.c
similarity index 100%
rename from util/7z/LzFindMt.c
rename to src/libs/7z/LzFindMt.c
diff --git a/util/7z/LzFindMt.h b/src/libs/7z/LzFindMt.h
similarity index 100%
rename from util/7z/LzFindMt.h
rename to src/libs/7z/LzFindMt.h
diff --git a/util/7z/LzHash.h b/src/libs/7z/LzHash.h
similarity index 100%
rename from util/7z/LzHash.h
rename to src/libs/7z/LzHash.h
diff --git a/util/7z/Lzma2Dec.c b/src/libs/7z/Lzma2Dec.c
similarity index 100%
rename from util/7z/Lzma2Dec.c
rename to src/libs/7z/Lzma2Dec.c
diff --git a/util/7z/Lzma2Dec.h b/src/libs/7z/Lzma2Dec.h
similarity index 100%
rename from util/7z/Lzma2Dec.h
rename to src/libs/7z/Lzma2Dec.h
diff --git a/util/7z/Lzma2Enc.c b/src/libs/7z/Lzma2Enc.c
similarity index 100%
rename from util/7z/Lzma2Enc.c
rename to src/libs/7z/Lzma2Enc.c
diff --git a/util/7z/Lzma2Enc.h b/src/libs/7z/Lzma2Enc.h
similarity index 100%
rename from util/7z/Lzma2Enc.h
rename to src/libs/7z/Lzma2Enc.h
diff --git a/util/7z/Lzma86.h b/src/libs/7z/Lzma86.h
similarity index 100%
rename from util/7z/Lzma86.h
rename to src/libs/7z/Lzma86.h
diff --git a/util/7z/Lzma86Dec.c b/src/libs/7z/Lzma86Dec.c
similarity index 100%
rename from util/7z/Lzma86Dec.c
rename to src/libs/7z/Lzma86Dec.c
diff --git a/util/7z/Lzma86Enc.c b/src/libs/7z/Lzma86Enc.c
similarity index 100%
rename from util/7z/Lzma86Enc.c
rename to src/libs/7z/Lzma86Enc.c
diff --git a/util/7z/LzmaDec.c b/src/libs/7z/LzmaDec.c
similarity index 100%
rename from util/7z/LzmaDec.c
rename to src/libs/7z/LzmaDec.c
diff --git a/util/7z/LzmaDec.h b/src/libs/7z/LzmaDec.h
similarity index 100%
rename from util/7z/LzmaDec.h
rename to src/libs/7z/LzmaDec.h
diff --git a/util/7z/LzmaEnc.c b/src/libs/7z/LzmaEnc.c
similarity index 100%
rename from util/7z/LzmaEnc.c
rename to src/libs/7z/LzmaEnc.c
diff --git a/util/7z/LzmaEnc.h b/src/libs/7z/LzmaEnc.h
similarity index 100%
rename from util/7z/LzmaEnc.h
rename to src/libs/7z/LzmaEnc.h
diff --git a/util/7z/LzmaLib.c b/src/libs/7z/LzmaLib.c
similarity index 100%
rename from util/7z/LzmaLib.c
rename to src/libs/7z/LzmaLib.c
diff --git a/util/7z/LzmaLib.h b/src/libs/7z/LzmaLib.h
similarity index 100%
rename from util/7z/LzmaLib.h
rename to src/libs/7z/LzmaLib.h
diff --git a/util/7z/MtCoder.c b/src/libs/7z/MtCoder.c
similarity index 100%
rename from util/7z/MtCoder.c
rename to src/libs/7z/MtCoder.c
diff --git a/util/7z/MtCoder.h b/src/libs/7z/MtCoder.h
similarity index 100%
rename from util/7z/MtCoder.h
rename to src/libs/7z/MtCoder.h
diff --git a/util/7z/Ppmd.h b/src/libs/7z/Ppmd.h
similarity index 100%
rename from util/7z/Ppmd.h
rename to src/libs/7z/Ppmd.h
diff --git a/util/7z/Ppmd7.c b/src/libs/7z/Ppmd7.c
similarity index 100%
rename from util/7z/Ppmd7.c
rename to src/libs/7z/Ppmd7.c
diff --git a/util/7z/Ppmd7.h b/src/libs/7z/Ppmd7.h
similarity index 100%
rename from util/7z/Ppmd7.h
rename to src/libs/7z/Ppmd7.h
diff --git a/util/7z/Ppmd7Dec.c b/src/libs/7z/Ppmd7Dec.c
similarity index 100%
rename from util/7z/Ppmd7Dec.c
rename to src/libs/7z/Ppmd7Dec.c
diff --git a/util/7z/Ppmd7Enc.c b/src/libs/7z/Ppmd7Enc.c
similarity index 100%
rename from util/7z/Ppmd7Enc.c
rename to src/libs/7z/Ppmd7Enc.c
diff --git a/util/7z/RotateDefs.h b/src/libs/7z/RotateDefs.h
similarity index 100%
rename from util/7z/RotateDefs.h
rename to src/libs/7z/RotateDefs.h
diff --git a/util/7z/SConscript b/src/libs/7z/SConscript
similarity index 100%
rename from util/7z/SConscript
rename to src/libs/7z/SConscript
diff --git a/util/7z/Sha256.c b/src/libs/7z/Sha256.c
similarity index 100%
rename from util/7z/Sha256.c
rename to src/libs/7z/Sha256.c
diff --git a/util/7z/Sha256.h b/src/libs/7z/Sha256.h
similarity index 100%
rename from util/7z/Sha256.h
rename to src/libs/7z/Sha256.h
diff --git a/util/7z/Threads.c b/src/libs/7z/Threads.c
similarity index 100%
rename from util/7z/Threads.c
rename to src/libs/7z/Threads.c
diff --git a/util/7z/Threads.h b/src/libs/7z/Threads.h
similarity index 100%
rename from util/7z/Threads.h
rename to src/libs/7z/Threads.h
diff --git a/util/7z/Types.h b/src/libs/7z/Types.h
similarity index 100%
rename from util/7z/Types.h
rename to src/libs/7z/Types.h
diff --git a/util/7z/Xz.c b/src/libs/7z/Xz.c
similarity index 100%
rename from util/7z/Xz.c
rename to src/libs/7z/Xz.c
diff --git a/util/7z/Xz.h b/src/libs/7z/Xz.h
similarity index 100%
rename from util/7z/Xz.h
rename to src/libs/7z/Xz.h
diff --git a/util/7z/XzCrc64.c b/src/libs/7z/XzCrc64.c
similarity index 100%
rename from util/7z/XzCrc64.c
rename to src/libs/7z/XzCrc64.c
diff --git a/util/7z/XzCrc64.h b/src/libs/7z/XzCrc64.h
similarity index 100%
rename from util/7z/XzCrc64.h
rename to src/libs/7z/XzCrc64.h
diff --git a/util/7z/XzDec.c b/src/libs/7z/XzDec.c
similarity index 100%
rename from util/7z/XzDec.c
rename to src/libs/7z/XzDec.c
diff --git a/util/7z/XzEnc.c b/src/libs/7z/XzEnc.c
similarity index 100%
rename from util/7z/XzEnc.c
rename to src/libs/7z/XzEnc.c
diff --git a/util/7z/XzEnc.h b/src/libs/7z/XzEnc.h
similarity index 100%
rename from util/7z/XzEnc.h
rename to src/libs/7z/XzEnc.h
diff --git a/util/7z/XzIn.c b/src/libs/7z/XzIn.c
similarity index 100%
rename from util/7z/XzIn.c
rename to src/libs/7z/XzIn.c
diff --git a/util/sound/dumb/CMakeLists.txt b/src/libs/dumb/CMakeLists.txt
similarity index 100%
rename from util/sound/dumb/CMakeLists.txt
rename to src/libs/dumb/CMakeLists.txt
diff --git a/util/sound/dumb/SConscript b/src/libs/dumb/SConscript
similarity index 100%
rename from util/sound/dumb/SConscript
rename to src/libs/dumb/SConscript
diff --git a/util/sound/dumb/include/aldumb.h b/src/libs/dumb/include/aldumb.h
similarity index 100%
rename from util/sound/dumb/include/aldumb.h
rename to src/libs/dumb/include/aldumb.h
diff --git a/util/sound/dumb/include/dumb.h b/src/libs/dumb/include/dumb.h
similarity index 100%
rename from util/sound/dumb/include/dumb.h
rename to src/libs/dumb/include/dumb.h
diff --git a/util/sound/dumb/include/internal/aldumb.h b/src/libs/dumb/include/internal/aldumb.h
similarity index 100%
rename from util/sound/dumb/include/internal/aldumb.h
rename to src/libs/dumb/include/internal/aldumb.h
diff --git a/util/sound/dumb/include/internal/dumb.h b/src/libs/dumb/include/internal/dumb.h
similarity index 100%
rename from util/sound/dumb/include/internal/dumb.h
rename to src/libs/dumb/include/internal/dumb.h
diff --git a/util/sound/dumb/include/internal/it.h b/src/libs/dumb/include/internal/it.h
similarity index 100%
rename from util/sound/dumb/include/internal/it.h
rename to src/libs/dumb/include/internal/it.h
diff --git a/util/sound/dumb/licence.txt b/src/libs/dumb/licence.txt
similarity index 100%
rename from util/sound/dumb/licence.txt
rename to src/libs/dumb/licence.txt
diff --git a/util/sound/dumb/src/allegro/alplay.c b/src/libs/dumb/src/allegro/alplay.c
similarity index 100%
rename from util/sound/dumb/src/allegro/alplay.c
rename to src/libs/dumb/src/allegro/alplay.c
diff --git a/util/sound/dumb/src/allegro/datduh.c b/src/libs/dumb/src/allegro/datduh.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datduh.c
rename to src/libs/dumb/src/allegro/datduh.c
diff --git a/util/sound/dumb/src/allegro/datit.c b/src/libs/dumb/src/allegro/datit.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datit.c
rename to src/libs/dumb/src/allegro/datit.c
diff --git a/util/sound/dumb/src/allegro/datitq.c b/src/libs/dumb/src/allegro/datitq.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datitq.c
rename to src/libs/dumb/src/allegro/datitq.c
diff --git a/util/sound/dumb/src/allegro/datmod.c b/src/libs/dumb/src/allegro/datmod.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datmod.c
rename to src/libs/dumb/src/allegro/datmod.c
diff --git a/util/sound/dumb/src/allegro/datmodq.c b/src/libs/dumb/src/allegro/datmodq.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datmodq.c
rename to src/libs/dumb/src/allegro/datmodq.c
diff --git a/util/sound/dumb/src/allegro/dats3m.c b/src/libs/dumb/src/allegro/dats3m.c
similarity index 100%
rename from util/sound/dumb/src/allegro/dats3m.c
rename to src/libs/dumb/src/allegro/dats3m.c
diff --git a/util/sound/dumb/src/allegro/dats3mq.c b/src/libs/dumb/src/allegro/dats3mq.c
similarity index 100%
rename from util/sound/dumb/src/allegro/dats3mq.c
rename to src/libs/dumb/src/allegro/dats3mq.c
diff --git a/util/sound/dumb/src/allegro/datunld.c b/src/libs/dumb/src/allegro/datunld.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datunld.c
rename to src/libs/dumb/src/allegro/datunld.c
diff --git a/util/sound/dumb/src/allegro/datxm.c b/src/libs/dumb/src/allegro/datxm.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datxm.c
rename to src/libs/dumb/src/allegro/datxm.c
diff --git a/util/sound/dumb/src/allegro/datxmq.c b/src/libs/dumb/src/allegro/datxmq.c
similarity index 100%
rename from util/sound/dumb/src/allegro/datxmq.c
rename to src/libs/dumb/src/allegro/datxmq.c
diff --git a/util/sound/dumb/src/allegro/packfile.c b/src/libs/dumb/src/allegro/packfile.c
similarity index 100%
rename from util/sound/dumb/src/allegro/packfile.c
rename to src/libs/dumb/src/allegro/packfile.c
diff --git a/util/sound/dumb/src/core/atexit.c b/src/libs/dumb/src/core/atexit.c
similarity index 100%
rename from util/sound/dumb/src/core/atexit.c
rename to src/libs/dumb/src/core/atexit.c
diff --git a/util/sound/dumb/src/core/duhlen.c b/src/libs/dumb/src/core/duhlen.c
similarity index 100%
rename from util/sound/dumb/src/core/duhlen.c
rename to src/libs/dumb/src/core/duhlen.c
diff --git a/util/sound/dumb/src/core/duhtag.c b/src/libs/dumb/src/core/duhtag.c
similarity index 100%
rename from util/sound/dumb/src/core/duhtag.c
rename to src/libs/dumb/src/core/duhtag.c
diff --git a/util/sound/dumb/src/core/dumbfile.c b/src/libs/dumb/src/core/dumbfile.c
similarity index 100%
rename from util/sound/dumb/src/core/dumbfile.c
rename to src/libs/dumb/src/core/dumbfile.c
diff --git a/util/sound/dumb/src/core/loadduh.c b/src/libs/dumb/src/core/loadduh.c
similarity index 100%
rename from util/sound/dumb/src/core/loadduh.c
rename to src/libs/dumb/src/core/loadduh.c
diff --git a/util/sound/dumb/src/core/makeduh.c b/src/libs/dumb/src/core/makeduh.c
similarity index 100%
rename from util/sound/dumb/src/core/makeduh.c
rename to src/libs/dumb/src/core/makeduh.c
diff --git a/util/sound/dumb/src/core/rawsig.c b/src/libs/dumb/src/core/rawsig.c
similarity index 100%
rename from util/sound/dumb/src/core/rawsig.c
rename to src/libs/dumb/src/core/rawsig.c
diff --git a/util/sound/dumb/src/core/readduh.c b/src/libs/dumb/src/core/readduh.c
similarity index 100%
rename from util/sound/dumb/src/core/readduh.c
rename to src/libs/dumb/src/core/readduh.c
diff --git a/util/sound/dumb/src/core/register.c b/src/libs/dumb/src/core/register.c
similarity index 100%
rename from util/sound/dumb/src/core/register.c
rename to src/libs/dumb/src/core/register.c
diff --git a/util/sound/dumb/src/core/rendduh.c b/src/libs/dumb/src/core/rendduh.c
similarity index 100%
rename from util/sound/dumb/src/core/rendduh.c
rename to src/libs/dumb/src/core/rendduh.c
diff --git a/util/sound/dumb/src/core/rendsig.c b/src/libs/dumb/src/core/rendsig.c
similarity index 100%
rename from util/sound/dumb/src/core/rendsig.c
rename to src/libs/dumb/src/core/rendsig.c
diff --git a/util/sound/dumb/src/core/unload.c b/src/libs/dumb/src/core/unload.c
similarity index 100%
rename from util/sound/dumb/src/core/unload.c
rename to src/libs/dumb/src/core/unload.c
diff --git a/util/sound/dumb/src/helpers/clickrem.c b/src/libs/dumb/src/helpers/clickrem.c
similarity index 100%
rename from util/sound/dumb/src/helpers/clickrem.c
rename to src/libs/dumb/src/helpers/clickrem.c
diff --git a/util/sound/dumb/src/helpers/memfile.c b/src/libs/dumb/src/helpers/memfile.c
similarity index 100%
rename from util/sound/dumb/src/helpers/memfile.c
rename to src/libs/dumb/src/helpers/memfile.c
diff --git a/util/sound/dumb/src/helpers/resamp2.inc b/src/libs/dumb/src/helpers/resamp2.inc
similarity index 100%
rename from util/sound/dumb/src/helpers/resamp2.inc
rename to src/libs/dumb/src/helpers/resamp2.inc
diff --git a/util/sound/dumb/src/helpers/resamp3.inc b/src/libs/dumb/src/helpers/resamp3.inc
similarity index 100%
rename from util/sound/dumb/src/helpers/resamp3.inc
rename to src/libs/dumb/src/helpers/resamp3.inc
diff --git a/util/sound/dumb/src/helpers/resample.c b/src/libs/dumb/src/helpers/resample.c
similarity index 100%
rename from util/sound/dumb/src/helpers/resample.c
rename to src/libs/dumb/src/helpers/resample.c
diff --git a/util/sound/dumb/src/helpers/resample.inc b/src/libs/dumb/src/helpers/resample.inc
similarity index 100%
rename from util/sound/dumb/src/helpers/resample.inc
rename to src/libs/dumb/src/helpers/resample.inc
diff --git a/util/sound/dumb/src/helpers/sampbuf.c b/src/libs/dumb/src/helpers/sampbuf.c
similarity index 100%
rename from util/sound/dumb/src/helpers/sampbuf.c
rename to src/libs/dumb/src/helpers/sampbuf.c
diff --git a/util/sound/dumb/src/helpers/silence.c b/src/libs/dumb/src/helpers/silence.c
similarity index 100%
rename from util/sound/dumb/src/helpers/silence.c
rename to src/libs/dumb/src/helpers/silence.c
diff --git a/util/sound/dumb/src/helpers/stdfile.c b/src/libs/dumb/src/helpers/stdfile.c
similarity index 100%
rename from util/sound/dumb/src/helpers/stdfile.c
rename to src/libs/dumb/src/helpers/stdfile.c
diff --git a/util/sound/dumb/src/it/itload.c b/src/libs/dumb/src/it/itload.c
similarity index 100%
rename from util/sound/dumb/src/it/itload.c
rename to src/libs/dumb/src/it/itload.c
diff --git a/util/sound/dumb/src/it/itload2.c b/src/libs/dumb/src/it/itload2.c
similarity index 100%
rename from util/sound/dumb/src/it/itload2.c
rename to src/libs/dumb/src/it/itload2.c
diff --git a/util/sound/dumb/src/it/itmisc.c b/src/libs/dumb/src/it/itmisc.c
similarity index 100%
rename from util/sound/dumb/src/it/itmisc.c
rename to src/libs/dumb/src/it/itmisc.c
diff --git a/util/sound/dumb/src/it/itorder.c b/src/libs/dumb/src/it/itorder.c
similarity index 100%
rename from util/sound/dumb/src/it/itorder.c
rename to src/libs/dumb/src/it/itorder.c
diff --git a/util/sound/dumb/src/it/itread.c b/src/libs/dumb/src/it/itread.c
similarity index 100%
rename from util/sound/dumb/src/it/itread.c
rename to src/libs/dumb/src/it/itread.c
diff --git a/util/sound/dumb/src/it/itread2.c b/src/libs/dumb/src/it/itread2.c
similarity index 100%
rename from util/sound/dumb/src/it/itread2.c
rename to src/libs/dumb/src/it/itread2.c
diff --git a/util/sound/dumb/src/it/itrender.c b/src/libs/dumb/src/it/itrender.c
similarity index 100%
rename from util/sound/dumb/src/it/itrender.c
rename to src/libs/dumb/src/it/itrender.c
diff --git a/util/sound/dumb/src/it/itunload.c b/src/libs/dumb/src/it/itunload.c
similarity index 100%
rename from util/sound/dumb/src/it/itunload.c
rename to src/libs/dumb/src/it/itunload.c
diff --git a/util/sound/dumb/src/it/loadmod.c b/src/libs/dumb/src/it/loadmod.c
similarity index 100%
rename from util/sound/dumb/src/it/loadmod.c
rename to src/libs/dumb/src/it/loadmod.c
diff --git a/util/sound/dumb/src/it/loadmod2.c b/src/libs/dumb/src/it/loadmod2.c
similarity index 100%
rename from util/sound/dumb/src/it/loadmod2.c
rename to src/libs/dumb/src/it/loadmod2.c
diff --git a/util/sound/dumb/src/it/loads3m.c b/src/libs/dumb/src/it/loads3m.c
similarity index 100%
rename from util/sound/dumb/src/it/loads3m.c
rename to src/libs/dumb/src/it/loads3m.c
diff --git a/util/sound/dumb/src/it/loads3m2.c b/src/libs/dumb/src/it/loads3m2.c
similarity index 100%
rename from util/sound/dumb/src/it/loads3m2.c
rename to src/libs/dumb/src/it/loads3m2.c
diff --git a/util/sound/dumb/src/it/loadxm.c b/src/libs/dumb/src/it/loadxm.c
similarity index 100%
rename from util/sound/dumb/src/it/loadxm.c
rename to src/libs/dumb/src/it/loadxm.c
diff --git a/util/sound/dumb/src/it/loadxm2.c b/src/libs/dumb/src/it/loadxm2.c
similarity index 100%
rename from util/sound/dumb/src/it/loadxm2.c
rename to src/libs/dumb/src/it/loadxm2.c
diff --git a/util/sound/dumb/src/it/readmod.c b/src/libs/dumb/src/it/readmod.c
similarity index 100%
rename from util/sound/dumb/src/it/readmod.c
rename to src/libs/dumb/src/it/readmod.c
diff --git a/util/sound/dumb/src/it/readmod2.c b/src/libs/dumb/src/it/readmod2.c
similarity index 100%
rename from util/sound/dumb/src/it/readmod2.c
rename to src/libs/dumb/src/it/readmod2.c
diff --git a/util/sound/dumb/src/it/reads3m.c b/src/libs/dumb/src/it/reads3m.c
similarity index 100%
rename from util/sound/dumb/src/it/reads3m.c
rename to src/libs/dumb/src/it/reads3m.c
diff --git a/util/sound/dumb/src/it/reads3m2.c b/src/libs/dumb/src/it/reads3m2.c
similarity index 100%
rename from util/sound/dumb/src/it/reads3m2.c
rename to src/libs/dumb/src/it/reads3m2.c
diff --git a/util/sound/dumb/src/it/readxm.c b/src/libs/dumb/src/it/readxm.c
similarity index 100%
rename from util/sound/dumb/src/it/readxm.c
rename to src/libs/dumb/src/it/readxm.c
diff --git a/util/sound/dumb/src/it/readxm2.c b/src/libs/dumb/src/it/readxm2.c
similarity index 100%
rename from util/sound/dumb/src/it/readxm2.c
rename to src/libs/dumb/src/it/readxm2.c
diff --git a/util/sound/dumb/src/it/xmeffect.c b/src/libs/dumb/src/it/xmeffect.c
similarity index 100%
rename from util/sound/dumb/src/it/xmeffect.c
rename to src/libs/dumb/src/it/xmeffect.c
diff --git a/util/sound/gme/Ay_Apu.cpp b/src/libs/gme/Ay_Apu.cpp
similarity index 100%
rename from util/sound/gme/Ay_Apu.cpp
rename to src/libs/gme/Ay_Apu.cpp
diff --git a/util/sound/gme/Ay_Apu.h b/src/libs/gme/Ay_Apu.h
similarity index 100%
rename from util/sound/gme/Ay_Apu.h
rename to src/libs/gme/Ay_Apu.h
diff --git a/util/sound/gme/Ay_Cpu.cpp b/src/libs/gme/Ay_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Ay_Cpu.cpp
rename to src/libs/gme/Ay_Cpu.cpp
diff --git a/util/sound/gme/Ay_Cpu.h b/src/libs/gme/Ay_Cpu.h
similarity index 100%
rename from util/sound/gme/Ay_Cpu.h
rename to src/libs/gme/Ay_Cpu.h
diff --git a/util/sound/gme/Ay_Emu.cpp b/src/libs/gme/Ay_Emu.cpp
similarity index 100%
rename from util/sound/gme/Ay_Emu.cpp
rename to src/libs/gme/Ay_Emu.cpp
diff --git a/util/sound/gme/Ay_Emu.h b/src/libs/gme/Ay_Emu.h
similarity index 100%
rename from util/sound/gme/Ay_Emu.h
rename to src/libs/gme/Ay_Emu.h
diff --git a/util/sound/gme/Blip_Buffer.cpp b/src/libs/gme/Blip_Buffer.cpp
similarity index 100%
rename from util/sound/gme/Blip_Buffer.cpp
rename to src/libs/gme/Blip_Buffer.cpp
diff --git a/util/sound/gme/Blip_Buffer.h b/src/libs/gme/Blip_Buffer.h
similarity index 100%
rename from util/sound/gme/Blip_Buffer.h
rename to src/libs/gme/Blip_Buffer.h
diff --git a/util/sound/gme/Classic_Emu.cpp b/src/libs/gme/Classic_Emu.cpp
similarity index 100%
rename from util/sound/gme/Classic_Emu.cpp
rename to src/libs/gme/Classic_Emu.cpp
diff --git a/util/sound/gme/Classic_Emu.h b/src/libs/gme/Classic_Emu.h
similarity index 100%
rename from util/sound/gme/Classic_Emu.h
rename to src/libs/gme/Classic_Emu.h
diff --git a/util/sound/gme/Data_Reader.cpp b/src/libs/gme/Data_Reader.cpp
similarity index 100%
rename from util/sound/gme/Data_Reader.cpp
rename to src/libs/gme/Data_Reader.cpp
diff --git a/util/sound/gme/Data_Reader.h b/src/libs/gme/Data_Reader.h
similarity index 100%
rename from util/sound/gme/Data_Reader.h
rename to src/libs/gme/Data_Reader.h
diff --git a/util/sound/gme/Dual_Resampler.cpp b/src/libs/gme/Dual_Resampler.cpp
similarity index 100%
rename from util/sound/gme/Dual_Resampler.cpp
rename to src/libs/gme/Dual_Resampler.cpp
diff --git a/util/sound/gme/Dual_Resampler.h b/src/libs/gme/Dual_Resampler.h
similarity index 100%
rename from util/sound/gme/Dual_Resampler.h
rename to src/libs/gme/Dual_Resampler.h
diff --git a/util/sound/gme/Effects_Buffer.cpp b/src/libs/gme/Effects_Buffer.cpp
similarity index 100%
rename from util/sound/gme/Effects_Buffer.cpp
rename to src/libs/gme/Effects_Buffer.cpp
diff --git a/util/sound/gme/Effects_Buffer.h b/src/libs/gme/Effects_Buffer.h
similarity index 100%
rename from util/sound/gme/Effects_Buffer.h
rename to src/libs/gme/Effects_Buffer.h
diff --git a/util/sound/gme/Fir_Resampler.cpp b/src/libs/gme/Fir_Resampler.cpp
similarity index 100%
rename from util/sound/gme/Fir_Resampler.cpp
rename to src/libs/gme/Fir_Resampler.cpp
diff --git a/util/sound/gme/Fir_Resampler.h b/src/libs/gme/Fir_Resampler.h
similarity index 100%
rename from util/sound/gme/Fir_Resampler.h
rename to src/libs/gme/Fir_Resampler.h
diff --git a/util/sound/gme/Gb_Apu.cpp b/src/libs/gme/Gb_Apu.cpp
similarity index 100%
rename from util/sound/gme/Gb_Apu.cpp
rename to src/libs/gme/Gb_Apu.cpp
diff --git a/util/sound/gme/Gb_Apu.h b/src/libs/gme/Gb_Apu.h
similarity index 100%
rename from util/sound/gme/Gb_Apu.h
rename to src/libs/gme/Gb_Apu.h
diff --git a/util/sound/gme/Gb_Cpu.cpp b/src/libs/gme/Gb_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Gb_Cpu.cpp
rename to src/libs/gme/Gb_Cpu.cpp
diff --git a/util/sound/gme/Gb_Cpu.h b/src/libs/gme/Gb_Cpu.h
similarity index 100%
rename from util/sound/gme/Gb_Cpu.h
rename to src/libs/gme/Gb_Cpu.h
diff --git a/util/sound/gme/Gb_Oscs.cpp b/src/libs/gme/Gb_Oscs.cpp
similarity index 100%
rename from util/sound/gme/Gb_Oscs.cpp
rename to src/libs/gme/Gb_Oscs.cpp
diff --git a/util/sound/gme/Gb_Oscs.h b/src/libs/gme/Gb_Oscs.h
similarity index 100%
rename from util/sound/gme/Gb_Oscs.h
rename to src/libs/gme/Gb_Oscs.h
diff --git a/util/sound/gme/Gbs_Emu.cpp b/src/libs/gme/Gbs_Emu.cpp
similarity index 100%
rename from util/sound/gme/Gbs_Emu.cpp
rename to src/libs/gme/Gbs_Emu.cpp
diff --git a/util/sound/gme/Gbs_Emu.h b/src/libs/gme/Gbs_Emu.h
similarity index 100%
rename from util/sound/gme/Gbs_Emu.h
rename to src/libs/gme/Gbs_Emu.h
diff --git a/util/sound/gme/Gme_File.cpp b/src/libs/gme/Gme_File.cpp
similarity index 100%
rename from util/sound/gme/Gme_File.cpp
rename to src/libs/gme/Gme_File.cpp
diff --git a/util/sound/gme/Gme_File.h b/src/libs/gme/Gme_File.h
similarity index 100%
rename from util/sound/gme/Gme_File.h
rename to src/libs/gme/Gme_File.h
diff --git a/util/sound/gme/Gym_Emu.cpp b/src/libs/gme/Gym_Emu.cpp
similarity index 100%
rename from util/sound/gme/Gym_Emu.cpp
rename to src/libs/gme/Gym_Emu.cpp
diff --git a/util/sound/gme/Gym_Emu.h b/src/libs/gme/Gym_Emu.h
similarity index 100%
rename from util/sound/gme/Gym_Emu.h
rename to src/libs/gme/Gym_Emu.h
diff --git a/util/sound/gme/Hes_Apu.cpp b/src/libs/gme/Hes_Apu.cpp
similarity index 100%
rename from util/sound/gme/Hes_Apu.cpp
rename to src/libs/gme/Hes_Apu.cpp
diff --git a/util/sound/gme/Hes_Apu.h b/src/libs/gme/Hes_Apu.h
similarity index 100%
rename from util/sound/gme/Hes_Apu.h
rename to src/libs/gme/Hes_Apu.h
diff --git a/util/sound/gme/Hes_Cpu.cpp b/src/libs/gme/Hes_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Hes_Cpu.cpp
rename to src/libs/gme/Hes_Cpu.cpp
diff --git a/util/sound/gme/Hes_Cpu.h b/src/libs/gme/Hes_Cpu.h
similarity index 100%
rename from util/sound/gme/Hes_Cpu.h
rename to src/libs/gme/Hes_Cpu.h
diff --git a/util/sound/gme/Hes_Emu.cpp b/src/libs/gme/Hes_Emu.cpp
similarity index 100%
rename from util/sound/gme/Hes_Emu.cpp
rename to src/libs/gme/Hes_Emu.cpp
diff --git a/util/sound/gme/Hes_Emu.h b/src/libs/gme/Hes_Emu.h
similarity index 100%
rename from util/sound/gme/Hes_Emu.h
rename to src/libs/gme/Hes_Emu.h
diff --git a/util/sound/gme/Kss_Cpu.cpp b/src/libs/gme/Kss_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Kss_Cpu.cpp
rename to src/libs/gme/Kss_Cpu.cpp
diff --git a/util/sound/gme/Kss_Cpu.h b/src/libs/gme/Kss_Cpu.h
similarity index 100%
rename from util/sound/gme/Kss_Cpu.h
rename to src/libs/gme/Kss_Cpu.h
diff --git a/util/sound/gme/Kss_Emu.cpp b/src/libs/gme/Kss_Emu.cpp
similarity index 100%
rename from util/sound/gme/Kss_Emu.cpp
rename to src/libs/gme/Kss_Emu.cpp
diff --git a/util/sound/gme/Kss_Emu.h b/src/libs/gme/Kss_Emu.h
similarity index 100%
rename from util/sound/gme/Kss_Emu.h
rename to src/libs/gme/Kss_Emu.h
diff --git a/util/sound/gme/Kss_Scc_Apu.cpp b/src/libs/gme/Kss_Scc_Apu.cpp
similarity index 100%
rename from util/sound/gme/Kss_Scc_Apu.cpp
rename to src/libs/gme/Kss_Scc_Apu.cpp
diff --git a/util/sound/gme/Kss_Scc_Apu.h b/src/libs/gme/Kss_Scc_Apu.h
similarity index 100%
rename from util/sound/gme/Kss_Scc_Apu.h
rename to src/libs/gme/Kss_Scc_Apu.h
diff --git a/util/sound/gme/M3u_Playlist.cpp b/src/libs/gme/M3u_Playlist.cpp
similarity index 100%
rename from util/sound/gme/M3u_Playlist.cpp
rename to src/libs/gme/M3u_Playlist.cpp
diff --git a/util/sound/gme/M3u_Playlist.h b/src/libs/gme/M3u_Playlist.h
similarity index 100%
rename from util/sound/gme/M3u_Playlist.h
rename to src/libs/gme/M3u_Playlist.h
diff --git a/util/sound/gme/Multi_Buffer.cpp b/src/libs/gme/Multi_Buffer.cpp
similarity index 100%
rename from util/sound/gme/Multi_Buffer.cpp
rename to src/libs/gme/Multi_Buffer.cpp
diff --git a/util/sound/gme/Multi_Buffer.h b/src/libs/gme/Multi_Buffer.h
similarity index 100%
rename from util/sound/gme/Multi_Buffer.h
rename to src/libs/gme/Multi_Buffer.h
diff --git a/util/sound/gme/Music_Emu.cpp b/src/libs/gme/Music_Emu.cpp
similarity index 100%
rename from util/sound/gme/Music_Emu.cpp
rename to src/libs/gme/Music_Emu.cpp
diff --git a/util/sound/gme/Music_Emu.h b/src/libs/gme/Music_Emu.h
similarity index 100%
rename from util/sound/gme/Music_Emu.h
rename to src/libs/gme/Music_Emu.h
diff --git a/util/sound/gme/Nes_Apu.cpp b/src/libs/gme/Nes_Apu.cpp
similarity index 100%
rename from util/sound/gme/Nes_Apu.cpp
rename to src/libs/gme/Nes_Apu.cpp
diff --git a/util/sound/gme/Nes_Apu.h b/src/libs/gme/Nes_Apu.h
similarity index 100%
rename from util/sound/gme/Nes_Apu.h
rename to src/libs/gme/Nes_Apu.h
diff --git a/util/sound/gme/Nes_Cpu.cpp b/src/libs/gme/Nes_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Nes_Cpu.cpp
rename to src/libs/gme/Nes_Cpu.cpp
diff --git a/util/sound/gme/Nes_Cpu.h b/src/libs/gme/Nes_Cpu.h
similarity index 100%
rename from util/sound/gme/Nes_Cpu.h
rename to src/libs/gme/Nes_Cpu.h
diff --git a/util/sound/gme/Nes_Fme7_Apu.cpp b/src/libs/gme/Nes_Fme7_Apu.cpp
similarity index 100%
rename from util/sound/gme/Nes_Fme7_Apu.cpp
rename to src/libs/gme/Nes_Fme7_Apu.cpp
diff --git a/util/sound/gme/Nes_Fme7_Apu.h b/src/libs/gme/Nes_Fme7_Apu.h
similarity index 100%
rename from util/sound/gme/Nes_Fme7_Apu.h
rename to src/libs/gme/Nes_Fme7_Apu.h
diff --git a/util/sound/gme/Nes_Namco_Apu.cpp b/src/libs/gme/Nes_Namco_Apu.cpp
similarity index 100%
rename from util/sound/gme/Nes_Namco_Apu.cpp
rename to src/libs/gme/Nes_Namco_Apu.cpp
diff --git a/util/sound/gme/Nes_Namco_Apu.h b/src/libs/gme/Nes_Namco_Apu.h
similarity index 100%
rename from util/sound/gme/Nes_Namco_Apu.h
rename to src/libs/gme/Nes_Namco_Apu.h
diff --git a/util/sound/gme/Nes_Oscs.cpp b/src/libs/gme/Nes_Oscs.cpp
similarity index 100%
rename from util/sound/gme/Nes_Oscs.cpp
rename to src/libs/gme/Nes_Oscs.cpp
diff --git a/util/sound/gme/Nes_Vrc6_Apu.cpp b/src/libs/gme/Nes_Vrc6_Apu.cpp
similarity index 100%
rename from util/sound/gme/Nes_Vrc6_Apu.cpp
rename to src/libs/gme/Nes_Vrc6_Apu.cpp
diff --git a/util/sound/gme/Nes_Vrc6_Apu.h b/src/libs/gme/Nes_Vrc6_Apu.h
similarity index 100%
rename from util/sound/gme/Nes_Vrc6_Apu.h
rename to src/libs/gme/Nes_Vrc6_Apu.h
diff --git a/util/sound/gme/Nsf_Emu.cpp b/src/libs/gme/Nsf_Emu.cpp
similarity index 100%
rename from util/sound/gme/Nsf_Emu.cpp
rename to src/libs/gme/Nsf_Emu.cpp
diff --git a/util/sound/gme/Nsf_Emu.h b/src/libs/gme/Nsf_Emu.h
similarity index 100%
rename from util/sound/gme/Nsf_Emu.h
rename to src/libs/gme/Nsf_Emu.h
diff --git a/util/sound/gme/Nsfe_Emu.cpp b/src/libs/gme/Nsfe_Emu.cpp
similarity index 100%
rename from util/sound/gme/Nsfe_Emu.cpp
rename to src/libs/gme/Nsfe_Emu.cpp
diff --git a/util/sound/gme/Nsfe_Emu.h b/src/libs/gme/Nsfe_Emu.h
similarity index 100%
rename from util/sound/gme/Nsfe_Emu.h
rename to src/libs/gme/Nsfe_Emu.h
diff --git a/util/sound/gme/SConscript b/src/libs/gme/SConscript
similarity index 100%
rename from util/sound/gme/SConscript
rename to src/libs/gme/SConscript
diff --git a/util/sound/gme/Sap_Apu.cpp b/src/libs/gme/Sap_Apu.cpp
similarity index 100%
rename from util/sound/gme/Sap_Apu.cpp
rename to src/libs/gme/Sap_Apu.cpp
diff --git a/util/sound/gme/Sap_Apu.h b/src/libs/gme/Sap_Apu.h
similarity index 100%
rename from util/sound/gme/Sap_Apu.h
rename to src/libs/gme/Sap_Apu.h
diff --git a/util/sound/gme/Sap_Cpu.cpp b/src/libs/gme/Sap_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Sap_Cpu.cpp
rename to src/libs/gme/Sap_Cpu.cpp
diff --git a/util/sound/gme/Sap_Cpu.h b/src/libs/gme/Sap_Cpu.h
similarity index 100%
rename from util/sound/gme/Sap_Cpu.h
rename to src/libs/gme/Sap_Cpu.h
diff --git a/util/sound/gme/Sap_Emu.cpp b/src/libs/gme/Sap_Emu.cpp
similarity index 100%
rename from util/sound/gme/Sap_Emu.cpp
rename to src/libs/gme/Sap_Emu.cpp
diff --git a/util/sound/gme/Sap_Emu.h b/src/libs/gme/Sap_Emu.h
similarity index 100%
rename from util/sound/gme/Sap_Emu.h
rename to src/libs/gme/Sap_Emu.h
diff --git a/util/sound/gme/Sms_Apu.cpp b/src/libs/gme/Sms_Apu.cpp
similarity index 100%
rename from util/sound/gme/Sms_Apu.cpp
rename to src/libs/gme/Sms_Apu.cpp
diff --git a/util/sound/gme/Sms_Apu.h b/src/libs/gme/Sms_Apu.h
similarity index 100%
rename from util/sound/gme/Sms_Apu.h
rename to src/libs/gme/Sms_Apu.h
diff --git a/util/sound/gme/Sms_Oscs.h b/src/libs/gme/Sms_Oscs.h
similarity index 100%
rename from util/sound/gme/Sms_Oscs.h
rename to src/libs/gme/Sms_Oscs.h
diff --git a/util/sound/gme/Snes_Spc.cpp b/src/libs/gme/Snes_Spc.cpp
similarity index 100%
rename from util/sound/gme/Snes_Spc.cpp
rename to src/libs/gme/Snes_Spc.cpp
diff --git a/util/sound/gme/Snes_Spc.h b/src/libs/gme/Snes_Spc.h
similarity index 100%
rename from util/sound/gme/Snes_Spc.h
rename to src/libs/gme/Snes_Spc.h
diff --git a/util/sound/gme/Spc_Cpu.cpp b/src/libs/gme/Spc_Cpu.cpp
similarity index 100%
rename from util/sound/gme/Spc_Cpu.cpp
rename to src/libs/gme/Spc_Cpu.cpp
diff --git a/util/sound/gme/Spc_Cpu.h b/src/libs/gme/Spc_Cpu.h
similarity index 100%
rename from util/sound/gme/Spc_Cpu.h
rename to src/libs/gme/Spc_Cpu.h
diff --git a/util/sound/gme/Spc_Dsp.cpp b/src/libs/gme/Spc_Dsp.cpp
similarity index 100%
rename from util/sound/gme/Spc_Dsp.cpp
rename to src/libs/gme/Spc_Dsp.cpp
diff --git a/util/sound/gme/Spc_Dsp.h b/src/libs/gme/Spc_Dsp.h
similarity index 100%
rename from util/sound/gme/Spc_Dsp.h
rename to src/libs/gme/Spc_Dsp.h
diff --git a/util/sound/gme/Spc_Emu.cpp b/src/libs/gme/Spc_Emu.cpp
similarity index 100%
rename from util/sound/gme/Spc_Emu.cpp
rename to src/libs/gme/Spc_Emu.cpp
diff --git a/util/sound/gme/Spc_Emu.h b/src/libs/gme/Spc_Emu.h
similarity index 100%
rename from util/sound/gme/Spc_Emu.h
rename to src/libs/gme/Spc_Emu.h
diff --git a/util/sound/gme/Vgm_Emu.cpp b/src/libs/gme/Vgm_Emu.cpp
similarity index 100%
rename from util/sound/gme/Vgm_Emu.cpp
rename to src/libs/gme/Vgm_Emu.cpp
diff --git a/util/sound/gme/Vgm_Emu.h b/src/libs/gme/Vgm_Emu.h
similarity index 100%
rename from util/sound/gme/Vgm_Emu.h
rename to src/libs/gme/Vgm_Emu.h
diff --git a/util/sound/gme/Vgm_Emu_Impl.cpp b/src/libs/gme/Vgm_Emu_Impl.cpp
similarity index 100%
rename from util/sound/gme/Vgm_Emu_Impl.cpp
rename to src/libs/gme/Vgm_Emu_Impl.cpp
diff --git a/util/sound/gme/Vgm_Emu_Impl.h b/src/libs/gme/Vgm_Emu_Impl.h
similarity index 100%
rename from util/sound/gme/Vgm_Emu_Impl.h
rename to src/libs/gme/Vgm_Emu_Impl.h
diff --git a/util/sound/gme/Ym2413_Emu.cpp b/src/libs/gme/Ym2413_Emu.cpp
similarity index 100%
rename from util/sound/gme/Ym2413_Emu.cpp
rename to src/libs/gme/Ym2413_Emu.cpp
diff --git a/util/sound/gme/Ym2413_Emu.h b/src/libs/gme/Ym2413_Emu.h
similarity index 100%
rename from util/sound/gme/Ym2413_Emu.h
rename to src/libs/gme/Ym2413_Emu.h
diff --git a/util/sound/gme/Ym2612_Emu.cpp b/src/libs/gme/Ym2612_Emu.cpp
similarity index 100%
rename from util/sound/gme/Ym2612_Emu.cpp
rename to src/libs/gme/Ym2612_Emu.cpp
diff --git a/util/sound/gme/Ym2612_Emu.h b/src/libs/gme/Ym2612_Emu.h
similarity index 100%
rename from util/sound/gme/Ym2612_Emu.h
rename to src/libs/gme/Ym2612_Emu.h
diff --git a/util/sound/gme/blargg_common.h b/src/libs/gme/blargg_common.h
similarity index 100%
rename from util/sound/gme/blargg_common.h
rename to src/libs/gme/blargg_common.h
diff --git a/util/sound/gme/blargg_config.h b/src/libs/gme/blargg_config.h
similarity index 100%
rename from util/sound/gme/blargg_config.h
rename to src/libs/gme/blargg_config.h
diff --git a/util/sound/gme/blargg_endian.h b/src/libs/gme/blargg_endian.h
similarity index 100%
rename from util/sound/gme/blargg_endian.h
rename to src/libs/gme/blargg_endian.h
diff --git a/util/sound/gme/blargg_source.h b/src/libs/gme/blargg_source.h
similarity index 100%
rename from util/sound/gme/blargg_source.h
rename to src/libs/gme/blargg_source.h
diff --git a/util/sound/gme/gb_cpu_io.h b/src/libs/gme/gb_cpu_io.h
similarity index 100%
rename from util/sound/gme/gb_cpu_io.h
rename to src/libs/gme/gb_cpu_io.h
diff --git a/util/sound/gme/gme.cpp b/src/libs/gme/gme.cpp
similarity index 100%
rename from util/sound/gme/gme.cpp
rename to src/libs/gme/gme.cpp
diff --git a/util/sound/gme/gme.h b/src/libs/gme/gme.h
similarity index 100%
rename from util/sound/gme/gme.h
rename to src/libs/gme/gme.h
diff --git a/util/sound/gme/gme.txt b/src/libs/gme/gme.txt
similarity index 100%
rename from util/sound/gme/gme.txt
rename to src/libs/gme/gme.txt
diff --git a/util/sound/gme/gme_types.h b/src/libs/gme/gme_types.h
similarity index 100%
rename from util/sound/gme/gme_types.h
rename to src/libs/gme/gme_types.h
diff --git a/util/sound/gme/hes_cpu_io.h b/src/libs/gme/hes_cpu_io.h
similarity index 100%
rename from util/sound/gme/hes_cpu_io.h
rename to src/libs/gme/hes_cpu_io.h
diff --git a/util/sound/gme/license.txt b/src/libs/gme/license.txt
similarity index 100%
rename from util/sound/gme/license.txt
rename to src/libs/gme/license.txt
diff --git a/util/sound/gme/nes_cpu_io.h b/src/libs/gme/nes_cpu_io.h
similarity index 100%
rename from util/sound/gme/nes_cpu_io.h
rename to src/libs/gme/nes_cpu_io.h
diff --git a/util/sound/gme/readme.txt b/src/libs/gme/readme.txt
similarity index 100%
rename from util/sound/gme/readme.txt
rename to src/libs/gme/readme.txt
diff --git a/util/sound/gme/sap_cpu_io.h b/src/libs/gme/sap_cpu_io.h
similarity index 100%
rename from util/sound/gme/sap_cpu_io.h
rename to src/libs/gme/sap_cpu_io.h
diff --git a/util/network/hawknl/CMakeLists.txt b/src/libs/hawknl/CMakeLists.txt
similarity index 100%
rename from util/network/hawknl/CMakeLists.txt
rename to src/libs/hawknl/CMakeLists.txt
diff --git a/util/network/hawknl/SConscript b/src/libs/hawknl/SConscript
similarity index 100%
rename from util/network/hawknl/SConscript
rename to src/libs/hawknl/SConscript
diff --git a/util/network/hawknl/hawknl/group.h b/src/libs/hawknl/hawknl/group.h
similarity index 100%
rename from util/network/hawknl/hawknl/group.h
rename to src/libs/hawknl/hawknl/group.h
diff --git a/util/network/hawknl/hawknl/hawklib.h b/src/libs/hawknl/hawknl/hawklib.h
similarity index 100%
rename from util/network/hawknl/hawknl/hawklib.h
rename to src/libs/hawknl/hawknl/hawklib.h
diff --git a/util/network/hawknl/hawknl/hawkthreads.h b/src/libs/hawknl/hawknl/hawkthreads.h
similarity index 100%
rename from util/network/hawknl/hawknl/hawkthreads.h
rename to src/libs/hawknl/hawknl/hawkthreads.h
diff --git a/util/network/hawknl/hawknl/htinternal.h b/src/libs/hawknl/hawknl/htinternal.h
similarity index 100%
rename from util/network/hawknl/hawknl/htinternal.h
rename to src/libs/hawknl/hawknl/htinternal.h
diff --git a/util/network/hawknl/hawknl/ipx.h b/src/libs/hawknl/hawknl/ipx.h
similarity index 100%
rename from util/network/hawknl/hawknl/ipx.h
rename to src/libs/hawknl/hawknl/ipx.h
diff --git a/util/network/hawknl/hawknl/loopback.h b/src/libs/hawknl/hawknl/loopback.h
similarity index 100%
rename from util/network/hawknl/hawknl/loopback.h
rename to src/libs/hawknl/hawknl/loopback.h
diff --git a/util/network/hawknl/hawknl/nl.h b/src/libs/hawknl/hawknl/nl.h
similarity index 100%
rename from util/network/hawknl/hawknl/nl.h
rename to src/libs/hawknl/hawknl/nl.h
diff --git a/util/network/hawknl/hawknl/nlinternal.h b/src/libs/hawknl/hawknl/nlinternal.h
similarity index 100%
rename from util/network/hawknl/hawknl/nlinternal.h
rename to src/libs/hawknl/hawknl/nlinternal.h
diff --git a/util/network/hawknl/hawknl/parallel.h b/src/libs/hawknl/hawknl/parallel.h
similarity index 100%
rename from util/network/hawknl/hawknl/parallel.h
rename to src/libs/hawknl/hawknl/parallel.h
diff --git a/util/network/hawknl/hawknl/serial.h b/src/libs/hawknl/hawknl/serial.h
similarity index 100%
rename from util/network/hawknl/hawknl/serial.h
rename to src/libs/hawknl/hawknl/serial.h
diff --git a/util/network/hawknl/hawknl/sock.h b/src/libs/hawknl/hawknl/sock.h
similarity index 100%
rename from util/network/hawknl/hawknl/sock.h
rename to src/libs/hawknl/hawknl/sock.h
diff --git a/util/network/hawknl/hawknl/wsock.h b/src/libs/hawknl/hawknl/wsock.h
similarity index 100%
rename from util/network/hawknl/hawknl/wsock.h
rename to src/libs/hawknl/hawknl/wsock.h
diff --git a/util/network/hawknl/src/crc.cpp b/src/libs/hawknl/src/crc.cpp
similarity index 100%
rename from util/network/hawknl/src/crc.cpp
rename to src/libs/hawknl/src/crc.cpp
diff --git a/util/network/hawknl/src/err.cpp b/src/libs/hawknl/src/err.cpp
similarity index 100%
rename from util/network/hawknl/src/err.cpp
rename to src/libs/hawknl/src/err.cpp
diff --git a/util/network/hawknl/src/errorstr.cpp b/src/libs/hawknl/src/errorstr.cpp
similarity index 100%
rename from util/network/hawknl/src/errorstr.cpp
rename to src/libs/hawknl/src/errorstr.cpp
diff --git a/util/network/hawknl/src/group.cpp b/src/libs/hawknl/src/group.cpp
similarity index 100%
rename from util/network/hawknl/src/group.cpp
rename to src/libs/hawknl/src/group.cpp
diff --git a/util/network/hawknl/src/htcondition.cpp b/src/libs/hawknl/src/htcondition.cpp
similarity index 100%
rename from util/network/hawknl/src/htcondition.cpp
rename to src/libs/hawknl/src/htcondition.cpp
diff --git a/util/network/hawknl/src/hthread.cpp b/src/libs/hawknl/src/hthread.cpp
similarity index 100%
rename from util/network/hawknl/src/hthread.cpp
rename to src/libs/hawknl/src/hthread.cpp
diff --git a/util/network/hawknl/src/htmutex.cpp b/src/libs/hawknl/src/htmutex.cpp
similarity index 100%
rename from util/network/hawknl/src/htmutex.cpp
rename to src/libs/hawknl/src/htmutex.cpp
diff --git a/util/network/hawknl/src/ipx.cpp b/src/libs/hawknl/src/ipx.cpp
similarity index 100%
rename from util/network/hawknl/src/ipx.cpp
rename to src/libs/hawknl/src/ipx.cpp
diff --git a/util/network/hawknl/src/loopback.cpp b/src/libs/hawknl/src/loopback.cpp
similarity index 100%
rename from util/network/hawknl/src/loopback.cpp
rename to src/libs/hawknl/src/loopback.cpp
diff --git a/util/network/hawknl/src/nl.cpp b/src/libs/hawknl/src/nl.cpp
similarity index 100%
rename from util/network/hawknl/src/nl.cpp
rename to src/libs/hawknl/src/nl.cpp
diff --git a/util/network/hawknl/src/nltime.cpp b/src/libs/hawknl/src/nltime.cpp
similarity index 100%
rename from util/network/hawknl/src/nltime.cpp
rename to src/libs/hawknl/src/nltime.cpp
diff --git a/util/network/hawknl/src/sock.cpp b/src/libs/hawknl/src/sock.cpp
similarity index 100%
rename from util/network/hawknl/src/sock.cpp
rename to src/libs/hawknl/src/sock.cpp
diff --git a/util/lz4/lz4.c b/src/libs/lz4/lz4.c
similarity index 100%
rename from util/lz4/lz4.c
rename to src/libs/lz4/lz4.c
diff --git a/util/lz4/lz4.h b/src/libs/lz4/lz4.h
similarity index 100%
rename from util/lz4/lz4.h
rename to src/libs/lz4/lz4.h
diff --git a/util/pcre/SConstruct b/src/libs/pcre/SConstruct
similarity index 100%
rename from util/pcre/SConstruct
rename to src/libs/pcre/SConstruct
diff --git a/util/pcre/config.h b/src/libs/pcre/config.h
similarity index 100%
rename from util/pcre/config.h
rename to src/libs/pcre/config.h
diff --git a/util/pcre/dftables.c b/src/libs/pcre/dftables.c
similarity index 100%
rename from util/pcre/dftables.c
rename to src/libs/pcre/dftables.c
diff --git a/util/pcre/pcre.h b/src/libs/pcre/pcre.h
similarity index 100%
rename from util/pcre/pcre.h
rename to src/libs/pcre/pcre.h
diff --git a/util/pcre/pcre_chartables.c b/src/libs/pcre/pcre_chartables.c
similarity index 100%
rename from util/pcre/pcre_chartables.c
rename to src/libs/pcre/pcre_chartables.c
diff --git a/util/pcre/pcre_compile.c b/src/libs/pcre/pcre_compile.c
similarity index 100%
rename from util/pcre/pcre_compile.c
rename to src/libs/pcre/pcre_compile.c
diff --git a/util/pcre/pcre_config.c b/src/libs/pcre/pcre_config.c
similarity index 100%
rename from util/pcre/pcre_config.c
rename to src/libs/pcre/pcre_config.c
diff --git a/util/pcre/pcre_dfa_exec.c b/src/libs/pcre/pcre_dfa_exec.c
similarity index 100%
rename from util/pcre/pcre_dfa_exec.c
rename to src/libs/pcre/pcre_dfa_exec.c
diff --git a/util/pcre/pcre_exec.c b/src/libs/pcre/pcre_exec.c
similarity index 100%
rename from util/pcre/pcre_exec.c
rename to src/libs/pcre/pcre_exec.c
diff --git a/util/pcre/pcre_fullinfo.c b/src/libs/pcre/pcre_fullinfo.c
similarity index 100%
rename from util/pcre/pcre_fullinfo.c
rename to src/libs/pcre/pcre_fullinfo.c
diff --git a/util/pcre/pcre_get.c b/src/libs/pcre/pcre_get.c
similarity index 100%
rename from util/pcre/pcre_get.c
rename to src/libs/pcre/pcre_get.c
diff --git a/util/pcre/pcre_globals.c b/src/libs/pcre/pcre_globals.c
similarity index 100%
rename from util/pcre/pcre_globals.c
rename to src/libs/pcre/pcre_globals.c
diff --git a/util/pcre/pcre_info.c b/src/libs/pcre/pcre_info.c
similarity index 100%
rename from util/pcre/pcre_info.c
rename to src/libs/pcre/pcre_info.c
diff --git a/util/pcre/pcre_internal.h b/src/libs/pcre/pcre_internal.h
similarity index 100%
rename from util/pcre/pcre_internal.h
rename to src/libs/pcre/pcre_internal.h
diff --git a/util/pcre/pcre_maketables.c b/src/libs/pcre/pcre_maketables.c
similarity index 100%
rename from util/pcre/pcre_maketables.c
rename to src/libs/pcre/pcre_maketables.c
diff --git a/util/pcre/pcre_newline.c b/src/libs/pcre/pcre_newline.c
similarity index 100%
rename from util/pcre/pcre_newline.c
rename to src/libs/pcre/pcre_newline.c
diff --git a/util/pcre/pcre_ord2utf8.c b/src/libs/pcre/pcre_ord2utf8.c
similarity index 100%
rename from util/pcre/pcre_ord2utf8.c
rename to src/libs/pcre/pcre_ord2utf8.c
diff --git a/util/pcre/pcre_refcount.c b/src/libs/pcre/pcre_refcount.c
similarity index 100%
rename from util/pcre/pcre_refcount.c
rename to src/libs/pcre/pcre_refcount.c
diff --git a/util/pcre/pcre_scanner.h b/src/libs/pcre/pcre_scanner.h
similarity index 100%
rename from util/pcre/pcre_scanner.h
rename to src/libs/pcre/pcre_scanner.h
diff --git a/util/pcre/pcre_stringpiece.h b/src/libs/pcre/pcre_stringpiece.h
similarity index 100%
rename from util/pcre/pcre_stringpiece.h
rename to src/libs/pcre/pcre_stringpiece.h
diff --git a/util/pcre/pcre_study.c b/src/libs/pcre/pcre_study.c
similarity index 100%
rename from util/pcre/pcre_study.c
rename to src/libs/pcre/pcre_study.c
diff --git a/util/pcre/pcre_tables.c b/src/libs/pcre/pcre_tables.c
similarity index 100%
rename from util/pcre/pcre_tables.c
rename to src/libs/pcre/pcre_tables.c
diff --git a/util/pcre/pcre_try_flipped.c b/src/libs/pcre/pcre_try_flipped.c
similarity index 100%
rename from util/pcre/pcre_try_flipped.c
rename to src/libs/pcre/pcre_try_flipped.c
diff --git a/util/pcre/pcre_ucd.c b/src/libs/pcre/pcre_ucd.c
similarity index 100%
rename from util/pcre/pcre_ucd.c
rename to src/libs/pcre/pcre_ucd.c
diff --git a/util/pcre/pcre_valid_utf8.c b/src/libs/pcre/pcre_valid_utf8.c
similarity index 100%
rename from util/pcre/pcre_valid_utf8.c
rename to src/libs/pcre/pcre_valid_utf8.c
diff --git a/util/pcre/pcre_version.c b/src/libs/pcre/pcre_version.c
similarity index 100%
rename from util/pcre/pcre_version.c
rename to src/libs/pcre/pcre_version.c
diff --git a/util/pcre/pcre_xclass.c b/src/libs/pcre/pcre_xclass.c
similarity index 100%
rename from util/pcre/pcre_xclass.c
rename to src/libs/pcre/pcre_xclass.c
diff --git a/util/pcre/pcrecpp.h b/src/libs/pcre/pcrecpp.h
similarity index 100%
rename from util/pcre/pcrecpp.h
rename to src/libs/pcre/pcrecpp.h
diff --git a/util/pcre/pcrecpp_internal.h b/src/libs/pcre/pcrecpp_internal.h
similarity index 100%
rename from util/pcre/pcrecpp_internal.h
rename to src/libs/pcre/pcrecpp_internal.h
diff --git a/util/pcre/pcrecpparg.h b/src/libs/pcre/pcrecpparg.h
similarity index 100%
rename from util/pcre/pcrecpparg.h
rename to src/libs/pcre/pcrecpparg.h
diff --git a/util/pcre/pcredemo.c b/src/libs/pcre/pcredemo.c
similarity index 100%
rename from util/pcre/pcredemo.c
rename to src/libs/pcre/pcredemo.c
diff --git a/util/pcre/pcregrep.c b/src/libs/pcre/pcregrep.c
similarity index 100%
rename from util/pcre/pcregrep.c
rename to src/libs/pcre/pcregrep.c
diff --git a/util/pcre/pcreposix.c b/src/libs/pcre/pcreposix.c
similarity index 100%
rename from util/pcre/pcreposix.c
rename to src/libs/pcre/pcreposix.c
diff --git a/util/pcre/pcreposix.h b/src/libs/pcre/pcreposix.h
similarity index 100%
rename from util/pcre/pcreposix.h
rename to src/libs/pcre/pcreposix.h
diff --git a/util/pcre/pcretest.c b/src/libs/pcre/pcretest.c
similarity index 100%
rename from util/pcre/pcretest.c
rename to src/libs/pcre/pcretest.c
diff --git a/util/pcre/ucp.h b/src/libs/pcre/ucp.h
similarity index 100%
rename from util/pcre/ucp.h
rename to src/libs/pcre/ucp.h
diff --git a/util/sfl/CMakeLists.txt b/src/libs/sfl/CMakeLists.txt
similarity index 100%
rename from util/sfl/CMakeLists.txt
rename to src/libs/sfl/CMakeLists.txt
diff --git a/util/sfl/SConscript b/src/libs/sfl/SConscript
similarity index 100%
rename from util/sfl/SConscript
rename to src/libs/sfl/SConscript
diff --git a/util/sfl/prelude.h b/src/libs/sfl/prelude.h
similarity index 100%
rename from util/sfl/prelude.h
rename to src/libs/sfl/prelude.h
diff --git a/util/sfl/sfl.h b/src/libs/sfl/sfl.h
similarity index 100%
rename from util/sfl/sfl.h
rename to src/libs/sfl/sfl.h
diff --git a/util/sfl/sflbits.c b/src/libs/sfl/sflbits.c
similarity index 100%
rename from util/sfl/sflbits.c
rename to src/libs/sfl/sflbits.c
diff --git a/util/sfl/sflbits.h b/src/libs/sfl/sflbits.h
similarity index 100%
rename from util/sfl/sflbits.h
rename to src/libs/sfl/sflbits.h
diff --git a/util/sfl/sflcomp.c b/src/libs/sfl/sflcomp.c
similarity index 100%
rename from util/sfl/sflcomp.c
rename to src/libs/sfl/sflcomp.c
diff --git a/util/sfl/sflcomp.h b/src/libs/sfl/sflcomp.h
similarity index 100%
rename from util/sfl/sflcomp.h
rename to src/libs/sfl/sflcomp.h
diff --git a/util/sfl/sflcons.c b/src/libs/sfl/sflcons.c
similarity index 100%
rename from util/sfl/sflcons.c
rename to src/libs/sfl/sflcons.c
diff --git a/util/sfl/sflcons.h b/src/libs/sfl/sflcons.h
similarity index 100%
rename from util/sfl/sflcons.h
rename to src/libs/sfl/sflcons.h
diff --git a/util/sfl/sflconv.c b/src/libs/sfl/sflconv.c
similarity index 100%
rename from util/sfl/sflconv.c
rename to src/libs/sfl/sflconv.c
diff --git a/util/sfl/sflconv.h b/src/libs/sfl/sflconv.h
similarity index 100%
rename from util/sfl/sflconv.h
rename to src/libs/sfl/sflconv.h
diff --git a/util/sfl/sflcryp.c b/src/libs/sfl/sflcryp.c
similarity index 100%
rename from util/sfl/sflcryp.c
rename to src/libs/sfl/sflcryp.c
diff --git a/util/sfl/sflcryp.h b/src/libs/sfl/sflcryp.h
similarity index 100%
rename from util/sfl/sflcryp.h
rename to src/libs/sfl/sflcryp.h
diff --git a/util/sfl/sflcvbs.c b/src/libs/sfl/sflcvbs.c
similarity index 100%
rename from util/sfl/sflcvbs.c
rename to src/libs/sfl/sflcvbs.c
diff --git a/util/sfl/sflcvdp.c b/src/libs/sfl/sflcvdp.c
similarity index 100%
rename from util/sfl/sflcvdp.c
rename to src/libs/sfl/sflcvdp.c
diff --git a/util/sfl/sflcvds.c b/src/libs/sfl/sflcvds.c
similarity index 100%
rename from util/sfl/sflcvds.c
rename to src/libs/sfl/sflcvds.c
diff --git a/util/sfl/sflcvns.c b/src/libs/sfl/sflcvns.c
similarity index 100%
rename from util/sfl/sflcvns.c
rename to src/libs/sfl/sflcvns.c
diff --git a/util/sfl/sflcvsb.c b/src/libs/sfl/sflcvsb.c
similarity index 100%
rename from util/sfl/sflcvsb.c
rename to src/libs/sfl/sflcvsb.c
diff --git a/util/sfl/sflcvsd.c b/src/libs/sfl/sflcvsd.c
similarity index 100%
rename from util/sfl/sflcvsd.c
rename to src/libs/sfl/sflcvsd.c
diff --git a/util/sfl/sflcvsn.c b/src/libs/sfl/sflcvsn.c
similarity index 100%
rename from util/sfl/sflcvsn.c
rename to src/libs/sfl/sflcvsn.c
diff --git a/util/sfl/sflcvst.c b/src/libs/sfl/sflcvst.c
similarity index 100%
rename from util/sfl/sflcvst.c
rename to src/libs/sfl/sflcvst.c
diff --git a/util/sfl/sflcvtp.c b/src/libs/sfl/sflcvtp.c
similarity index 100%
rename from util/sfl/sflcvtp.c
rename to src/libs/sfl/sflcvtp.c
diff --git a/util/sfl/sflcvts.c b/src/libs/sfl/sflcvts.c
similarity index 100%
rename from util/sfl/sflcvts.c
rename to src/libs/sfl/sflcvts.c
diff --git a/util/sfl/sfldate.c b/src/libs/sfl/sfldate.c
similarity index 100%
rename from util/sfl/sfldate.c
rename to src/libs/sfl/sfldate.c
diff --git a/util/sfl/sfldate.h b/src/libs/sfl/sfldate.h
similarity index 100%
rename from util/sfl/sfldate.h
rename to src/libs/sfl/sfldate.h
diff --git a/util/sfl/sfldbio.c b/src/libs/sfl/sfldbio.c
similarity index 100%
rename from util/sfl/sfldbio.c
rename to src/libs/sfl/sfldbio.c
diff --git a/util/sfl/sfldbio.h b/src/libs/sfl/sfldbio.h
similarity index 100%
rename from util/sfl/sfldbio.h
rename to src/libs/sfl/sfldbio.h
diff --git a/util/sfl/sfldir.c b/src/libs/sfl/sfldir.c
similarity index 100%
rename from util/sfl/sfldir.c
rename to src/libs/sfl/sfldir.c
diff --git a/util/sfl/sfldir.h b/src/libs/sfl/sfldir.h
similarity index 100%
rename from util/sfl/sfldir.h
rename to src/libs/sfl/sfldir.h
diff --git a/util/sfl/sflenv.c b/src/libs/sfl/sflenv.c
similarity index 100%
rename from util/sfl/sflenv.c
rename to src/libs/sfl/sflenv.c
diff --git a/util/sfl/sflenv.h b/src/libs/sfl/sflenv.h
similarity index 100%
rename from util/sfl/sflenv.h
rename to src/libs/sfl/sflenv.h
diff --git a/util/sfl/sflexdr.c b/src/libs/sfl/sflexdr.c
similarity index 100%
rename from util/sfl/sflexdr.c
rename to src/libs/sfl/sflexdr.c
diff --git a/util/sfl/sflexdr.h b/src/libs/sfl/sflexdr.h
similarity index 100%
rename from util/sfl/sflexdr.h
rename to src/libs/sfl/sflexdr.h
diff --git a/util/sfl/sflfile.c b/src/libs/sfl/sflfile.c
similarity index 100%
rename from util/sfl/sflfile.c
rename to src/libs/sfl/sflfile.c
diff --git a/util/sfl/sflfile.h b/src/libs/sfl/sflfile.h
similarity index 100%
rename from util/sfl/sflfile.h
rename to src/libs/sfl/sflfile.h
diff --git a/util/sfl/sflfind.c b/src/libs/sfl/sflfind.c
similarity index 100%
rename from util/sfl/sflfind.c
rename to src/libs/sfl/sflfind.c
diff --git a/util/sfl/sflfind.h b/src/libs/sfl/sflfind.h
similarity index 100%
rename from util/sfl/sflfind.h
rename to src/libs/sfl/sflfind.h
diff --git a/util/sfl/sflfort.c b/src/libs/sfl/sflfort.c
similarity index 100%
rename from util/sfl/sflfort.c
rename to src/libs/sfl/sflfort.c
diff --git a/util/sfl/sflfort.h b/src/libs/sfl/sflfort.h
similarity index 100%
rename from util/sfl/sflfort.h
rename to src/libs/sfl/sflfort.h
diff --git a/util/sfl/sflhead.h b/src/libs/sfl/sflhead.h
similarity index 100%
rename from util/sfl/sflhead.h
rename to src/libs/sfl/sflhead.h
diff --git a/util/sfl/sflhttp.c b/src/libs/sfl/sflhttp.c
similarity index 100%
rename from util/sfl/sflhttp.c
rename to src/libs/sfl/sflhttp.c
diff --git a/util/sfl/sflhttp.h b/src/libs/sfl/sflhttp.h
similarity index 100%
rename from util/sfl/sflhttp.h
rename to src/libs/sfl/sflhttp.h
diff --git a/util/sfl/sflini.c b/src/libs/sfl/sflini.c
similarity index 100%
rename from util/sfl/sflini.c
rename to src/libs/sfl/sflini.c
diff --git a/util/sfl/sflini.h b/src/libs/sfl/sflini.h
similarity index 100%
rename from util/sfl/sflini.h
rename to src/libs/sfl/sflini.h
diff --git a/util/sfl/sfllang.c b/src/libs/sfl/sfllang.c
similarity index 100%
rename from util/sfl/sfllang.c
rename to src/libs/sfl/sfllang.c
diff --git a/util/sfl/sfllang.h b/src/libs/sfl/sfllang.h
similarity index 100%
rename from util/sfl/sfllang.h
rename to src/libs/sfl/sfllang.h
diff --git a/util/sfl/sfllbuf.c b/src/libs/sfl/sfllbuf.c
similarity index 100%
rename from util/sfl/sfllbuf.c
rename to src/libs/sfl/sfllbuf.c
diff --git a/util/sfl/sfllbuf.h b/src/libs/sfl/sfllbuf.h
similarity index 100%
rename from util/sfl/sfllbuf.h
rename to src/libs/sfl/sfllbuf.h
diff --git a/util/sfl/sfllist.c b/src/libs/sfl/sfllist.c
similarity index 100%
rename from util/sfl/sfllist.c
rename to src/libs/sfl/sfllist.c
diff --git a/util/sfl/sfllist.h b/src/libs/sfl/sfllist.h
similarity index 100%
rename from util/sfl/sfllist.h
rename to src/libs/sfl/sfllist.h
diff --git a/util/sfl/sflmail.c b/src/libs/sfl/sflmail.c
similarity index 100%
rename from util/sfl/sflmail.c
rename to src/libs/sfl/sflmail.c
diff --git a/util/sfl/sflmail.h b/src/libs/sfl/sflmail.h
similarity index 100%
rename from util/sfl/sflmail.h
rename to src/libs/sfl/sflmail.h
diff --git a/util/sfl/sflmath.c b/src/libs/sfl/sflmath.c
similarity index 100%
rename from util/sfl/sflmath.c
rename to src/libs/sfl/sflmath.c
diff --git a/util/sfl/sflmath.h b/src/libs/sfl/sflmath.h
similarity index 100%
rename from util/sfl/sflmath.h
rename to src/libs/sfl/sflmath.h
diff --git a/util/sfl/sflmem.c b/src/libs/sfl/sflmem.c
similarity index 100%
rename from util/sfl/sflmem.c
rename to src/libs/sfl/sflmem.c
diff --git a/util/sfl/sflmem.h b/src/libs/sfl/sflmem.h
similarity index 100%
rename from util/sfl/sflmem.h
rename to src/libs/sfl/sflmem.h
diff --git a/util/sfl/sflmesg.c b/src/libs/sfl/sflmesg.c
similarity index 100%
rename from util/sfl/sflmesg.c
rename to src/libs/sfl/sflmesg.c
diff --git a/util/sfl/sflmesg.h b/src/libs/sfl/sflmesg.h
similarity index 100%
rename from util/sfl/sflmesg.h
rename to src/libs/sfl/sflmesg.h
diff --git a/util/sfl/sflmime.c b/src/libs/sfl/sflmime.c
similarity index 100%
rename from util/sfl/sflmime.c
rename to src/libs/sfl/sflmime.c
diff --git a/util/sfl/sflmime.h b/src/libs/sfl/sflmime.h
similarity index 100%
rename from util/sfl/sflmime.h
rename to src/libs/sfl/sflmime.h
diff --git a/util/sfl/sflmysql.c b/src/libs/sfl/sflmysql.c
similarity index 100%
rename from util/sfl/sflmysql.c
rename to src/libs/sfl/sflmysql.c
diff --git a/util/sfl/sflmysql.h b/src/libs/sfl/sflmysql.h
similarity index 100%
rename from util/sfl/sflmysql.h
rename to src/libs/sfl/sflmysql.h
diff --git a/util/sfl/sflnode.c b/src/libs/sfl/sflnode.c
similarity index 100%
rename from util/sfl/sflnode.c
rename to src/libs/sfl/sflnode.c
diff --git a/util/sfl/sflnode.h b/src/libs/sfl/sflnode.h
similarity index 100%
rename from util/sfl/sflnode.h
rename to src/libs/sfl/sflnode.h
diff --git a/util/sfl/sflprint.c b/src/libs/sfl/sflprint.c
similarity index 100%
rename from util/sfl/sflprint.c
rename to src/libs/sfl/sflprint.c
diff --git a/util/sfl/sflprint.h b/src/libs/sfl/sflprint.h
similarity index 100%
rename from util/sfl/sflprint.h
rename to src/libs/sfl/sflprint.h
diff --git a/util/sfl/sflproc.c b/src/libs/sfl/sflproc.c
similarity index 100%
rename from util/sfl/sflproc.c
rename to src/libs/sfl/sflproc.c
diff --git a/util/sfl/sflproc.h b/src/libs/sfl/sflproc.h
similarity index 100%
rename from util/sfl/sflproc.h
rename to src/libs/sfl/sflproc.h
diff --git a/util/sfl/sflprocx.h b/src/libs/sfl/sflprocx.h
similarity index 100%
rename from util/sfl/sflprocx.h
rename to src/libs/sfl/sflprocx.h
diff --git a/util/sfl/sflslot.c b/src/libs/sfl/sflslot.c
similarity index 100%
rename from util/sfl/sflslot.c
rename to src/libs/sfl/sflslot.c
diff --git a/util/sfl/sflslot.h b/src/libs/sfl/sflslot.h
similarity index 100%
rename from util/sfl/sflslot.h
rename to src/libs/sfl/sflslot.h
diff --git a/util/sfl/sflsock.c b/src/libs/sfl/sflsock.c
similarity index 100%
rename from util/sfl/sflsock.c
rename to src/libs/sfl/sflsock.c
diff --git a/util/sfl/sflsock.h b/src/libs/sfl/sflsock.h
similarity index 100%
rename from util/sfl/sflsock.h
rename to src/libs/sfl/sflsock.h
diff --git a/util/sfl/sflstr.c b/src/libs/sfl/sflstr.c
similarity index 100%
rename from util/sfl/sflstr.c
rename to src/libs/sfl/sflstr.c
diff --git a/util/sfl/sflstr.h b/src/libs/sfl/sflstr.h
similarity index 100%
rename from util/sfl/sflstr.h
rename to src/libs/sfl/sflstr.h
diff --git a/util/sfl/sflsymb.c b/src/libs/sfl/sflsymb.c
similarity index 100%
rename from util/sfl/sflsymb.c
rename to src/libs/sfl/sflsymb.c
diff --git a/util/sfl/sflsymb.h b/src/libs/sfl/sflsymb.h
similarity index 100%
rename from util/sfl/sflsymb.h
rename to src/libs/sfl/sflsymb.h
diff --git a/util/sfl/sflsyst.c b/src/libs/sfl/sflsyst.c
similarity index 100%
rename from util/sfl/sflsyst.c
rename to src/libs/sfl/sflsyst.c
diff --git a/util/sfl/sflsyst.h b/src/libs/sfl/sflsyst.h
similarity index 100%
rename from util/sfl/sflsyst.h
rename to src/libs/sfl/sflsyst.h
diff --git a/util/sfl/sfltok.c b/src/libs/sfl/sfltok.c
similarity index 100%
rename from util/sfl/sfltok.c
rename to src/libs/sfl/sfltok.c
diff --git a/util/sfl/sfltok.h b/src/libs/sfl/sfltok.h
similarity index 100%
rename from util/sfl/sfltok.h
rename to src/libs/sfl/sfltok.h
diff --git a/util/sfl/sfltree.c b/src/libs/sfl/sfltree.c
similarity index 100%
rename from util/sfl/sfltree.c
rename to src/libs/sfl/sfltree.c
diff --git a/util/sfl/sfltree.h b/src/libs/sfl/sfltree.h
similarity index 100%
rename from util/sfl/sfltree.h
rename to src/libs/sfl/sfltree.h
diff --git a/util/sfl/sfltron.c b/src/libs/sfl/sfltron.c
similarity index 100%
rename from util/sfl/sfltron.c
rename to src/libs/sfl/sfltron.c
diff --git a/util/sfl/sfltron.h b/src/libs/sfl/sfltron.h
similarity index 100%
rename from util/sfl/sfltron.h
rename to src/libs/sfl/sfltron.h
diff --git a/util/sfl/sfluid.c b/src/libs/sfl/sfluid.c
similarity index 100%
rename from util/sfl/sfluid.c
rename to src/libs/sfl/sfluid.c
diff --git a/util/sfl/sfluid.h b/src/libs/sfl/sfluid.h
similarity index 100%
rename from util/sfl/sfluid.h
rename to src/libs/sfl/sfluid.h
diff --git a/util/sfl/sflvers.h b/src/libs/sfl/sflvers.h
similarity index 100%
rename from util/sfl/sflvers.h
rename to src/libs/sfl/sflvers.h
diff --git a/util/sfl/sflxml.c b/src/libs/sfl/sflxml.c
similarity index 100%
rename from util/sfl/sflxml.c
rename to src/libs/sfl/sflxml.c
diff --git a/util/sfl/sflxml.h b/src/libs/sfl/sflxml.h
similarity index 100%
rename from util/sfl/sflxml.h
rename to src/libs/sfl/sflxml.h
diff --git a/util/sfl/sflxmll.c b/src/libs/sfl/sflxmll.c
similarity index 100%
rename from util/sfl/sflxmll.c
rename to src/libs/sfl/sflxmll.c
diff --git a/util/sfl/sflxmll.h b/src/libs/sfl/sflxmll.h
similarity index 100%
rename from util/sfl/sflxmll.h
rename to src/libs/sfl/sflxmll.h
diff --git a/util/sfl/testall.c b/src/libs/sfl/testall.c
similarity index 100%
rename from util/sfl/testall.c
rename to src/libs/sfl/testall.c
diff --git a/util/sfl/testbits.c b/src/libs/sfl/testbits.c
similarity index 100%
rename from util/sfl/testbits.c
rename to src/libs/sfl/testbits.c
diff --git a/util/sfl/testcgi.c b/src/libs/sfl/testcgi.c
similarity index 100%
rename from util/sfl/testcgi.c
rename to src/libs/sfl/testcgi.c
diff --git a/util/sfl/testcomp.c b/src/libs/sfl/testcomp.c
similarity index 100%
rename from util/sfl/testcomp.c
rename to src/libs/sfl/testcomp.c
diff --git a/util/sfl/testconv.c b/src/libs/sfl/testconv.c
similarity index 100%
rename from util/sfl/testconv.c
rename to src/libs/sfl/testconv.c
diff --git a/util/sfl/testcryp.c b/src/libs/sfl/testcryp.c
similarity index 100%
rename from util/sfl/testcryp.c
rename to src/libs/sfl/testcryp.c
diff --git a/util/sfl/testdate.c b/src/libs/sfl/testdate.c
similarity index 100%
rename from util/sfl/testdate.c
rename to src/libs/sfl/testdate.c
diff --git a/util/sfl/testdes.c b/src/libs/sfl/testdes.c
similarity index 100%
rename from util/sfl/testdes.c
rename to src/libs/sfl/testdes.c
diff --git a/util/sfl/testdir.c b/src/libs/sfl/testdir.c
similarity index 100%
rename from util/sfl/testdir.c
rename to src/libs/sfl/testdir.c
diff --git a/util/sfl/testexdr.c b/src/libs/sfl/testexdr.c
similarity index 100%
rename from util/sfl/testexdr.c
rename to src/libs/sfl/testexdr.c
diff --git a/util/sfl/testfind.c b/src/libs/sfl/testfind.c
similarity index 100%
rename from util/sfl/testfind.c
rename to src/libs/sfl/testfind.c
diff --git a/util/sfl/testfort.c b/src/libs/sfl/testfort.c
similarity index 100%
rename from util/sfl/testfort.c
rename to src/libs/sfl/testfort.c
diff --git a/util/sfl/testmem.c b/src/libs/sfl/testmem.c
similarity index 100%
rename from util/sfl/testmem.c
rename to src/libs/sfl/testmem.c
diff --git a/util/sfl/testmime.c b/src/libs/sfl/testmime.c
similarity index 100%
rename from util/sfl/testmime.c
rename to src/libs/sfl/testmime.c
diff --git a/util/sfl/teststr.c b/src/libs/sfl/teststr.c
similarity index 100%
rename from util/sfl/teststr.c
rename to src/libs/sfl/teststr.c
diff --git a/util/sfl/testsym.c b/src/libs/sfl/testsym.c
similarity index 100%
rename from util/sfl/testsym.c
rename to src/libs/sfl/testsym.c
diff --git a/util/sfl/testtree.c b/src/libs/sfl/testtree.c
similarity index 100%
rename from util/sfl/testtree.c
rename to src/libs/sfl/testtree.c
diff --git a/util/sfl/testtron.c b/src/libs/sfl/testtron.c
similarity index 100%
rename from util/sfl/testtron.c
rename to src/libs/sfl/testtron.c
diff --git a/util/sfl/testuid.c b/src/libs/sfl/testuid.c
similarity index 100%
rename from util/sfl/testuid.c
rename to src/libs/sfl/testuid.c
diff --git a/util/sfl/testxml.c b/src/libs/sfl/testxml.c
similarity index 100%
rename from util/sfl/testxml.c
rename to src/libs/sfl/testxml.c
diff --git a/util/zip/CMakeLists.txt b/src/libs/zip/CMakeLists.txt
similarity index 100%
rename from util/zip/CMakeLists.txt
rename to src/libs/zip/CMakeLists.txt
diff --git a/util/zip/SConscript b/src/libs/zip/SConscript
similarity index 100%
rename from util/zip/SConscript
rename to src/libs/zip/SConscript
diff --git a/util/zip/crypt.h b/src/libs/zip/crypt.h
similarity index 100%
rename from util/zip/crypt.h
rename to src/libs/zip/crypt.h
diff --git a/util/zip/ioapi.c b/src/libs/zip/ioapi.c
similarity index 100%
rename from util/zip/ioapi.c
rename to src/libs/zip/ioapi.c
diff --git a/util/zip/ioapi.h b/src/libs/zip/ioapi.h
similarity index 100%
rename from util/zip/ioapi.h
rename to src/libs/zip/ioapi.h
diff --git a/util/zip/unzip.c b/src/libs/zip/unzip.c
similarity index 100%
rename from util/zip/unzip.c
rename to src/libs/zip/unzip.c
diff --git a/util/zip/unzip.h b/src/libs/zip/unzip.h
similarity index 100%
rename from util/zip/unzip.h
rename to src/libs/zip/unzip.h
diff --git a/util/zip/zip.c b/src/libs/zip/zip.c
similarity index 100%
rename from util/zip/zip.c
rename to src/libs/zip/zip.c
diff --git a/util/zip/zip.h b/src/libs/zip/zip.h
similarity index 100%
rename from util/zip/zip.h
rename to src/libs/zip/zip.h
diff --git a/util/loading.cpp b/src/loading.cpp
similarity index 100%
rename from util/loading.cpp
rename to src/loading.cpp
diff --git a/util/message-queue.cpp b/src/message-queue.cpp
similarity index 100%
rename from util/message-queue.cpp
rename to src/message-queue.cpp
diff --git a/util/messages.cpp b/src/messages.cpp
similarity index 100%
rename from util/messages.cpp
rename to src/messages.cpp
diff --git a/util/regex.cpp b/src/regex.cpp
similarity index 100%
rename from util/regex.cpp
rename to src/regex.cpp
diff --git a/util/resource.cpp b/src/resource.cpp
similarity index 100%
rename from util/resource.cpp
rename to src/resource.cpp
diff --git a/util/rsxutil.cpp b/src/rsxutil.cpp
similarity index 100%
rename from util/rsxutil.cpp
rename to src/rsxutil.cpp
diff --git a/util/scale2x.cpp b/src/scale2x.cpp
similarity index 100%
rename from util/scale2x.cpp
rename to src/scale2x.cpp
diff --git a/util/scalebit.cpp b/src/scalebit.cpp
similarity index 100%
rename from util/scalebit.cpp
rename to src/scalebit.cpp
diff --git a/util/system.cpp b/src/system.cpp
similarity index 100%
rename from util/system.cpp
rename to src/system.cpp
diff --git a/util/thread.cpp b/src/thread.cpp
similarity index 100%
rename from util/thread.cpp
rename to src/thread.cpp
diff --git a/util/timedifference.cpp b/src/timedifference.cpp
similarity index 100%
rename from util/timedifference.cpp
rename to src/timedifference.cpp
diff --git a/util/timer.cpp b/src/timer.cpp
similarity index 100%
rename from util/timer.cpp
rename to src/timer.cpp
diff --git a/util/token.cpp b/src/token.cpp
similarity index 100%
rename from util/token.cpp
rename to src/token.cpp
diff --git a/util/tokenreader.cpp b/src/tokenreader.cpp
similarity index 100%
rename from util/tokenreader.cpp
rename to src/tokenreader.cpp
diff --git a/util/utf.cpp b/src/utf.cpp
similarity index 100%
rename from util/utf.cpp
rename to src/utf.cpp
diff --git a/util/version.cpp b/src/version.cpp
similarity index 100%
rename from util/version.cpp
rename to src/version.cpp
diff --git a/util/xmain.cpp b/src/xmain.cpp
similarity index 100%
rename from util/xmain.cpp
rename to src/xmain.cpp
diff --git a/util/android/AndroidManifest.xml b/util/android/AndroidManifest.xml
deleted file mode 100644
index c7a243d6..00000000
--- a/util/android/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.paintown"
- android:versionCode="3"
- android:versionName="3.6"
- android:installLocation="auto">
- <application android:label="@string/app_name" android:icon="@drawable/icon">
- <activity android:name=".PaintownActivity"
- android:label="@string/app_name"
- android:screenOrientation="landscape"
- android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode"
- android:windowSoftInputMode="stateUnspecified|adjustPan"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
-
- <meta-data android:name="org.liballeg.app_name"
- android:value="paintown"/>
- </activity>
- </application>
- <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
- <uses-permission android:name="android.permission.INTERNET"></uses-permission>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
- <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
- <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-</manifest>
diff --git a/util/android/build.properties b/util/android/build.properties
deleted file mode 100644
index 97a02e54..00000000
--- a/util/android/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-# 'source.dir' for the location of your java source folder and
-# 'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-# 'key.store' for the location of your keystore and
-# 'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-key.store=paintown.keystore
-key.alias=paintown
diff --git a/util/android/build.xml b/util/android/build.xml
deleted file mode 100644
index fa741631..00000000
--- a/util/android/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Paintown" default="help">
-
- <!-- The local.properties file is created and updated by the 'android' tool.
- It contains the path to the SDK. It should *NOT* be checked into
- Version Control Systems. -->
- <loadproperties srcFile="local.properties" />
-
- <!-- The ant.properties file can be created by you. It is only edited by the
- 'android' tool to add properties to it.
- This is the place to change some Ant specific build properties.
- Here are some properties you may want to change/update:
-
- source.dir
- The name of the source directory. Default is 'src'.
- out.dir
- The name of the output directory. Default is 'bin'.
-
- For other overridable properties, look at the beginning of the rules
- files in the SDK, at tools/ant/build.xml
-
- Properties related to the SDK location or the project target should
- be updated using the 'android' tool with the 'update' action.
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems.
-
- -->
- <property file="ant.properties" />
-
- <!-- The project.properties file is created and updated by the 'android'
- tool, as well as ADT.
-
- This contains project specific properties such as project target, and library
- dependencies. Lower level build properties are stored in ant.properties
- (or in .classpath for Eclipse projects).
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems. -->
- <loadproperties srcFile="project.properties" />
-
- <!-- quick check on sdk.dir -->
- <fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
- unless="sdk.dir"
- />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
- in between standard targets -->
-<!--
- <target name="-pre-build">
- </target>
- <target name="-pre-compile">
- </target>
-
- /* This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir} */
- <target name="-post-compile">
- </target>
--->
-
- <!-- Import the actual build file.
-
- To customize existing targets, there are two options:
- - Customize only one target:
- - copy/paste the target into this file, *before* the
- <import> task.
- - customize it to your needs.
- - Customize the whole content of build.xml
- - copy/paste the content of the rules files (minus the top node)
- into this file, replacing the <import> task.
- - customize to your needs.
-
- ***********************
- ****** IMPORTANT ******
- ***********************
- In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
- in order to avoid having your file be overridden by tools such as "android update project"
- -->
- <!-- version-tag: custom -->
- <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/util/android/default.properties b/util/android/default.properties
deleted file mode 100644
index 3404f9c1..00000000
--- a/util/android/default.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-9
-#target=android-13
diff --git a/util/android/install.sh b/util/android/install.sh
deleted file mode 100755
index 17d76e5f..00000000
--- a/util/android/install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-adb=/opt/android-sdk/platform-tools/adb
-run='am start -a android.intent.action.MAIN -n org.paintown/org.paintown.PaintownActivity'
-
-build_paintown(){
- #(cd ../../..; android=1 make)
- #echo skip
- echo 0
-}
-
-build_apk(){
- # ant debug
- echo 0
-}
-
-install_apk(){
- # echo "Uninstalling old version"
- # $adb uninstall org.libsdl.app
- echo "Installing latest version"
- $adb install -r bin/Paintown-debug.apk
-}
-
-run_apk(){
- $adb shell $run
-}
-
-echo "Making sure you are running the emulator"
-state=$($adb get-state)
-if [ $state = "unknown" ]; then
- echo "Emulator is not running please start."
-else
- build_paintown && build_apk && install_apk && run_apk
-fi
diff --git a/util/android/jni/SDL_android_main.cpp b/util/android/jni/SDL_android_main.cpp
deleted file mode 100644
index d9480923..00000000
--- a/util/android/jni/SDL_android_main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/* Include the SDL main definition header */
-#include "SDL_main.h"
-
-/*******************************************************************************
- Functions called by JNI
-*******************************************************************************/
-#include <jni.h>
-
-#include "util/funcs.h"
-#include "configuration.h"
-
-// Called before SDL_main() to initialize JNI bindings in SDL library
-extern "C" void SDL_Android_Init(JNIEnv* env, jclass cls);
-
-// Library init
-extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
- return JNI_VERSION_1_4;
-}
-
-// Start up the SDL app
-extern "C" void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls){
- /* This interface could expand with ABI negotiation, calbacks, etc. */
- SDL_Android_Init(env, cls);
-
- /* Run the application code! */
- int status;
- char *argv[2];
- argv[0] = strdup("SDL_app");
- argv[1] = NULL;
- status = SDL_main(1, argv);
-
- /* We exit here for consistency with other platforms. */
- exit(status);
-}
-
-extern "C" void Java_org_libsdl_app_SDLActivity_setExternalLocation(JNIEnv* env, jclass cls, jstring jpath)
-{
- jboolean iscopy;
- const char *path = env->GetStringUTFChars(jpath, &iscopy);
- const std::string & externalLocation = std::string(path);
- setenv("HOME", (externalLocation + "/user").c_str(), 1);
- // Set data path in paintown
- Util::setDataPath(externalLocation + "/data");
- env->ReleaseStringUTFChars(jpath, path);
-}
-
-extern "C" void Java_org_libsdl_app_SDLActivity_setScreenSize(JNIEnv * env, jclass cls, jint width, jint height){
- Configuration::setScreenWidth(width);
- Configuration::setScreenHeight(height);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/util/android/local.properties b/util/android/local.properties
deleted file mode 100644
index 0e02724f..00000000
--- a/util/android/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/opt/android-sdk
diff --git a/util/android/paintown.keystore b/util/android/paintown.keystore
deleted file mode 100644
index bae5a558..00000000
Binary files a/util/android/paintown.keystore and /dev/null differ
diff --git a/util/android/proguard.cfg b/util/android/proguard.cfg
deleted file mode 100644
index b1cdf17b..00000000
--- a/util/android/proguard.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
- native <methods>;
-}
-
--keepclasseswithmembers class * {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
- public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
- public void *(android.view.View);
-}
-
--keepclassmembers enum * {
- public static **[] values();
- public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
-}
diff --git a/util/android/res/drawable-hdpi/icon.png b/util/android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 376d3383..00000000
Binary files a/util/android/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/util/android/res/drawable-ldpi/icon.png b/util/android/res/drawable-ldpi/icon.png
deleted file mode 100644
index 7a5c1953..00000000
Binary files a/util/android/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/util/android/res/drawable-mdpi/icon.png b/util/android/res/drawable-mdpi/icon.png
deleted file mode 100644
index 1dffc2d9..00000000
Binary files a/util/android/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/util/android/res/drawable/arrowdown.png b/util/android/res/drawable/arrowdown.png
deleted file mode 100644
index 83bad334..00000000
Binary files a/util/android/res/drawable/arrowdown.png and /dev/null differ
diff --git a/util/android/res/drawable/arrowleft.png b/util/android/res/drawable/arrowleft.png
deleted file mode 100644
index ac0bd37b..00000000
Binary files a/util/android/res/drawable/arrowleft.png and /dev/null differ
diff --git a/util/android/res/drawable/arrowright.png b/util/android/res/drawable/arrowright.png
deleted file mode 100644
index 732a7ab3..00000000
Binary files a/util/android/res/drawable/arrowright.png and /dev/null differ
diff --git a/util/android/res/drawable/arrowup.png b/util/android/res/drawable/arrowup.png
deleted file mode 100644
index c58692f1..00000000
Binary files a/util/android/res/drawable/arrowup.png and /dev/null differ
diff --git a/util/android/res/drawable/button1.png b/util/android/res/drawable/button1.png
deleted file mode 100644
index 7631cf4c..00000000
Binary files a/util/android/res/drawable/button1.png and /dev/null differ
diff --git a/util/android/res/drawable/button2.png b/util/android/res/drawable/button2.png
deleted file mode 100644
index 5f6939dd..00000000
Binary files a/util/android/res/drawable/button2.png and /dev/null differ
diff --git a/util/android/res/drawable/dot.png b/util/android/res/drawable/dot.png
deleted file mode 100644
index 3e7ba667..00000000
Binary files a/util/android/res/drawable/dot.png and /dev/null differ
diff --git a/util/android/res/drawable/pad.png b/util/android/res/drawable/pad.png
deleted file mode 100644
index 4b107c41..00000000
Binary files a/util/android/res/drawable/pad.png and /dev/null differ
diff --git a/util/android/res/layout/main.xml b/util/android/res/layout/main.xml
deleted file mode 100644
index bd69b6c1..00000000
--- a/util/android/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Hello World, Paintown"
- />
-</LinearLayout>
-
diff --git a/util/android/res/values/strings.xml b/util/android/res/values/strings.xml
deleted file mode 100644
index 241f105e..00000000
--- a/util/android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">Paintown</string>
-</resources>
diff --git a/util/android/src/org/paintown/PaintownActivity.java b/util/android/src/org/paintown/PaintownActivity.java
deleted file mode 100644
index db75b347..00000000
--- a/util/android/src/org/paintown/PaintownActivity.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.paintown;
-
-/*
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Environment;
-
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.SurfaceHolder;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.OrientationEventListener;
-import android.view.WindowManager;
-
-import android.hardware.*;
-import android.content.res.Configuration;
-import android.content.res.AssetManager;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.PixelFormat;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ActivityInfo;
-import android.util.Log;
-
-import java.lang.String;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.Runnable;
-
-import java.util.List;
-import java.util.BitSet;
-import java.util.ArrayList;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.FileOutputStream;
-
-/*
-import java.nio.ByteBuffer;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-import javax.microedition.khronos.egl.*;
-import android.media.AudioManager;
-*/
-
-import org.liballeg.android.AllegroActivity;
-
-public class PaintownActivity extends AllegroActivity {
- static void loadAllegroLibraries(String suffix){
- System.loadLibrary("allegro" + suffix);
- System.loadLibrary("allegro_primitives" + suffix);
- System.loadLibrary("allegro_image" + suffix);
- System.loadLibrary("allegro_memfile" + suffix);
- System.loadLibrary("allegro_font" + suffix);
- System.loadLibrary("allegro_ttf" + suffix);
- System.loadLibrary("allegro_audio" + suffix);
- System.loadLibrary("allegro_acodec" + suffix);
- }
-
- static void loadAllegroNormal(){
- loadAllegroLibraries("");
- }
-
- static void loadAllegroDebug(){
- loadAllegroLibraries("-debug");
- }
-
- static void loadAllegro(){
- try{
- loadAllegroNormal();
- } catch (UnsatisfiedLinkError fail){
- loadAllegroDebug();
- }
- }
-
- /* load allegro */
- static {
- System.loadLibrary("OpenSLES");
- loadAllegro();
- // System.loadLibrary("paintown");
- }
-
- public PaintownActivity(){
- super("libpaintown.so");
- }
-}
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Jun 15, 11:21 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69936
Default Alt Text
(91 KB)
Attached To
Mode
R75 R-Tech1
Attached
Detach File
Event Timeline