diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index d6382b6..dc20837 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -110,6 +110,8 @@ add_definitions(-DSINGLE_THREADED=1)
 include_directories(
     .
     External/SDL12
+    External/libogg/include
+    External/libvorbis/include
 )
 
 # We build ECC, then use it to generate C++ code for the game entities...
diff --git a/Sources/libogg/AUTHORS b/Sources/External/libogg/AUTHORS
similarity index 100%
rename from Sources/libogg/AUTHORS
rename to Sources/External/libogg/AUTHORS
diff --git a/Sources/libogg/CHANGES b/Sources/External/libogg/CHANGES
similarity index 100%
rename from Sources/libogg/CHANGES
rename to Sources/External/libogg/CHANGES
diff --git a/Sources/libogg/COPYING b/Sources/External/libogg/COPYING
similarity index 100%
rename from Sources/libogg/COPYING
rename to Sources/External/libogg/COPYING
diff --git a/Sources/libogg/README b/Sources/External/libogg/README
similarity index 100%
rename from Sources/libogg/README
rename to Sources/External/libogg/README
diff --git a/Sources/libogg/include/ogg/config_types.h.in b/Sources/External/libogg/include/ogg/config_types.h.in
similarity index 100%
rename from Sources/libogg/include/ogg/config_types.h.in
rename to Sources/External/libogg/include/ogg/config_types.h.in
diff --git a/Sources/libogg/include/ogg/ogg.h b/Sources/External/libogg/include/ogg/ogg.h
similarity index 100%
rename from Sources/libogg/include/ogg/ogg.h
rename to Sources/External/libogg/include/ogg/ogg.h
diff --git a/Sources/libogg/include/ogg/os_types.h b/Sources/External/libogg/include/ogg/os_types.h
similarity index 100%
rename from Sources/libogg/include/ogg/os_types.h
rename to Sources/External/libogg/include/ogg/os_types.h
diff --git a/Sources/libogg/libogg_dynamic.vcxproj b/Sources/External/libogg/libogg_dynamic.vcxproj
similarity index 100%
rename from Sources/libogg/libogg_dynamic.vcxproj
rename to Sources/External/libogg/libogg_dynamic.vcxproj
diff --git a/Sources/libogg/libogg_dynamic.vcxproj.user b/Sources/External/libogg/libogg_dynamic.vcxproj.user
similarity index 100%
rename from Sources/libogg/libogg_dynamic.vcxproj.user
rename to Sources/External/libogg/libogg_dynamic.vcxproj.user
diff --git a/Sources/libogg/ogg.def b/Sources/External/libogg/ogg.def
similarity index 100%
rename from Sources/libogg/ogg.def
rename to Sources/External/libogg/ogg.def
diff --git a/Sources/libogg/src/bitwise.c b/Sources/External/libogg/src/bitwise.c
similarity index 100%
rename from Sources/libogg/src/bitwise.c
rename to Sources/External/libogg/src/bitwise.c
diff --git a/Sources/libogg/src/framing.c b/Sources/External/libogg/src/framing.c
similarity index 100%
rename from Sources/libogg/src/framing.c
rename to Sources/External/libogg/src/framing.c
diff --git a/Sources/libvorbis/AUTHORS b/Sources/External/libvorbis/AUTHORS
similarity index 100%
rename from Sources/libvorbis/AUTHORS
rename to Sources/External/libvorbis/AUTHORS
diff --git a/Sources/libvorbis/CHANGES b/Sources/External/libvorbis/CHANGES
similarity index 100%
rename from Sources/libvorbis/CHANGES
rename to Sources/External/libvorbis/CHANGES
diff --git a/Sources/libvorbis/COPYING b/Sources/External/libvorbis/COPYING
similarity index 100%
rename from Sources/libvorbis/COPYING
rename to Sources/External/libvorbis/COPYING
diff --git a/Sources/libvorbis/README b/Sources/External/libvorbis/README
similarity index 100%
rename from Sources/libvorbis/README
rename to Sources/External/libvorbis/README
diff --git a/Sources/libvorbis/include/vorbis/codec.h b/Sources/External/libvorbis/include/vorbis/codec.h
similarity index 100%
rename from Sources/libvorbis/include/vorbis/codec.h
rename to Sources/External/libvorbis/include/vorbis/codec.h
diff --git a/Sources/libvorbis/include/vorbis/vorbisenc.h b/Sources/External/libvorbis/include/vorbis/vorbisenc.h
similarity index 100%
rename from Sources/libvorbis/include/vorbis/vorbisenc.h
rename to Sources/External/libvorbis/include/vorbis/vorbisenc.h
diff --git a/Sources/libvorbis/include/vorbis/vorbisfile.h b/Sources/External/libvorbis/include/vorbis/vorbisfile.h
similarity index 100%
rename from Sources/libvorbis/include/vorbis/vorbisfile.h
rename to Sources/External/libvorbis/include/vorbis/vorbisfile.h
diff --git a/Sources/libvorbis/lib/analysis.c b/Sources/External/libvorbis/lib/analysis.c
similarity index 100%
rename from Sources/libvorbis/lib/analysis.c
rename to Sources/External/libvorbis/lib/analysis.c
diff --git a/Sources/libvorbis/lib/backends.h b/Sources/External/libvorbis/lib/backends.h
similarity index 100%
rename from Sources/libvorbis/lib/backends.h
rename to Sources/External/libvorbis/lib/backends.h
diff --git a/Sources/libvorbis/lib/barkmel.c b/Sources/External/libvorbis/lib/barkmel.c
similarity index 100%
rename from Sources/libvorbis/lib/barkmel.c
rename to Sources/External/libvorbis/lib/barkmel.c
diff --git a/Sources/libvorbis/lib/bitrate.c b/Sources/External/libvorbis/lib/bitrate.c
similarity index 100%
rename from Sources/libvorbis/lib/bitrate.c
rename to Sources/External/libvorbis/lib/bitrate.c
diff --git a/Sources/libvorbis/lib/bitrate.h b/Sources/External/libvorbis/lib/bitrate.h
similarity index 100%
rename from Sources/libvorbis/lib/bitrate.h
rename to Sources/External/libvorbis/lib/bitrate.h
diff --git a/Sources/libvorbis/lib/block.c b/Sources/External/libvorbis/lib/block.c
similarity index 100%
rename from Sources/libvorbis/lib/block.c
rename to Sources/External/libvorbis/lib/block.c
diff --git a/Sources/libvorbis/lib/books/coupled/res_books_51.h b/Sources/External/libvorbis/lib/books/coupled/res_books_51.h
similarity index 100%
rename from Sources/libvorbis/lib/books/coupled/res_books_51.h
rename to Sources/External/libvorbis/lib/books/coupled/res_books_51.h
diff --git a/Sources/libvorbis/lib/books/coupled/res_books_stereo.h b/Sources/External/libvorbis/lib/books/coupled/res_books_stereo.h
similarity index 100%
rename from Sources/libvorbis/lib/books/coupled/res_books_stereo.h
rename to Sources/External/libvorbis/lib/books/coupled/res_books_stereo.h
diff --git a/Sources/libvorbis/lib/books/floor/floor_books.h b/Sources/External/libvorbis/lib/books/floor/floor_books.h
similarity index 100%
rename from Sources/libvorbis/lib/books/floor/floor_books.h
rename to Sources/External/libvorbis/lib/books/floor/floor_books.h
diff --git a/Sources/libvorbis/lib/books/uncoupled/res_books_uncoupled.h b/Sources/External/libvorbis/lib/books/uncoupled/res_books_uncoupled.h
similarity index 100%
rename from Sources/libvorbis/lib/books/uncoupled/res_books_uncoupled.h
rename to Sources/External/libvorbis/lib/books/uncoupled/res_books_uncoupled.h
diff --git a/Sources/libvorbis/lib/codebook.c b/Sources/External/libvorbis/lib/codebook.c
similarity index 100%
rename from Sources/libvorbis/lib/codebook.c
rename to Sources/External/libvorbis/lib/codebook.c
diff --git a/Sources/libvorbis/lib/codebook.h b/Sources/External/libvorbis/lib/codebook.h
similarity index 100%
rename from Sources/libvorbis/lib/codebook.h
rename to Sources/External/libvorbis/lib/codebook.h
diff --git a/Sources/libvorbis/lib/codec_internal.h b/Sources/External/libvorbis/lib/codec_internal.h
similarity index 100%
rename from Sources/libvorbis/lib/codec_internal.h
rename to Sources/External/libvorbis/lib/codec_internal.h
diff --git a/Sources/libvorbis/lib/envelope.c b/Sources/External/libvorbis/lib/envelope.c
similarity index 100%
rename from Sources/libvorbis/lib/envelope.c
rename to Sources/External/libvorbis/lib/envelope.c
diff --git a/Sources/libvorbis/lib/envelope.h b/Sources/External/libvorbis/lib/envelope.h
similarity index 100%
rename from Sources/libvorbis/lib/envelope.h
rename to Sources/External/libvorbis/lib/envelope.h
diff --git a/Sources/libvorbis/lib/floor0.c b/Sources/External/libvorbis/lib/floor0.c
similarity index 100%
rename from Sources/libvorbis/lib/floor0.c
rename to Sources/External/libvorbis/lib/floor0.c
diff --git a/Sources/libvorbis/lib/floor1.c b/Sources/External/libvorbis/lib/floor1.c
similarity index 100%
rename from Sources/libvorbis/lib/floor1.c
rename to Sources/External/libvorbis/lib/floor1.c
diff --git a/Sources/libvorbis/lib/highlevel.h b/Sources/External/libvorbis/lib/highlevel.h
similarity index 100%
rename from Sources/libvorbis/lib/highlevel.h
rename to Sources/External/libvorbis/lib/highlevel.h
diff --git a/Sources/libvorbis/lib/info.c b/Sources/External/libvorbis/lib/info.c
similarity index 100%
rename from Sources/libvorbis/lib/info.c
rename to Sources/External/libvorbis/lib/info.c
diff --git a/Sources/libvorbis/lib/lookup.c b/Sources/External/libvorbis/lib/lookup.c
similarity index 100%
rename from Sources/libvorbis/lib/lookup.c
rename to Sources/External/libvorbis/lib/lookup.c
diff --git a/Sources/libvorbis/lib/lookup.h b/Sources/External/libvorbis/lib/lookup.h
similarity index 100%
rename from Sources/libvorbis/lib/lookup.h
rename to Sources/External/libvorbis/lib/lookup.h
diff --git a/Sources/libvorbis/lib/lookup_data.h b/Sources/External/libvorbis/lib/lookup_data.h
similarity index 100%
rename from Sources/libvorbis/lib/lookup_data.h
rename to Sources/External/libvorbis/lib/lookup_data.h
diff --git a/Sources/libvorbis/lib/lookups.pl b/Sources/External/libvorbis/lib/lookups.pl
similarity index 100%
rename from Sources/libvorbis/lib/lookups.pl
rename to Sources/External/libvorbis/lib/lookups.pl
diff --git a/Sources/libvorbis/lib/lpc.c b/Sources/External/libvorbis/lib/lpc.c
similarity index 100%
rename from Sources/libvorbis/lib/lpc.c
rename to Sources/External/libvorbis/lib/lpc.c
diff --git a/Sources/libvorbis/lib/lpc.h b/Sources/External/libvorbis/lib/lpc.h
similarity index 100%
rename from Sources/libvorbis/lib/lpc.h
rename to Sources/External/libvorbis/lib/lpc.h
diff --git a/Sources/libvorbis/lib/lsp.c b/Sources/External/libvorbis/lib/lsp.c
similarity index 100%
rename from Sources/libvorbis/lib/lsp.c
rename to Sources/External/libvorbis/lib/lsp.c
diff --git a/Sources/libvorbis/lib/lsp.h b/Sources/External/libvorbis/lib/lsp.h
similarity index 100%
rename from Sources/libvorbis/lib/lsp.h
rename to Sources/External/libvorbis/lib/lsp.h
diff --git a/Sources/libvorbis/lib/mapping0.c b/Sources/External/libvorbis/lib/mapping0.c
similarity index 100%
rename from Sources/libvorbis/lib/mapping0.c
rename to Sources/External/libvorbis/lib/mapping0.c
diff --git a/Sources/libvorbis/lib/masking.h b/Sources/External/libvorbis/lib/masking.h
similarity index 100%
rename from Sources/libvorbis/lib/masking.h
rename to Sources/External/libvorbis/lib/masking.h
diff --git a/Sources/libvorbis/lib/mdct.c b/Sources/External/libvorbis/lib/mdct.c
similarity index 100%
rename from Sources/libvorbis/lib/mdct.c
rename to Sources/External/libvorbis/lib/mdct.c
diff --git a/Sources/libvorbis/lib/mdct.h b/Sources/External/libvorbis/lib/mdct.h
similarity index 100%
rename from Sources/libvorbis/lib/mdct.h
rename to Sources/External/libvorbis/lib/mdct.h
diff --git a/Sources/libvorbis/lib/misc.h b/Sources/External/libvorbis/lib/misc.h
similarity index 100%
rename from Sources/libvorbis/lib/misc.h
rename to Sources/External/libvorbis/lib/misc.h
diff --git a/Sources/libvorbis/lib/modes/floor_all.h b/Sources/External/libvorbis/lib/modes/floor_all.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/floor_all.h
rename to Sources/External/libvorbis/lib/modes/floor_all.h
diff --git a/Sources/libvorbis/lib/modes/psych_11.h b/Sources/External/libvorbis/lib/modes/psych_11.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/psych_11.h
rename to Sources/External/libvorbis/lib/modes/psych_11.h
diff --git a/Sources/libvorbis/lib/modes/psych_16.h b/Sources/External/libvorbis/lib/modes/psych_16.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/psych_16.h
rename to Sources/External/libvorbis/lib/modes/psych_16.h
diff --git a/Sources/libvorbis/lib/modes/psych_44.h b/Sources/External/libvorbis/lib/modes/psych_44.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/psych_44.h
rename to Sources/External/libvorbis/lib/modes/psych_44.h
diff --git a/Sources/libvorbis/lib/modes/psych_8.h b/Sources/External/libvorbis/lib/modes/psych_8.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/psych_8.h
rename to Sources/External/libvorbis/lib/modes/psych_8.h
diff --git a/Sources/libvorbis/lib/modes/residue_16.h b/Sources/External/libvorbis/lib/modes/residue_16.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/residue_16.h
rename to Sources/External/libvorbis/lib/modes/residue_16.h
diff --git a/Sources/libvorbis/lib/modes/residue_44.h b/Sources/External/libvorbis/lib/modes/residue_44.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/residue_44.h
rename to Sources/External/libvorbis/lib/modes/residue_44.h
diff --git a/Sources/libvorbis/lib/modes/residue_44p51.h b/Sources/External/libvorbis/lib/modes/residue_44p51.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/residue_44p51.h
rename to Sources/External/libvorbis/lib/modes/residue_44p51.h
diff --git a/Sources/libvorbis/lib/modes/residue_44u.h b/Sources/External/libvorbis/lib/modes/residue_44u.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/residue_44u.h
rename to Sources/External/libvorbis/lib/modes/residue_44u.h
diff --git a/Sources/libvorbis/lib/modes/residue_8.h b/Sources/External/libvorbis/lib/modes/residue_8.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/residue_8.h
rename to Sources/External/libvorbis/lib/modes/residue_8.h
diff --git a/Sources/libvorbis/lib/modes/setup_11.h b/Sources/External/libvorbis/lib/modes/setup_11.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_11.h
rename to Sources/External/libvorbis/lib/modes/setup_11.h
diff --git a/Sources/libvorbis/lib/modes/setup_16.h b/Sources/External/libvorbis/lib/modes/setup_16.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_16.h
rename to Sources/External/libvorbis/lib/modes/setup_16.h
diff --git a/Sources/libvorbis/lib/modes/setup_22.h b/Sources/External/libvorbis/lib/modes/setup_22.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_22.h
rename to Sources/External/libvorbis/lib/modes/setup_22.h
diff --git a/Sources/libvorbis/lib/modes/setup_32.h b/Sources/External/libvorbis/lib/modes/setup_32.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_32.h
rename to Sources/External/libvorbis/lib/modes/setup_32.h
diff --git a/Sources/libvorbis/lib/modes/setup_44.h b/Sources/External/libvorbis/lib/modes/setup_44.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_44.h
rename to Sources/External/libvorbis/lib/modes/setup_44.h
diff --git a/Sources/libvorbis/lib/modes/setup_44p51.h b/Sources/External/libvorbis/lib/modes/setup_44p51.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_44p51.h
rename to Sources/External/libvorbis/lib/modes/setup_44p51.h
diff --git a/Sources/libvorbis/lib/modes/setup_44u.h b/Sources/External/libvorbis/lib/modes/setup_44u.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_44u.h
rename to Sources/External/libvorbis/lib/modes/setup_44u.h
diff --git a/Sources/libvorbis/lib/modes/setup_8.h b/Sources/External/libvorbis/lib/modes/setup_8.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_8.h
rename to Sources/External/libvorbis/lib/modes/setup_8.h
diff --git a/Sources/libvorbis/lib/modes/setup_X.h b/Sources/External/libvorbis/lib/modes/setup_X.h
similarity index 100%
rename from Sources/libvorbis/lib/modes/setup_X.h
rename to Sources/External/libvorbis/lib/modes/setup_X.h
diff --git a/Sources/libvorbis/lib/os.h b/Sources/External/libvorbis/lib/os.h
similarity index 100%
rename from Sources/libvorbis/lib/os.h
rename to Sources/External/libvorbis/lib/os.h
diff --git a/Sources/libvorbis/lib/psy.c b/Sources/External/libvorbis/lib/psy.c
similarity index 100%
rename from Sources/libvorbis/lib/psy.c
rename to Sources/External/libvorbis/lib/psy.c
diff --git a/Sources/libvorbis/lib/psy.h b/Sources/External/libvorbis/lib/psy.h
similarity index 100%
rename from Sources/libvorbis/lib/psy.h
rename to Sources/External/libvorbis/lib/psy.h
diff --git a/Sources/libvorbis/lib/psytune.c b/Sources/External/libvorbis/lib/psytune.c
similarity index 100%
rename from Sources/libvorbis/lib/psytune.c
rename to Sources/External/libvorbis/lib/psytune.c
diff --git a/Sources/libvorbis/lib/registry.c b/Sources/External/libvorbis/lib/registry.c
similarity index 100%
rename from Sources/libvorbis/lib/registry.c
rename to Sources/External/libvorbis/lib/registry.c
diff --git a/Sources/libvorbis/lib/registry.h b/Sources/External/libvorbis/lib/registry.h
similarity index 100%
rename from Sources/libvorbis/lib/registry.h
rename to Sources/External/libvorbis/lib/registry.h
diff --git a/Sources/libvorbis/lib/res0.c b/Sources/External/libvorbis/lib/res0.c
similarity index 100%
rename from Sources/libvorbis/lib/res0.c
rename to Sources/External/libvorbis/lib/res0.c
diff --git a/Sources/libvorbis/lib/scales.h b/Sources/External/libvorbis/lib/scales.h
similarity index 100%
rename from Sources/libvorbis/lib/scales.h
rename to Sources/External/libvorbis/lib/scales.h
diff --git a/Sources/libvorbis/lib/sharedbook.c b/Sources/External/libvorbis/lib/sharedbook.c
similarity index 100%
rename from Sources/libvorbis/lib/sharedbook.c
rename to Sources/External/libvorbis/lib/sharedbook.c
diff --git a/Sources/libvorbis/lib/smallft.c b/Sources/External/libvorbis/lib/smallft.c
similarity index 100%
rename from Sources/libvorbis/lib/smallft.c
rename to Sources/External/libvorbis/lib/smallft.c
diff --git a/Sources/libvorbis/lib/smallft.h b/Sources/External/libvorbis/lib/smallft.h
similarity index 100%
rename from Sources/libvorbis/lib/smallft.h
rename to Sources/External/libvorbis/lib/smallft.h
diff --git a/Sources/libvorbis/lib/synthesis.c b/Sources/External/libvorbis/lib/synthesis.c
similarity index 100%
rename from Sources/libvorbis/lib/synthesis.c
rename to Sources/External/libvorbis/lib/synthesis.c
diff --git a/Sources/libvorbis/lib/tone.c b/Sources/External/libvorbis/lib/tone.c
similarity index 100%
rename from Sources/libvorbis/lib/tone.c
rename to Sources/External/libvorbis/lib/tone.c
diff --git a/Sources/libvorbis/lib/vorbisenc.c b/Sources/External/libvorbis/lib/vorbisenc.c
similarity index 100%
rename from Sources/libvorbis/lib/vorbisenc.c
rename to Sources/External/libvorbis/lib/vorbisenc.c
diff --git a/Sources/libvorbis/lib/vorbisfile.c b/Sources/External/libvorbis/lib/vorbisfile.c
similarity index 100%
rename from Sources/libvorbis/lib/vorbisfile.c
rename to Sources/External/libvorbis/lib/vorbisfile.c
diff --git a/Sources/libvorbis/lib/window.c b/Sources/External/libvorbis/lib/window.c
similarity index 100%
rename from Sources/libvorbis/lib/window.c
rename to Sources/External/libvorbis/lib/window.c
diff --git a/Sources/libvorbis/lib/window.h b/Sources/External/libvorbis/lib/window.h
similarity index 100%
rename from Sources/libvorbis/lib/window.h
rename to Sources/External/libvorbis/lib/window.h
diff --git a/Sources/libvorbis/libvorbis_dynamic.vcxproj b/Sources/External/libvorbis/libvorbis_dynamic.vcxproj
similarity index 100%
rename from Sources/libvorbis/libvorbis_dynamic.vcxproj
rename to Sources/External/libvorbis/libvorbis_dynamic.vcxproj
diff --git a/Sources/libvorbis/libvorbisfile_dynamic.vcxproj b/Sources/External/libvorbis/libvorbisfile_dynamic.vcxproj
similarity index 100%
rename from Sources/libvorbis/libvorbisfile_dynamic.vcxproj
rename to Sources/External/libvorbis/libvorbisfile_dynamic.vcxproj
diff --git a/Sources/libvorbis/vorbis.def b/Sources/External/libvorbis/vorbis.def
similarity index 100%
rename from Sources/libvorbis/vorbis.def
rename to Sources/External/libvorbis/vorbis.def
diff --git a/Sources/libvorbis/vorbisenc.def b/Sources/External/libvorbis/vorbisenc.def
similarity index 100%
rename from Sources/libvorbis/vorbisenc.def
rename to Sources/External/libvorbis/vorbisenc.def
diff --git a/Sources/libvorbis/vorbisfile.def b/Sources/External/libvorbis/vorbisfile.def
similarity index 100%
rename from Sources/libvorbis/vorbisfile.def
rename to Sources/External/libvorbis/vorbisfile.def