diff --git a/sc2/src/sc2code/libs/Makeinfo b/sc2/src/libs/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/Makeinfo
rename to sc2/src/libs/Makeinfo
diff --git a/sc2/src/sc2code/libs/alarm.h b/sc2/src/libs/alarm.h
similarity index 100%
rename from sc2/src/sc2code/libs/alarm.h
rename to sc2/src/libs/alarm.h
diff --git a/sc2/src/sc2code/libs/callback.h b/sc2/src/libs/callback.h
similarity index 100%
rename from sc2/src/sc2code/libs/callback.h
rename to sc2/src/libs/callback.h
diff --git a/sc2/src/sc2code/libs/callback/Makeinfo b/sc2/src/libs/callback/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/callback/Makeinfo
rename to sc2/src/libs/callback/Makeinfo
diff --git a/sc2/src/sc2code/libs/callback/alarm.c b/sc2/src/libs/callback/alarm.c
similarity index 100%
rename from sc2/src/sc2code/libs/callback/alarm.c
rename to sc2/src/libs/callback/alarm.c
diff --git a/sc2/src/sc2code/libs/callback/alarm.h b/sc2/src/libs/callback/alarm.h
similarity index 100%
rename from sc2/src/sc2code/libs/callback/alarm.h
rename to sc2/src/libs/callback/alarm.h
diff --git a/sc2/src/sc2code/libs/callback/callback.c b/sc2/src/libs/callback/callback.c
similarity index 100%
rename from sc2/src/sc2code/libs/callback/callback.c
rename to sc2/src/libs/callback/callback.c
diff --git a/sc2/src/sc2code/libs/callback/callback.h b/sc2/src/libs/callback/callback.h
similarity index 100%
rename from sc2/src/sc2code/libs/callback/callback.h
rename to sc2/src/libs/callback/callback.h
diff --git a/sc2/src/sc2code/libs/cdp/Makeinfo b/sc2/src/libs/cdp/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/Makeinfo
rename to sc2/src/libs/cdp/Makeinfo
diff --git a/sc2/src/sc2code/libs/cdp/cdp.c b/sc2/src/libs/cdp/cdp.c
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp.c
rename to sc2/src/libs/cdp/cdp.c
diff --git a/sc2/src/sc2code/libs/cdp/cdp.h b/sc2/src/libs/cdp/cdp.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp.h
rename to sc2/src/libs/cdp/cdp.h
diff --git a/sc2/src/sc2code/libs/cdp/cdp_alli.h b/sc2/src/libs/cdp/cdp_alli.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp_alli.h
rename to sc2/src/libs/cdp/cdp_alli.h
diff --git a/sc2/src/sc2code/libs/cdp/cdp_iio.h b/sc2/src/libs/cdp/cdp_iio.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp_iio.h
rename to sc2/src/libs/cdp/cdp_iio.h
diff --git a/sc2/src/sc2code/libs/cdp/cdp_imem.h b/sc2/src/libs/cdp/cdp_imem.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp_imem.h
rename to sc2/src/libs/cdp/cdp_imem.h
diff --git a/sc2/src/sc2code/libs/cdp/cdp_isnd.h b/sc2/src/libs/cdp/cdp_isnd.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp_isnd.h
rename to sc2/src/libs/cdp/cdp_isnd.h
diff --git a/sc2/src/sc2code/libs/cdp/cdp_ivid.h b/sc2/src/libs/cdp/cdp_ivid.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdp_ivid.h
rename to sc2/src/libs/cdp/cdp_ivid.h
diff --git a/sc2/src/sc2code/libs/cdp/cdpapi.c b/sc2/src/libs/cdp/cdpapi.c
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdpapi.c
rename to sc2/src/libs/cdp/cdpapi.c
diff --git a/sc2/src/sc2code/libs/cdp/cdpapi.h b/sc2/src/libs/cdp/cdpapi.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdpapi.h
rename to sc2/src/libs/cdp/cdpapi.h
diff --git a/sc2/src/sc2code/libs/cdp/cdpint.h b/sc2/src/libs/cdp/cdpint.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdpint.h
rename to sc2/src/libs/cdp/cdpint.h
diff --git a/sc2/src/sc2code/libs/cdp/cdpmod.h b/sc2/src/libs/cdp/cdpmod.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/cdpmod.h
rename to sc2/src/libs/cdp/cdpmod.h
diff --git a/sc2/src/sc2code/libs/cdp/windl.c b/sc2/src/libs/cdp/windl.c
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/windl.c
rename to sc2/src/libs/cdp/windl.c
diff --git a/sc2/src/sc2code/libs/cdp/windl.h b/sc2/src/libs/cdp/windl.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdp/windl.h
rename to sc2/src/libs/cdp/windl.h
diff --git a/sc2/src/sc2code/libs/cdplib.h b/sc2/src/libs/cdplib.h
similarity index 100%
rename from sc2/src/sc2code/libs/cdplib.h
rename to sc2/src/libs/cdplib.h
diff --git a/sc2/src/sc2code/libs/compiler.h b/sc2/src/libs/compiler.h
similarity index 100%
rename from sc2/src/sc2code/libs/compiler.h
rename to sc2/src/libs/compiler.h
diff --git a/sc2/src/sc2code/libs/declib.h b/sc2/src/libs/declib.h
similarity index 100%
rename from sc2/src/sc2code/libs/declib.h
rename to sc2/src/libs/declib.h
diff --git a/sc2/src/sc2code/libs/decomp/Makeinfo b/sc2/src/libs/decomp/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/decomp/Makeinfo
rename to sc2/src/libs/decomp/Makeinfo
diff --git a/sc2/src/sc2code/libs/decomp/lzdecode.c b/sc2/src/libs/decomp/lzdecode.c
similarity index 100%
rename from sc2/src/sc2code/libs/decomp/lzdecode.c
rename to sc2/src/libs/decomp/lzdecode.c
diff --git a/sc2/src/sc2code/libs/decomp/lzencode.c b/sc2/src/libs/decomp/lzencode.c
similarity index 100%
rename from sc2/src/sc2code/libs/decomp/lzencode.c
rename to sc2/src/libs/decomp/lzencode.c
diff --git a/sc2/src/sc2code/libs/decomp/lzh.h b/sc2/src/libs/decomp/lzh.h
similarity index 100%
rename from sc2/src/sc2code/libs/decomp/lzh.h
rename to sc2/src/libs/decomp/lzh.h
diff --git a/sc2/src/sc2code/libs/decomp/update.c b/sc2/src/libs/decomp/update.c
similarity index 100%
rename from sc2/src/sc2code/libs/decomp/update.c
rename to sc2/src/libs/decomp/update.c
diff --git a/sc2/src/sc2code/libs/file.h b/sc2/src/libs/file.h
similarity index 100%
rename from sc2/src/sc2code/libs/file.h
rename to sc2/src/libs/file.h
diff --git a/sc2/src/sc2code/libs/file/Makeinfo b/sc2/src/libs/file/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/file/Makeinfo
rename to sc2/src/libs/file/Makeinfo
diff --git a/sc2/src/sc2code/libs/file/dirs.c b/sc2/src/libs/file/dirs.c
similarity index 100%
rename from sc2/src/sc2code/libs/file/dirs.c
rename to sc2/src/libs/file/dirs.c
diff --git a/sc2/src/sc2code/libs/file/files.c b/sc2/src/libs/file/files.c
similarity index 100%
rename from sc2/src/sc2code/libs/file/files.c
rename to sc2/src/libs/file/files.c
diff --git a/sc2/src/sc2code/libs/file/filintrn.h b/sc2/src/libs/file/filintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/file/filintrn.h
rename to sc2/src/libs/file/filintrn.h
diff --git a/sc2/src/sc2code/libs/file/temp.c b/sc2/src/libs/file/temp.c
similarity index 100%
rename from sc2/src/sc2code/libs/file/temp.c
rename to sc2/src/libs/file/temp.c
diff --git a/sc2/src/sc2code/libs/gfxlib.h b/sc2/src/libs/gfxlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/gfxlib.h
rename to sc2/src/libs/gfxlib.h
diff --git a/sc2/src/sc2code/libs/graphics/Makeinfo b/sc2/src/libs/graphics/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/Makeinfo
rename to sc2/src/libs/graphics/Makeinfo
diff --git a/sc2/src/sc2code/libs/graphics/boxint.c b/sc2/src/libs/graphics/boxint.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/boxint.c
rename to sc2/src/libs/graphics/boxint.c
diff --git a/sc2/src/sc2code/libs/graphics/clipline.c b/sc2/src/libs/graphics/clipline.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/clipline.c
rename to sc2/src/libs/graphics/clipline.c
diff --git a/sc2/src/sc2code/libs/graphics/cmap.c b/sc2/src/libs/graphics/cmap.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/cmap.c
rename to sc2/src/libs/graphics/cmap.c
diff --git a/sc2/src/sc2code/libs/graphics/cmap.h b/sc2/src/libs/graphics/cmap.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/cmap.h
rename to sc2/src/libs/graphics/cmap.h
diff --git a/sc2/src/sc2code/libs/graphics/context.c b/sc2/src/libs/graphics/context.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/context.c
rename to sc2/src/libs/graphics/context.c
diff --git a/sc2/src/sc2code/libs/graphics/context.h b/sc2/src/libs/graphics/context.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/context.h
rename to sc2/src/libs/graphics/context.h
diff --git a/sc2/src/sc2code/libs/graphics/display.h b/sc2/src/libs/graphics/display.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/display.h
rename to sc2/src/libs/graphics/display.h
diff --git a/sc2/src/sc2code/libs/graphics/drawable.c b/sc2/src/libs/graphics/drawable.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/drawable.c
rename to sc2/src/libs/graphics/drawable.c
diff --git a/sc2/src/sc2code/libs/graphics/drawable.h b/sc2/src/libs/graphics/drawable.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/drawable.h
rename to sc2/src/libs/graphics/drawable.h
diff --git a/sc2/src/sc2code/libs/graphics/drawcmd.h b/sc2/src/libs/graphics/drawcmd.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/drawcmd.h
rename to sc2/src/libs/graphics/drawcmd.h
diff --git a/sc2/src/sc2code/libs/graphics/filegfx.c b/sc2/src/libs/graphics/filegfx.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/filegfx.c
rename to sc2/src/libs/graphics/filegfx.c
diff --git a/sc2/src/sc2code/libs/graphics/font.c b/sc2/src/libs/graphics/font.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/font.c
rename to sc2/src/libs/graphics/font.c
diff --git a/sc2/src/sc2code/libs/graphics/font.h b/sc2/src/libs/graphics/font.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/font.h
rename to sc2/src/libs/graphics/font.h
diff --git a/sc2/src/sc2code/libs/graphics/frame.c b/sc2/src/libs/graphics/frame.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/frame.c
rename to sc2/src/libs/graphics/frame.c
diff --git a/sc2/src/sc2code/libs/graphics/gfx_common.c b/sc2/src/libs/graphics/gfx_common.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/gfx_common.c
rename to sc2/src/libs/graphics/gfx_common.c
diff --git a/sc2/src/sc2code/libs/graphics/gfx_common.h b/sc2/src/libs/graphics/gfx_common.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/gfx_common.h
rename to sc2/src/libs/graphics/gfx_common.h
diff --git a/sc2/src/sc2code/libs/graphics/gfxintrn.h b/sc2/src/libs/graphics/gfxintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/gfxintrn.h
rename to sc2/src/libs/graphics/gfxintrn.h
diff --git a/sc2/src/sc2code/libs/graphics/gfxother.h b/sc2/src/libs/graphics/gfxother.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/gfxother.h
rename to sc2/src/libs/graphics/gfxother.h
diff --git a/sc2/src/sc2code/libs/graphics/intersec.c b/sc2/src/libs/graphics/intersec.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/intersec.c
rename to sc2/src/libs/graphics/intersec.c
diff --git a/sc2/src/sc2code/libs/graphics/loaddisp.c b/sc2/src/libs/graphics/loaddisp.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/loaddisp.c
rename to sc2/src/libs/graphics/loaddisp.c
diff --git a/sc2/src/sc2code/libs/graphics/pixmap.c b/sc2/src/libs/graphics/pixmap.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/pixmap.c
rename to sc2/src/libs/graphics/pixmap.c
diff --git a/sc2/src/sc2code/libs/graphics/prim.h b/sc2/src/libs/graphics/prim.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/prim.h
rename to sc2/src/libs/graphics/prim.h
diff --git a/sc2/src/sc2code/libs/graphics/resgfx.c b/sc2/src/libs/graphics/resgfx.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/resgfx.c
rename to sc2/src/libs/graphics/resgfx.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers.c b/sc2/src/libs/graphics/sdl/2xscalers.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers.c
rename to sc2/src/libs/graphics/sdl/2xscalers.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers.h b/sc2/src/libs/graphics/sdl/2xscalers.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers.h
rename to sc2/src/libs/graphics/sdl/2xscalers.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers_3dnow.c b/sc2/src/libs/graphics/sdl/2xscalers_3dnow.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers_3dnow.c
rename to sc2/src/libs/graphics/sdl/2xscalers_3dnow.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers_mmx.c b/sc2/src/libs/graphics/sdl/2xscalers_mmx.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers_mmx.c
rename to sc2/src/libs/graphics/sdl/2xscalers_mmx.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers_mmx.h b/sc2/src/libs/graphics/sdl/2xscalers_mmx.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers_mmx.h
rename to sc2/src/libs/graphics/sdl/2xscalers_mmx.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/2xscalers_sse.c b/sc2/src/libs/graphics/sdl/2xscalers_sse.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/2xscalers_sse.c
rename to sc2/src/libs/graphics/sdl/2xscalers_sse.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c b/sc2/src/libs/graphics/sdl/3do_blt.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/3do_blt.c
rename to sc2/src/libs/graphics/sdl/3do_blt.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c b/sc2/src/libs/graphics/sdl/3do_funcs.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c
rename to sc2/src/libs/graphics/sdl/3do_funcs.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c b/sc2/src/libs/graphics/sdl/3do_getbody.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c
rename to sc2/src/libs/graphics/sdl/3do_getbody.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/Makeinfo b/sc2/src/libs/graphics/sdl/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/Makeinfo
rename to sc2/src/libs/graphics/sdl/Makeinfo
diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.c b/sc2/src/libs/graphics/sdl/bbox.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/bbox.c
rename to sc2/src/libs/graphics/sdl/bbox.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.h b/sc2/src/libs/graphics/sdl/bbox.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/bbox.h
rename to sc2/src/libs/graphics/sdl/bbox.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/biadv2x.c b/sc2/src/libs/graphics/sdl/biadv2x.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/biadv2x.c
rename to sc2/src/libs/graphics/sdl/biadv2x.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/bilinear2x.c b/sc2/src/libs/graphics/sdl/bilinear2x.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/bilinear2x.c
rename to sc2/src/libs/graphics/sdl/bilinear2x.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/canvas.c b/sc2/src/libs/graphics/sdl/canvas.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/canvas.c
rename to sc2/src/libs/graphics/sdl/canvas.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/dcqueue.c b/sc2/src/libs/graphics/sdl/dcqueue.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/dcqueue.c
rename to sc2/src/libs/graphics/sdl/dcqueue.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/dcqueue.h b/sc2/src/libs/graphics/sdl/dcqueue.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/dcqueue.h
rename to sc2/src/libs/graphics/sdl/dcqueue.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/hq2x.c b/sc2/src/libs/graphics/sdl/hq2x.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/hq2x.c
rename to sc2/src/libs/graphics/sdl/hq2x.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/nearest2x.c b/sc2/src/libs/graphics/sdl/nearest2x.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/nearest2x.c
rename to sc2/src/libs/graphics/sdl/nearest2x.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/opengl.c b/sc2/src/libs/graphics/sdl/opengl.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/opengl.c
rename to sc2/src/libs/graphics/sdl/opengl.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/opengl.h b/sc2/src/libs/graphics/sdl/opengl.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/opengl.h
rename to sc2/src/libs/graphics/sdl/opengl.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/primitives.c b/sc2/src/libs/graphics/sdl/primitives.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/primitives.c
rename to sc2/src/libs/graphics/sdl/primitives.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/primitives.h b/sc2/src/libs/graphics/sdl/primitives.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/primitives.h
rename to sc2/src/libs/graphics/sdl/primitives.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/pure.c b/sc2/src/libs/graphics/sdl/pure.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/pure.c
rename to sc2/src/libs/graphics/sdl/pure.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/pure.h b/sc2/src/libs/graphics/sdl/pure.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/pure.h
rename to sc2/src/libs/graphics/sdl/pure.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/rndzoom.c b/sc2/src/libs/graphics/sdl/rndzoom.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/rndzoom.c
rename to sc2/src/libs/graphics/sdl/rndzoom.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/rotozoom.c b/sc2/src/libs/graphics/sdl/rotozoom.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/rotozoom.c
rename to sc2/src/libs/graphics/sdl/rotozoom.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/rotozoom.h b/sc2/src/libs/graphics/sdl/rotozoom.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/rotozoom.h
rename to sc2/src/libs/graphics/sdl/rotozoom.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/scaleint.h b/sc2/src/libs/graphics/sdl/scaleint.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/scaleint.h
rename to sc2/src/libs/graphics/sdl/scaleint.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/scalemmx.h b/sc2/src/libs/graphics/sdl/scalemmx.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/scalemmx.h
rename to sc2/src/libs/graphics/sdl/scalemmx.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/scalers.c b/sc2/src/libs/graphics/sdl/scalers.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/scalers.c
rename to sc2/src/libs/graphics/sdl/scalers.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/scalers.h b/sc2/src/libs/graphics/sdl/scalers.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/scalers.h
rename to sc2/src/libs/graphics/sdl/scalers.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/libs/graphics/sdl/sdl_common.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
rename to sc2/src/libs/graphics/sdl/sdl_common.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.h b/sc2/src/libs/graphics/sdl/sdl_common.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/sdl_common.h
rename to sc2/src/libs/graphics/sdl/sdl_common.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdluio.c b/sc2/src/libs/graphics/sdl/sdluio.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/sdluio.c
rename to sc2/src/libs/graphics/sdl/sdluio.c
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdluio.h b/sc2/src/libs/graphics/sdl/sdluio.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/sdluio.h
rename to sc2/src/libs/graphics/sdl/sdluio.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/triscan2x.c b/sc2/src/libs/graphics/sdl/triscan2x.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/sdl/triscan2x.c
rename to sc2/src/libs/graphics/sdl/triscan2x.c
diff --git a/sc2/src/sc2code/libs/graphics/tfb_draw.c b/sc2/src/libs/graphics/tfb_draw.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/tfb_draw.c
rename to sc2/src/libs/graphics/tfb_draw.c
diff --git a/sc2/src/sc2code/libs/graphics/tfb_draw.h b/sc2/src/libs/graphics/tfb_draw.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/tfb_draw.h
rename to sc2/src/libs/graphics/tfb_draw.h
diff --git a/sc2/src/sc2code/libs/graphics/tfb_prim.c b/sc2/src/libs/graphics/tfb_prim.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/tfb_prim.c
rename to sc2/src/libs/graphics/tfb_prim.c
diff --git a/sc2/src/sc2code/libs/graphics/tfb_prim.h b/sc2/src/libs/graphics/tfb_prim.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/tfb_prim.h
rename to sc2/src/libs/graphics/tfb_prim.h
diff --git a/sc2/src/sc2code/libs/graphics/widgets.c b/sc2/src/libs/graphics/widgets.c
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/widgets.c
rename to sc2/src/libs/graphics/widgets.c
diff --git a/sc2/src/sc2code/libs/graphics/widgets.h b/sc2/src/libs/graphics/widgets.h
similarity index 100%
rename from sc2/src/sc2code/libs/graphics/widgets.h
rename to sc2/src/libs/graphics/widgets.h
diff --git a/sc2/src/sc2code/libs/heap.h b/sc2/src/libs/heap.h
similarity index 100%
rename from sc2/src/sc2code/libs/heap.h
rename to sc2/src/libs/heap.h
diff --git a/sc2/src/sc2code/libs/heap/Makeinfo b/sc2/src/libs/heap/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/heap/Makeinfo
rename to sc2/src/libs/heap/Makeinfo
diff --git a/sc2/src/sc2code/libs/heap/heap.c b/sc2/src/libs/heap/heap.c
similarity index 100%
rename from sc2/src/sc2code/libs/heap/heap.c
rename to sc2/src/libs/heap/heap.c
diff --git a/sc2/src/sc2code/libs/heap/heap.h b/sc2/src/libs/heap/heap.h
similarity index 100%
rename from sc2/src/sc2code/libs/heap/heap.h
rename to sc2/src/libs/heap/heap.h
diff --git a/sc2/src/sc2code/libs/inplib.h b/sc2/src/libs/inplib.h
similarity index 100%
rename from sc2/src/sc2code/libs/inplib.h
rename to sc2/src/libs/inplib.h
diff --git a/sc2/src/sc2code/libs/input/Makeinfo b/sc2/src/libs/input/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/input/Makeinfo
rename to sc2/src/libs/input/Makeinfo
diff --git a/sc2/src/sc2code/libs/input/inpintrn.h b/sc2/src/libs/input/inpintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/input/inpintrn.h
rename to sc2/src/libs/input/inpintrn.h
diff --git a/sc2/src/sc2code/libs/input/input_common.c b/sc2/src/libs/input/input_common.c
similarity index 100%
rename from sc2/src/sc2code/libs/input/input_common.c
rename to sc2/src/libs/input/input_common.c
diff --git a/sc2/src/sc2code/libs/input/input_common.h b/sc2/src/libs/input/input_common.h
similarity index 100%
rename from sc2/src/sc2code/libs/input/input_common.h
rename to sc2/src/libs/input/input_common.h
diff --git a/sc2/src/sc2code/libs/input/sdl/Makeinfo b/sc2/src/libs/input/sdl/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/Makeinfo
rename to sc2/src/libs/input/sdl/Makeinfo
diff --git a/sc2/src/sc2code/libs/input/sdl/input.c b/sc2/src/libs/input/sdl/input.c
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/input.c
rename to sc2/src/libs/input/sdl/input.c
diff --git a/sc2/src/sc2code/libs/input/sdl/input.h b/sc2/src/libs/input/sdl/input.h
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/input.h
rename to sc2/src/libs/input/sdl/input.h
diff --git a/sc2/src/sc2code/libs/input/sdl/keynames.c b/sc2/src/libs/input/sdl/keynames.c
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/keynames.c
rename to sc2/src/libs/input/sdl/keynames.c
diff --git a/sc2/src/sc2code/libs/input/sdl/keynames.h b/sc2/src/libs/input/sdl/keynames.h
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/keynames.h
rename to sc2/src/libs/input/sdl/keynames.h
diff --git a/sc2/src/sc2code/libs/input/sdl/vcontrol.c b/sc2/src/libs/input/sdl/vcontrol.c
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/vcontrol.c
rename to sc2/src/libs/input/sdl/vcontrol.c
diff --git a/sc2/src/sc2code/libs/input/sdl/vcontrol.h b/sc2/src/libs/input/sdl/vcontrol.h
similarity index 100%
rename from sc2/src/sc2code/libs/input/sdl/vcontrol.h
rename to sc2/src/libs/input/sdl/vcontrol.h
diff --git a/sc2/src/sc2code/libs/list.h b/sc2/src/libs/list.h
similarity index 100%
rename from sc2/src/sc2code/libs/list.h
rename to sc2/src/libs/list.h
diff --git a/sc2/src/sc2code/libs/list/Makeinfo b/sc2/src/libs/list/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/list/Makeinfo
rename to sc2/src/libs/list/Makeinfo
diff --git a/sc2/src/sc2code/libs/list/list.c b/sc2/src/libs/list/list.c
similarity index 100%
rename from sc2/src/sc2code/libs/list/list.c
rename to sc2/src/libs/list/list.c
diff --git a/sc2/src/sc2code/libs/list/list.h b/sc2/src/libs/list/list.h
similarity index 100%
rename from sc2/src/sc2code/libs/list/list.h
rename to sc2/src/libs/list/list.h
diff --git a/sc2/src/sc2code/libs/log.h b/sc2/src/libs/log.h
similarity index 100%
rename from sc2/src/sc2code/libs/log.h
rename to sc2/src/libs/log.h
diff --git a/sc2/src/sc2code/libs/log/Makeinfo b/sc2/src/libs/log/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/log/Makeinfo
rename to sc2/src/libs/log/Makeinfo
diff --git a/sc2/src/sc2code/libs/log/uqmlog.c b/sc2/src/libs/log/uqmlog.c
similarity index 100%
rename from sc2/src/sc2code/libs/log/uqmlog.c
rename to sc2/src/libs/log/uqmlog.c
diff --git a/sc2/src/sc2code/libs/log/uqmlog.h b/sc2/src/libs/log/uqmlog.h
similarity index 100%
rename from sc2/src/sc2code/libs/log/uqmlog.h
rename to sc2/src/libs/log/uqmlog.h
diff --git a/sc2/src/sc2code/libs/math/Makeinfo b/sc2/src/libs/math/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/math/Makeinfo
rename to sc2/src/libs/math/Makeinfo
diff --git a/sc2/src/sc2code/libs/math/mthintrn.h b/sc2/src/libs/math/mthintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/math/mthintrn.h
rename to sc2/src/libs/math/mthintrn.h
diff --git a/sc2/src/sc2code/libs/math/random.c b/sc2/src/libs/math/random.c
similarity index 100%
rename from sc2/src/sc2code/libs/math/random.c
rename to sc2/src/libs/math/random.c
diff --git a/sc2/src/sc2code/libs/math/random.h b/sc2/src/libs/math/random.h
similarity index 100%
rename from sc2/src/sc2code/libs/math/random.h
rename to sc2/src/libs/math/random.h
diff --git a/sc2/src/sc2code/libs/math/random2.c b/sc2/src/libs/math/random2.c
similarity index 100%
rename from sc2/src/sc2code/libs/math/random2.c
rename to sc2/src/libs/math/random2.c
diff --git a/sc2/src/sc2code/libs/math/sqrt.c b/sc2/src/libs/math/sqrt.c
similarity index 100%
rename from sc2/src/sc2code/libs/math/sqrt.c
rename to sc2/src/libs/math/sqrt.c
diff --git a/sc2/src/sc2code/libs/mathlib.h b/sc2/src/libs/mathlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/mathlib.h
rename to sc2/src/libs/mathlib.h
diff --git a/sc2/src/sc2code/libs/md5.h b/sc2/src/libs/md5.h
similarity index 100%
rename from sc2/src/sc2code/libs/md5.h
rename to sc2/src/libs/md5.h
diff --git a/sc2/src/sc2code/libs/md5/Makeinfo b/sc2/src/libs/md5/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/md5/Makeinfo
rename to sc2/src/libs/md5/Makeinfo
diff --git a/sc2/src/sc2code/libs/md5/README b/sc2/src/libs/md5/README
similarity index 100%
rename from sc2/src/sc2code/libs/md5/README
rename to sc2/src/libs/md5/README
diff --git a/sc2/src/sc2code/libs/md5/md5.c b/sc2/src/libs/md5/md5.c
similarity index 100%
rename from sc2/src/sc2code/libs/md5/md5.c
rename to sc2/src/libs/md5/md5.c
diff --git a/sc2/src/sc2code/libs/md5/md5.h b/sc2/src/libs/md5/md5.h
similarity index 100%
rename from sc2/src/sc2code/libs/md5/md5.h
rename to sc2/src/libs/md5/md5.h
diff --git a/sc2/src/sc2code/libs/memlib.h b/sc2/src/libs/memlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/memlib.h
rename to sc2/src/libs/memlib.h
diff --git a/sc2/src/sc2code/libs/memory/Makeinfo b/sc2/src/libs/memory/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/memory/Makeinfo
rename to sc2/src/libs/memory/Makeinfo
diff --git a/sc2/src/sc2code/libs/memory/w_memlib.c b/sc2/src/libs/memory/w_memlib.c
similarity index 100%
rename from sc2/src/sc2code/libs/memory/w_memlib.c
rename to sc2/src/libs/memory/w_memlib.c
diff --git a/sc2/src/sc2code/libs/mikmod/AUTHORS b/sc2/src/libs/mikmod/AUTHORS
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/AUTHORS
rename to sc2/src/libs/mikmod/AUTHORS
diff --git a/sc2/src/sc2code/libs/mikmod/Makeinfo b/sc2/src/libs/mikmod/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/Makeinfo
rename to sc2/src/libs/mikmod/Makeinfo
diff --git a/sc2/src/sc2code/libs/mikmod/README b/sc2/src/libs/mikmod/README
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/README
rename to sc2/src/libs/mikmod/README
diff --git a/sc2/src/sc2code/libs/mikmod/drv_nos.c b/sc2/src/libs/mikmod/drv_nos.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/drv_nos.c
rename to sc2/src/libs/mikmod/drv_nos.c
diff --git a/sc2/src/sc2code/libs/mikmod/load_it.c b/sc2/src/libs/mikmod/load_it.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/load_it.c
rename to sc2/src/libs/mikmod/load_it.c
diff --git a/sc2/src/sc2code/libs/mikmod/load_mod.c b/sc2/src/libs/mikmod/load_mod.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/load_mod.c
rename to sc2/src/libs/mikmod/load_mod.c
diff --git a/sc2/src/sc2code/libs/mikmod/load_s3m.c b/sc2/src/libs/mikmod/load_s3m.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/load_s3m.c
rename to sc2/src/libs/mikmod/load_s3m.c
diff --git a/sc2/src/sc2code/libs/mikmod/load_stm.c b/sc2/src/libs/mikmod/load_stm.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/load_stm.c
rename to sc2/src/libs/mikmod/load_stm.c
diff --git a/sc2/src/sc2code/libs/mikmod/load_xm.c b/sc2/src/libs/mikmod/load_xm.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/load_xm.c
rename to sc2/src/libs/mikmod/load_xm.c
diff --git a/sc2/src/sc2code/libs/mikmod/mdreg.c b/sc2/src/libs/mikmod/mdreg.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mdreg.c
rename to sc2/src/libs/mikmod/mdreg.c
diff --git a/sc2/src/sc2code/libs/mikmod/mdriver.c b/sc2/src/libs/mikmod/mdriver.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mdriver.c
rename to sc2/src/libs/mikmod/mdriver.c
diff --git a/sc2/src/sc2code/libs/mikmod/mikmod.h b/sc2/src/libs/mikmod/mikmod.h
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mikmod.h
rename to sc2/src/libs/mikmod/mikmod.h
diff --git a/sc2/src/sc2code/libs/mikmod/mikmod_build.h b/sc2/src/libs/mikmod/mikmod_build.h
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mikmod_build.h
rename to sc2/src/libs/mikmod/mikmod_build.h
diff --git a/sc2/src/sc2code/libs/mikmod/mikmod_internals.h b/sc2/src/libs/mikmod/mikmod_internals.h
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mikmod_internals.h
rename to sc2/src/libs/mikmod/mikmod_internals.h
diff --git a/sc2/src/sc2code/libs/mikmod/mloader.c b/sc2/src/libs/mikmod/mloader.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mloader.c
rename to sc2/src/libs/mikmod/mloader.c
diff --git a/sc2/src/sc2code/libs/mikmod/mlreg.c b/sc2/src/libs/mikmod/mlreg.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mlreg.c
rename to sc2/src/libs/mikmod/mlreg.c
diff --git a/sc2/src/sc2code/libs/mikmod/mlutil.c b/sc2/src/libs/mikmod/mlutil.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mlutil.c
rename to sc2/src/libs/mikmod/mlutil.c
diff --git a/sc2/src/sc2code/libs/mikmod/mmalloc.c b/sc2/src/libs/mikmod/mmalloc.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mmalloc.c
rename to sc2/src/libs/mikmod/mmalloc.c
diff --git a/sc2/src/sc2code/libs/mikmod/mmerror.c b/sc2/src/libs/mikmod/mmerror.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mmerror.c
rename to sc2/src/libs/mikmod/mmerror.c
diff --git a/sc2/src/sc2code/libs/mikmod/mmio.c b/sc2/src/libs/mikmod/mmio.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mmio.c
rename to sc2/src/libs/mikmod/mmio.c
diff --git a/sc2/src/sc2code/libs/mikmod/mplayer.c b/sc2/src/libs/mikmod/mplayer.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mplayer.c
rename to sc2/src/libs/mikmod/mplayer.c
diff --git a/sc2/src/sc2code/libs/mikmod/munitrk.c b/sc2/src/libs/mikmod/munitrk.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/munitrk.c
rename to sc2/src/libs/mikmod/munitrk.c
diff --git a/sc2/src/sc2code/libs/mikmod/mwav.c b/sc2/src/libs/mikmod/mwav.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/mwav.c
rename to sc2/src/libs/mikmod/mwav.c
diff --git a/sc2/src/sc2code/libs/mikmod/npertab.c b/sc2/src/libs/mikmod/npertab.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/npertab.c
rename to sc2/src/libs/mikmod/npertab.c
diff --git a/sc2/src/sc2code/libs/mikmod/sloader.c b/sc2/src/libs/mikmod/sloader.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/sloader.c
rename to sc2/src/libs/mikmod/sloader.c
diff --git a/sc2/src/sc2code/libs/mikmod/virtch.c b/sc2/src/libs/mikmod/virtch.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/virtch.c
rename to sc2/src/libs/mikmod/virtch.c
diff --git a/sc2/src/sc2code/libs/mikmod/virtch2.c b/sc2/src/libs/mikmod/virtch2.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/virtch2.c
rename to sc2/src/libs/mikmod/virtch2.c
diff --git a/sc2/src/sc2code/libs/mikmod/virtch_common.c b/sc2/src/libs/mikmod/virtch_common.c
similarity index 100%
rename from sc2/src/sc2code/libs/mikmod/virtch_common.c
rename to sc2/src/libs/mikmod/virtch_common.c
diff --git a/sc2/src/sc2code/libs/misc.h b/sc2/src/libs/misc.h
similarity index 100%
rename from sc2/src/sc2code/libs/misc.h
rename to sc2/src/libs/misc.h
diff --git a/sc2/src/sc2code/libs/net.h b/sc2/src/libs/net.h
similarity index 100%
rename from sc2/src/sc2code/libs/net.h
rename to sc2/src/libs/net.h
diff --git a/sc2/src/sc2code/libs/network/FILES b/sc2/src/libs/network/FILES
similarity index 100%
rename from sc2/src/sc2code/libs/network/FILES
rename to sc2/src/libs/network/FILES
diff --git a/sc2/src/sc2code/libs/network/Makeinfo b/sc2/src/libs/network/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/network/Makeinfo
rename to sc2/src/libs/network/Makeinfo
diff --git a/sc2/src/sc2code/libs/network/bytesex.h b/sc2/src/libs/network/bytesex.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/bytesex.h
rename to sc2/src/libs/network/bytesex.h
diff --git a/sc2/src/sc2code/libs/network/connect/Makeinfo b/sc2/src/libs/network/connect/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/Makeinfo
rename to sc2/src/libs/network/connect/Makeinfo
diff --git a/sc2/src/sc2code/libs/network/connect/connect.c b/sc2/src/libs/network/connect/connect.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/connect.c
rename to sc2/src/libs/network/connect/connect.c
diff --git a/sc2/src/sc2code/libs/network/connect/connect.h b/sc2/src/libs/network/connect/connect.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/connect.h
rename to sc2/src/libs/network/connect/connect.h
diff --git a/sc2/src/sc2code/libs/network/connect/listen.c b/sc2/src/libs/network/connect/listen.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/listen.c
rename to sc2/src/libs/network/connect/listen.c
diff --git a/sc2/src/sc2code/libs/network/connect/listen.h b/sc2/src/libs/network/connect/listen.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/listen.h
rename to sc2/src/libs/network/connect/listen.h
diff --git a/sc2/src/sc2code/libs/network/connect/resolve.c b/sc2/src/libs/network/connect/resolve.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/resolve.c
rename to sc2/src/libs/network/connect/resolve.c
diff --git a/sc2/src/sc2code/libs/network/connect/resolve.h b/sc2/src/libs/network/connect/resolve.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/connect/resolve.h
rename to sc2/src/libs/network/connect/resolve.h
diff --git a/sc2/src/sc2code/libs/network/netmanager/Makeinfo b/sc2/src/libs/network/netmanager/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/Makeinfo
rename to sc2/src/libs/network/netmanager/Makeinfo
diff --git a/sc2/src/sc2code/libs/network/netmanager/ndesc.c b/sc2/src/libs/network/netmanager/ndesc.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/ndesc.c
rename to sc2/src/libs/network/netmanager/ndesc.c
diff --git a/sc2/src/sc2code/libs/network/netmanager/ndesc.h b/sc2/src/libs/network/netmanager/ndesc.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/ndesc.h
rename to sc2/src/libs/network/netmanager/ndesc.h
diff --git a/sc2/src/sc2code/libs/network/netmanager/ndindex.ci b/sc2/src/libs/network/netmanager/ndindex.ci
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/ndindex.ci
rename to sc2/src/libs/network/netmanager/ndindex.ci
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager.h b/sc2/src/libs/network/netmanager/netmanager.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager.h
rename to sc2/src/libs/network/netmanager/netmanager.h
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c b/sc2/src/libs/network/netmanager/netmanager_bsd.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.c
rename to sc2/src/libs/network/netmanager/netmanager_bsd.c
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.h b/sc2/src/libs/network/netmanager/netmanager_bsd.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager_bsd.h
rename to sc2/src/libs/network/netmanager/netmanager_bsd.h
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_common.ci b/sc2/src/libs/network/netmanager/netmanager_common.ci
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager_common.ci
rename to sc2/src/libs/network/netmanager/netmanager_common.ci
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_win.c b/sc2/src/libs/network/netmanager/netmanager_win.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager_win.c
rename to sc2/src/libs/network/netmanager/netmanager_win.c
diff --git a/sc2/src/sc2code/libs/network/netmanager/netmanager_win.h b/sc2/src/libs/network/netmanager/netmanager_win.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/netmanager/netmanager_win.h
rename to sc2/src/libs/network/netmanager/netmanager_win.h
diff --git a/sc2/src/sc2code/libs/network/netport.c b/sc2/src/libs/network/netport.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/netport.c
rename to sc2/src/libs/network/netport.c
diff --git a/sc2/src/sc2code/libs/network/netport.h b/sc2/src/libs/network/netport.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/netport.h
rename to sc2/src/libs/network/netport.h
diff --git a/sc2/src/sc2code/libs/network/network.h b/sc2/src/libs/network/network.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/network.h
rename to sc2/src/libs/network/network.h
diff --git a/sc2/src/sc2code/libs/network/network_bsd.c b/sc2/src/libs/network/network_bsd.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/network_bsd.c
rename to sc2/src/libs/network/network_bsd.c
diff --git a/sc2/src/sc2code/libs/network/network_win.c b/sc2/src/libs/network/network_win.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/network_win.c
rename to sc2/src/libs/network/network_win.c
diff --git a/sc2/src/sc2code/libs/network/socket/Makeinfo b/sc2/src/libs/network/socket/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/Makeinfo
rename to sc2/src/libs/network/socket/Makeinfo
diff --git a/sc2/src/sc2code/libs/network/socket/socket.c b/sc2/src/libs/network/socket/socket.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket.c
rename to sc2/src/libs/network/socket/socket.c
diff --git a/sc2/src/sc2code/libs/network/socket/socket.h b/sc2/src/libs/network/socket/socket.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket.h
rename to sc2/src/libs/network/socket/socket.h
diff --git a/sc2/src/sc2code/libs/network/socket/socket_bsd.c b/sc2/src/libs/network/socket/socket_bsd.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket_bsd.c
rename to sc2/src/libs/network/socket/socket_bsd.c
diff --git a/sc2/src/sc2code/libs/network/socket/socket_bsd.h b/sc2/src/libs/network/socket/socket_bsd.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket_bsd.h
rename to sc2/src/libs/network/socket/socket_bsd.h
diff --git a/sc2/src/sc2code/libs/network/socket/socket_win.c b/sc2/src/libs/network/socket/socket_win.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket_win.c
rename to sc2/src/libs/network/socket/socket_win.c
diff --git a/sc2/src/sc2code/libs/network/socket/socket_win.h b/sc2/src/libs/network/socket/socket_win.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/socket/socket_win.h
rename to sc2/src/libs/network/socket/socket_win.h
diff --git a/sc2/src/sc2code/libs/network/wspiapiwrap.c b/sc2/src/libs/network/wspiapiwrap.c
similarity index 100%
rename from sc2/src/sc2code/libs/network/wspiapiwrap.c
rename to sc2/src/libs/network/wspiapiwrap.c
diff --git a/sc2/src/sc2code/libs/network/wspiapiwrap.h b/sc2/src/libs/network/wspiapiwrap.h
similarity index 100%
rename from sc2/src/sc2code/libs/network/wspiapiwrap.h
rename to sc2/src/libs/network/wspiapiwrap.h
diff --git a/sc2/src/sc2code/libs/platform.h b/sc2/src/libs/platform.h
similarity index 100%
rename from sc2/src/sc2code/libs/platform.h
rename to sc2/src/libs/platform.h
diff --git a/sc2/src/sc2code/libs/reslib.h b/sc2/src/libs/reslib.h
similarity index 100%
rename from sc2/src/sc2code/libs/reslib.h
rename to sc2/src/libs/reslib.h
diff --git a/sc2/src/sc2code/libs/resource/Makeinfo b/sc2/src/libs/resource/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/resource/Makeinfo
rename to sc2/src/libs/resource/Makeinfo
diff --git a/sc2/src/sc2code/libs/resource/direct.c b/sc2/src/libs/resource/direct.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/direct.c
rename to sc2/src/libs/resource/direct.c
diff --git a/sc2/src/sc2code/libs/resource/filecntl.c b/sc2/src/libs/resource/filecntl.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/filecntl.c
rename to sc2/src/libs/resource/filecntl.c
diff --git a/sc2/src/sc2code/libs/resource/getres.c b/sc2/src/libs/resource/getres.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/getres.c
rename to sc2/src/libs/resource/getres.c
diff --git a/sc2/src/sc2code/libs/resource/index.h b/sc2/src/libs/resource/index.h
similarity index 100%
rename from sc2/src/sc2code/libs/resource/index.h
rename to sc2/src/libs/resource/index.h
diff --git a/sc2/src/sc2code/libs/resource/loadres.c b/sc2/src/libs/resource/loadres.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/loadres.c
rename to sc2/src/libs/resource/loadres.c
diff --git a/sc2/src/sc2code/libs/resource/propfile.c b/sc2/src/libs/resource/propfile.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/propfile.c
rename to sc2/src/libs/resource/propfile.c
diff --git a/sc2/src/sc2code/libs/resource/propfile.h b/sc2/src/libs/resource/propfile.h
similarity index 100%
rename from sc2/src/sc2code/libs/resource/propfile.h
rename to sc2/src/libs/resource/propfile.h
diff --git a/sc2/src/sc2code/libs/resource/resinit.c b/sc2/src/libs/resource/resinit.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/resinit.c
rename to sc2/src/libs/resource/resinit.c
diff --git a/sc2/src/sc2code/libs/resource/resintrn.h b/sc2/src/libs/resource/resintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/resource/resintrn.h
rename to sc2/src/libs/resource/resintrn.h
diff --git a/sc2/src/sc2code/libs/resource/stringbank.c b/sc2/src/libs/resource/stringbank.c
similarity index 100%
rename from sc2/src/sc2code/libs/resource/stringbank.c
rename to sc2/src/libs/resource/stringbank.c
diff --git a/sc2/src/sc2code/libs/resource/stringbank.h b/sc2/src/libs/resource/stringbank.h
similarity index 100%
rename from sc2/src/sc2code/libs/resource/stringbank.h
rename to sc2/src/libs/resource/stringbank.h
diff --git a/sc2/src/sc2code/libs/sndlib.h b/sc2/src/libs/sndlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/sndlib.h
rename to sc2/src/libs/sndlib.h
diff --git a/sc2/src/sc2code/libs/sound/Makeinfo b/sc2/src/libs/sound/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/Makeinfo
rename to sc2/src/libs/sound/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/audiocore.c b/sc2/src/libs/sound/audiocore.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/audiocore.c
rename to sc2/src/libs/sound/audiocore.c
diff --git a/sc2/src/sc2code/libs/sound/audiocore.h b/sc2/src/libs/sound/audiocore.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/audiocore.h
rename to sc2/src/libs/sound/audiocore.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/Makeinfo b/sc2/src/libs/sound/decoders/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/Makeinfo
rename to sc2/src/libs/sound/decoders/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/decoders/aiffaud.c b/sc2/src/libs/sound/decoders/aiffaud.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/aiffaud.c
rename to sc2/src/libs/sound/decoders/aiffaud.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/aiffaud.h b/sc2/src/libs/sound/decoders/aiffaud.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/aiffaud.h
rename to sc2/src/libs/sound/decoders/aiffaud.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/decoder.c b/sc2/src/libs/sound/decoders/decoder.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/decoder.c
rename to sc2/src/libs/sound/decoders/decoder.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/decoder.h b/sc2/src/libs/sound/decoders/decoder.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/decoder.h
rename to sc2/src/libs/sound/decoders/decoder.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/dukaud.c b/sc2/src/libs/sound/decoders/dukaud.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/dukaud.c
rename to sc2/src/libs/sound/decoders/dukaud.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/dukaud.h b/sc2/src/libs/sound/decoders/dukaud.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/dukaud.h
rename to sc2/src/libs/sound/decoders/dukaud.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/modaud.c b/sc2/src/libs/sound/decoders/modaud.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/modaud.c
rename to sc2/src/libs/sound/decoders/modaud.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/modaud.h b/sc2/src/libs/sound/decoders/modaud.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/modaud.h
rename to sc2/src/libs/sound/decoders/modaud.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/oggaud.c b/sc2/src/libs/sound/decoders/oggaud.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/oggaud.c
rename to sc2/src/libs/sound/decoders/oggaud.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/oggaud.h b/sc2/src/libs/sound/decoders/oggaud.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/oggaud.h
rename to sc2/src/libs/sound/decoders/oggaud.h
diff --git a/sc2/src/sc2code/libs/sound/decoders/wav.c b/sc2/src/libs/sound/decoders/wav.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/wav.c
rename to sc2/src/libs/sound/decoders/wav.c
diff --git a/sc2/src/sc2code/libs/sound/decoders/wav.h b/sc2/src/libs/sound/decoders/wav.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/decoders/wav.h
rename to sc2/src/libs/sound/decoders/wav.h
diff --git a/sc2/src/sc2code/libs/sound/fileinst.c b/sc2/src/libs/sound/fileinst.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/fileinst.c
rename to sc2/src/libs/sound/fileinst.c
diff --git a/sc2/src/sc2code/libs/sound/mixer/Makeinfo b/sc2/src/libs/sound/mixer/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/Makeinfo
rename to sc2/src/libs/sound/mixer/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/mixer/mixer.c b/sc2/src/libs/sound/mixer/mixer.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/mixer.c
rename to sc2/src/libs/sound/mixer/mixer.c
diff --git a/sc2/src/sc2code/libs/sound/mixer/mixer.h b/sc2/src/libs/sound/mixer/mixer.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/mixer.h
rename to sc2/src/libs/sound/mixer/mixer.h
diff --git a/sc2/src/sc2code/libs/sound/mixer/mixerint.h b/sc2/src/libs/sound/mixer/mixerint.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/mixerint.h
rename to sc2/src/libs/sound/mixer/mixerint.h
diff --git a/sc2/src/sc2code/libs/sound/mixer/nosound/Makeinfo b/sc2/src/libs/sound/mixer/nosound/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/nosound/Makeinfo
rename to sc2/src/libs/sound/mixer/nosound/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/mixer/nosound/audiodrv_nosound.c b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/nosound/audiodrv_nosound.c
rename to sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
diff --git a/sc2/src/sc2code/libs/sound/mixer/nosound/audiodrv_nosound.h b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/nosound/audiodrv_nosound.h
rename to sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h
diff --git a/sc2/src/sc2code/libs/sound/mixer/sdl/Makeinfo b/sc2/src/libs/sound/mixer/sdl/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/sdl/Makeinfo
rename to sc2/src/libs/sound/mixer/sdl/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/mixer/sdl/audiodrv_sdl.c b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/sdl/audiodrv_sdl.c
rename to sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
diff --git a/sc2/src/sc2code/libs/sound/mixer/sdl/audiodrv_sdl.h b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/mixer/sdl/audiodrv_sdl.h
rename to sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h
diff --git a/sc2/src/sc2code/libs/sound/music.c b/sc2/src/libs/sound/music.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/music.c
rename to sc2/src/libs/sound/music.c
diff --git a/sc2/src/sc2code/libs/sound/openal/Makeinfo b/sc2/src/libs/sound/openal/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/sound/openal/Makeinfo
rename to sc2/src/libs/sound/openal/Makeinfo
diff --git a/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.c b/sc2/src/libs/sound/openal/audiodrv_openal.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/openal/audiodrv_openal.c
rename to sc2/src/libs/sound/openal/audiodrv_openal.c
diff --git a/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h b/sc2/src/libs/sound/openal/audiodrv_openal.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h
rename to sc2/src/libs/sound/openal/audiodrv_openal.h
diff --git a/sc2/src/sc2code/libs/sound/resinst.c b/sc2/src/libs/sound/resinst.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/resinst.c
rename to sc2/src/libs/sound/resinst.c
diff --git a/sc2/src/sc2code/libs/sound/sfx.c b/sc2/src/libs/sound/sfx.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/sfx.c
rename to sc2/src/libs/sound/sfx.c
diff --git a/sc2/src/sc2code/libs/sound/sndintrn.h b/sc2/src/libs/sound/sndintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/sndintrn.h
rename to sc2/src/libs/sound/sndintrn.h
diff --git a/sc2/src/sc2code/libs/sound/sound.c b/sc2/src/libs/sound/sound.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/sound.c
rename to sc2/src/libs/sound/sound.c
diff --git a/sc2/src/sc2code/libs/sound/sound.h b/sc2/src/libs/sound/sound.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/sound.h
rename to sc2/src/libs/sound/sound.h
diff --git a/sc2/src/sc2code/libs/sound/stream.c b/sc2/src/libs/sound/stream.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/stream.c
rename to sc2/src/libs/sound/stream.c
diff --git a/sc2/src/sc2code/libs/sound/stream.h b/sc2/src/libs/sound/stream.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/stream.h
rename to sc2/src/libs/sound/stream.h
diff --git a/sc2/src/sc2code/libs/sound/trackint.h b/sc2/src/libs/sound/trackint.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/trackint.h
rename to sc2/src/libs/sound/trackint.h
diff --git a/sc2/src/sc2code/libs/sound/trackplayer.c b/sc2/src/libs/sound/trackplayer.c
similarity index 100%
rename from sc2/src/sc2code/libs/sound/trackplayer.c
rename to sc2/src/libs/sound/trackplayer.c
diff --git a/sc2/src/sc2code/libs/sound/trackplayer.h b/sc2/src/libs/sound/trackplayer.h
similarity index 100%
rename from sc2/src/sc2code/libs/sound/trackplayer.h
rename to sc2/src/libs/sound/trackplayer.h
diff --git a/sc2/src/sc2code/libs/strings/Makeinfo b/sc2/src/libs/strings/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/strings/Makeinfo
rename to sc2/src/libs/strings/Makeinfo
diff --git a/sc2/src/sc2code/libs/strings/getstr.c b/sc2/src/libs/strings/getstr.c
similarity index 100%
rename from sc2/src/sc2code/libs/strings/getstr.c
rename to sc2/src/libs/strings/getstr.c
diff --git a/sc2/src/sc2code/libs/strings/sfileins.c b/sc2/src/libs/strings/sfileins.c
similarity index 100%
rename from sc2/src/sc2code/libs/strings/sfileins.c
rename to sc2/src/libs/strings/sfileins.c
diff --git a/sc2/src/sc2code/libs/strings/sresins.c b/sc2/src/libs/strings/sresins.c
similarity index 100%
rename from sc2/src/sc2code/libs/strings/sresins.c
rename to sc2/src/libs/strings/sresins.c
diff --git a/sc2/src/sc2code/libs/strings/strings.c b/sc2/src/libs/strings/strings.c
similarity index 100%
rename from sc2/src/sc2code/libs/strings/strings.c
rename to sc2/src/libs/strings/strings.c
diff --git a/sc2/src/sc2code/libs/strings/strintrn.h b/sc2/src/libs/strings/strintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/strings/strintrn.h
rename to sc2/src/libs/strings/strintrn.h
diff --git a/sc2/src/sc2code/libs/strings/unicode.c b/sc2/src/libs/strings/unicode.c
similarity index 100%
rename from sc2/src/sc2code/libs/strings/unicode.c
rename to sc2/src/libs/strings/unicode.c
diff --git a/sc2/src/sc2code/libs/strlib.h b/sc2/src/libs/strlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/strlib.h
rename to sc2/src/libs/strlib.h
diff --git a/sc2/src/sc2code/libs/task/Makeinfo b/sc2/src/libs/task/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/task/Makeinfo
rename to sc2/src/libs/task/Makeinfo
diff --git a/sc2/src/sc2code/libs/task/tasklib.c b/sc2/src/libs/task/tasklib.c
similarity index 100%
rename from sc2/src/sc2code/libs/task/tasklib.c
rename to sc2/src/libs/task/tasklib.c
diff --git a/sc2/src/sc2code/libs/tasklib.h b/sc2/src/libs/tasklib.h
similarity index 100%
rename from sc2/src/sc2code/libs/tasklib.h
rename to sc2/src/libs/tasklib.h
diff --git a/sc2/src/sc2code/libs/threadlib.h b/sc2/src/libs/threadlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/threadlib.h
rename to sc2/src/libs/threadlib.h
diff --git a/sc2/src/sc2code/libs/threads/Makeinfo b/sc2/src/libs/threads/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/threads/Makeinfo
rename to sc2/src/libs/threads/Makeinfo
diff --git a/sc2/src/sc2code/libs/threads/pthread/Makeinfo b/sc2/src/libs/threads/pthread/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/threads/pthread/Makeinfo
rename to sc2/src/libs/threads/pthread/Makeinfo
diff --git a/sc2/src/sc2code/libs/threads/pthread/posixthreads.c b/sc2/src/libs/threads/pthread/posixthreads.c
similarity index 100%
rename from sc2/src/sc2code/libs/threads/pthread/posixthreads.c
rename to sc2/src/libs/threads/pthread/posixthreads.c
diff --git a/sc2/src/sc2code/libs/threads/pthread/posixthreads.h b/sc2/src/libs/threads/pthread/posixthreads.h
similarity index 100%
rename from sc2/src/sc2code/libs/threads/pthread/posixthreads.h
rename to sc2/src/libs/threads/pthread/posixthreads.h
diff --git a/sc2/src/sc2code/libs/threads/sdl/Makeinfo b/sc2/src/libs/threads/sdl/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/threads/sdl/Makeinfo
rename to sc2/src/libs/threads/sdl/Makeinfo
diff --git a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.c b/sc2/src/libs/threads/sdl/sdlthreads.c
similarity index 100%
rename from sc2/src/sc2code/libs/threads/sdl/sdlthreads.c
rename to sc2/src/libs/threads/sdl/sdlthreads.c
diff --git a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.h b/sc2/src/libs/threads/sdl/sdlthreads.h
similarity index 100%
rename from sc2/src/sc2code/libs/threads/sdl/sdlthreads.h
rename to sc2/src/libs/threads/sdl/sdlthreads.h
diff --git a/sc2/src/sc2code/libs/threads/thrcommon.c b/sc2/src/libs/threads/thrcommon.c
similarity index 100%
rename from sc2/src/sc2code/libs/threads/thrcommon.c
rename to sc2/src/libs/threads/thrcommon.c
diff --git a/sc2/src/sc2code/libs/threads/thrcommon.h b/sc2/src/libs/threads/thrcommon.h
similarity index 100%
rename from sc2/src/sc2code/libs/threads/thrcommon.h
rename to sc2/src/libs/threads/thrcommon.h
diff --git a/sc2/src/sc2code/libs/time/Makeinfo b/sc2/src/libs/time/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/time/Makeinfo
rename to sc2/src/libs/time/Makeinfo
diff --git a/sc2/src/sc2code/libs/time/sdl/Makeinfo b/sc2/src/libs/time/sdl/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/time/sdl/Makeinfo
rename to sc2/src/libs/time/sdl/Makeinfo
diff --git a/sc2/src/sc2code/libs/time/sdl/sdltime.c b/sc2/src/libs/time/sdl/sdltime.c
similarity index 100%
rename from sc2/src/sc2code/libs/time/sdl/sdltime.c
rename to sc2/src/libs/time/sdl/sdltime.c
diff --git a/sc2/src/sc2code/libs/time/sdl/sdltime.h b/sc2/src/libs/time/sdl/sdltime.h
similarity index 100%
rename from sc2/src/sc2code/libs/time/sdl/sdltime.h
rename to sc2/src/libs/time/sdl/sdltime.h
diff --git a/sc2/src/sc2code/libs/time/timecommon.c b/sc2/src/libs/time/timecommon.c
similarity index 100%
rename from sc2/src/sc2code/libs/time/timecommon.c
rename to sc2/src/libs/time/timecommon.c
diff --git a/sc2/src/sc2code/libs/time/timecommon.h b/sc2/src/libs/time/timecommon.h
similarity index 100%
rename from sc2/src/sc2code/libs/time/timecommon.h
rename to sc2/src/libs/time/timecommon.h
diff --git a/sc2/src/sc2code/libs/timelib.h b/sc2/src/libs/timelib.h
similarity index 100%
rename from sc2/src/sc2code/libs/timelib.h
rename to sc2/src/libs/timelib.h
diff --git a/sc2/src/sc2code/libs/uio.h b/sc2/src/libs/uio.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio.h
rename to sc2/src/libs/uio.h
diff --git a/sc2/src/sc2code/libs/uio/COPYING b/sc2/src/libs/uio/COPYING
similarity index 100%
rename from sc2/src/sc2code/libs/uio/COPYING
rename to sc2/src/libs/uio/COPYING
diff --git a/sc2/src/sc2code/libs/uio/Makeinfo b/sc2/src/libs/uio/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/uio/Makeinfo
rename to sc2/src/libs/uio/Makeinfo
diff --git a/sc2/src/sc2code/libs/uio/charhashtable.c b/sc2/src/libs/uio/charhashtable.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/charhashtable.c
rename to sc2/src/libs/uio/charhashtable.c
diff --git a/sc2/src/sc2code/libs/uio/charhashtable.h b/sc2/src/libs/uio/charhashtable.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/charhashtable.h
rename to sc2/src/libs/uio/charhashtable.h
diff --git a/sc2/src/sc2code/libs/uio/debug.c b/sc2/src/libs/uio/debug.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/debug.c
rename to sc2/src/libs/uio/debug.c
diff --git a/sc2/src/sc2code/libs/uio/debug.h b/sc2/src/libs/uio/debug.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/debug.h
rename to sc2/src/libs/uio/debug.h
diff --git a/sc2/src/sc2code/libs/uio/defaultfs.c b/sc2/src/libs/uio/defaultfs.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/defaultfs.c
rename to sc2/src/libs/uio/defaultfs.c
diff --git a/sc2/src/sc2code/libs/uio/defaultfs.h b/sc2/src/libs/uio/defaultfs.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/defaultfs.h
rename to sc2/src/libs/uio/defaultfs.h
diff --git a/sc2/src/sc2code/libs/uio/doc/basics b/sc2/src/libs/uio/doc/basics
similarity index 100%
rename from sc2/src/sc2code/libs/uio/doc/basics
rename to sc2/src/libs/uio/doc/basics
diff --git a/sc2/src/sc2code/libs/uio/doc/conventions b/sc2/src/libs/uio/doc/conventions
similarity index 100%
rename from sc2/src/sc2code/libs/uio/doc/conventions
rename to sc2/src/libs/uio/doc/conventions
diff --git a/sc2/src/sc2code/libs/uio/doc/todo b/sc2/src/libs/uio/doc/todo
similarity index 100%
rename from sc2/src/sc2code/libs/uio/doc/todo
rename to sc2/src/libs/uio/doc/todo
diff --git a/sc2/src/sc2code/libs/uio/fileblock.c b/sc2/src/libs/uio/fileblock.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/fileblock.c
rename to sc2/src/libs/uio/fileblock.c
diff --git a/sc2/src/sc2code/libs/uio/fileblock.h b/sc2/src/libs/uio/fileblock.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/fileblock.h
rename to sc2/src/libs/uio/fileblock.h
diff --git a/sc2/src/sc2code/libs/uio/fstypes.c b/sc2/src/libs/uio/fstypes.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/fstypes.c
rename to sc2/src/libs/uio/fstypes.c
diff --git a/sc2/src/sc2code/libs/uio/fstypes.h b/sc2/src/libs/uio/fstypes.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/fstypes.h
rename to sc2/src/libs/uio/fstypes.h
diff --git a/sc2/src/sc2code/libs/uio/getint.h b/sc2/src/libs/uio/getint.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/getint.h
rename to sc2/src/libs/uio/getint.h
diff --git a/sc2/src/sc2code/libs/uio/gphys.c b/sc2/src/libs/uio/gphys.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/gphys.c
rename to sc2/src/libs/uio/gphys.c
diff --git a/sc2/src/sc2code/libs/uio/gphys.h b/sc2/src/libs/uio/gphys.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/gphys.h
rename to sc2/src/libs/uio/gphys.h
diff --git a/sc2/src/sc2code/libs/uio/hashtable.c b/sc2/src/libs/uio/hashtable.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/hashtable.c
rename to sc2/src/libs/uio/hashtable.c
diff --git a/sc2/src/sc2code/libs/uio/hashtable.h b/sc2/src/libs/uio/hashtable.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/hashtable.h
rename to sc2/src/libs/uio/hashtable.h
diff --git a/sc2/src/sc2code/libs/uio/io.c b/sc2/src/libs/uio/io.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/io.c
rename to sc2/src/libs/uio/io.c
diff --git a/sc2/src/sc2code/libs/uio/io.h b/sc2/src/libs/uio/io.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/io.h
rename to sc2/src/libs/uio/io.h
diff --git a/sc2/src/sc2code/libs/uio/ioaux.c b/sc2/src/libs/uio/ioaux.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/ioaux.c
rename to sc2/src/libs/uio/ioaux.c
diff --git a/sc2/src/sc2code/libs/uio/ioaux.h b/sc2/src/libs/uio/ioaux.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/ioaux.h
rename to sc2/src/libs/uio/ioaux.h
diff --git a/sc2/src/sc2code/libs/uio/iointrn.h b/sc2/src/libs/uio/iointrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/iointrn.h
rename to sc2/src/libs/uio/iointrn.h
diff --git a/sc2/src/sc2code/libs/uio/match.c b/sc2/src/libs/uio/match.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/match.c
rename to sc2/src/libs/uio/match.c
diff --git a/sc2/src/sc2code/libs/uio/match.h b/sc2/src/libs/uio/match.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/match.h
rename to sc2/src/libs/uio/match.h
diff --git a/sc2/src/sc2code/libs/uio/mem.h b/sc2/src/libs/uio/mem.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/mem.h
rename to sc2/src/libs/uio/mem.h
diff --git a/sc2/src/sc2code/libs/uio/memdebug.c b/sc2/src/libs/uio/memdebug.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/memdebug.c
rename to sc2/src/libs/uio/memdebug.c
diff --git a/sc2/src/sc2code/libs/uio/memdebug.h b/sc2/src/libs/uio/memdebug.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/memdebug.h
rename to sc2/src/libs/uio/memdebug.h
diff --git a/sc2/src/sc2code/libs/uio/mount.c b/sc2/src/libs/uio/mount.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/mount.c
rename to sc2/src/libs/uio/mount.c
diff --git a/sc2/src/sc2code/libs/uio/mount.h b/sc2/src/libs/uio/mount.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/mount.h
rename to sc2/src/libs/uio/mount.h
diff --git a/sc2/src/sc2code/libs/uio/mounttree.c b/sc2/src/libs/uio/mounttree.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/mounttree.c
rename to sc2/src/libs/uio/mounttree.c
diff --git a/sc2/src/sc2code/libs/uio/mounttree.h b/sc2/src/libs/uio/mounttree.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/mounttree.h
rename to sc2/src/libs/uio/mounttree.h
diff --git a/sc2/src/sc2code/libs/uio/paths.c b/sc2/src/libs/uio/paths.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/paths.c
rename to sc2/src/libs/uio/paths.c
diff --git a/sc2/src/sc2code/libs/uio/paths.h b/sc2/src/libs/uio/paths.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/paths.h
rename to sc2/src/libs/uio/paths.h
diff --git a/sc2/src/sc2code/libs/uio/physical.c b/sc2/src/libs/uio/physical.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/physical.c
rename to sc2/src/libs/uio/physical.c
diff --git a/sc2/src/sc2code/libs/uio/physical.h b/sc2/src/libs/uio/physical.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/physical.h
rename to sc2/src/libs/uio/physical.h
diff --git a/sc2/src/sc2code/libs/uio/stdio/Makeinfo b/sc2/src/libs/uio/stdio/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/uio/stdio/Makeinfo
rename to sc2/src/libs/uio/stdio/Makeinfo
diff --git a/sc2/src/sc2code/libs/uio/stdio/stdio.c b/sc2/src/libs/uio/stdio/stdio.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/stdio/stdio.c
rename to sc2/src/libs/uio/stdio/stdio.c
diff --git a/sc2/src/sc2code/libs/uio/stdio/stdio.h b/sc2/src/libs/uio/stdio/stdio.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/stdio/stdio.h
rename to sc2/src/libs/uio/stdio/stdio.h
diff --git a/sc2/src/sc2code/libs/uio/types.h b/sc2/src/libs/uio/types.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/types.h
rename to sc2/src/libs/uio/types.h
diff --git a/sc2/src/sc2code/libs/uio/uioport.h b/sc2/src/libs/uio/uioport.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/uioport.h
rename to sc2/src/libs/uio/uioport.h
diff --git a/sc2/src/sc2code/libs/uio/uiostream.c b/sc2/src/libs/uio/uiostream.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/uiostream.c
rename to sc2/src/libs/uio/uiostream.c
diff --git a/sc2/src/sc2code/libs/uio/uiostream.h b/sc2/src/libs/uio/uiostream.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/uiostream.h
rename to sc2/src/libs/uio/uiostream.h
diff --git a/sc2/src/sc2code/libs/uio/uioutils.c b/sc2/src/libs/uio/uioutils.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/uioutils.c
rename to sc2/src/libs/uio/uioutils.c
diff --git a/sc2/src/sc2code/libs/uio/uioutils.h b/sc2/src/libs/uio/uioutils.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/uioutils.h
rename to sc2/src/libs/uio/uioutils.h
diff --git a/sc2/src/sc2code/libs/uio/utils.c b/sc2/src/libs/uio/utils.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/utils.c
rename to sc2/src/libs/uio/utils.c
diff --git a/sc2/src/sc2code/libs/uio/utils.h b/sc2/src/libs/uio/utils.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/utils.h
rename to sc2/src/libs/uio/utils.h
diff --git a/sc2/src/sc2code/libs/uio/zip/Makeinfo b/sc2/src/libs/uio/zip/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/uio/zip/Makeinfo
rename to sc2/src/libs/uio/zip/Makeinfo
diff --git a/sc2/src/sc2code/libs/uio/zip/zip.c b/sc2/src/libs/uio/zip/zip.c
similarity index 100%
rename from sc2/src/sc2code/libs/uio/zip/zip.c
rename to sc2/src/libs/uio/zip/zip.c
diff --git a/sc2/src/sc2code/libs/uio/zip/zip.h b/sc2/src/libs/uio/zip/zip.h
similarity index 100%
rename from sc2/src/sc2code/libs/uio/zip/zip.h
rename to sc2/src/libs/uio/zip/zip.h
diff --git a/sc2/src/sc2code/libs/uioutils.h b/sc2/src/libs/uioutils.h
similarity index 100%
rename from sc2/src/sc2code/libs/uioutils.h
rename to sc2/src/libs/uioutils.h
diff --git a/sc2/src/sc2code/libs/video/Makeinfo b/sc2/src/libs/video/Makeinfo
similarity index 100%
rename from sc2/src/sc2code/libs/video/Makeinfo
rename to sc2/src/libs/video/Makeinfo
diff --git a/sc2/src/sc2code/libs/video/dukvid.c b/sc2/src/libs/video/dukvid.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/dukvid.c
rename to sc2/src/libs/video/dukvid.c
diff --git a/sc2/src/sc2code/libs/video/dukvid.h b/sc2/src/libs/video/dukvid.h
similarity index 100%
rename from sc2/src/sc2code/libs/video/dukvid.h
rename to sc2/src/libs/video/dukvid.h
diff --git a/sc2/src/sc2code/libs/video/legacyplayer.c b/sc2/src/libs/video/legacyplayer.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/legacyplayer.c
rename to sc2/src/libs/video/legacyplayer.c
diff --git a/sc2/src/sc2code/libs/video/vfileins.c b/sc2/src/libs/video/vfileins.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/vfileins.c
rename to sc2/src/libs/video/vfileins.c
diff --git a/sc2/src/sc2code/libs/video/video.c b/sc2/src/libs/video/video.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/video.c
rename to sc2/src/libs/video/video.c
diff --git a/sc2/src/sc2code/libs/video/video.h b/sc2/src/libs/video/video.h
similarity index 100%
rename from sc2/src/sc2code/libs/video/video.h
rename to sc2/src/libs/video/video.h
diff --git a/sc2/src/sc2code/libs/video/videodec.c b/sc2/src/libs/video/videodec.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/videodec.c
rename to sc2/src/libs/video/videodec.c
diff --git a/sc2/src/sc2code/libs/video/videodec.h b/sc2/src/libs/video/videodec.h
similarity index 100%
rename from sc2/src/sc2code/libs/video/videodec.h
rename to sc2/src/libs/video/videodec.h
diff --git a/sc2/src/sc2code/libs/video/vidintrn.h b/sc2/src/libs/video/vidintrn.h
similarity index 100%
rename from sc2/src/sc2code/libs/video/vidintrn.h
rename to sc2/src/libs/video/vidintrn.h
diff --git a/sc2/src/sc2code/libs/video/vidplayer.c b/sc2/src/libs/video/vidplayer.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/vidplayer.c
rename to sc2/src/libs/video/vidplayer.c
diff --git a/sc2/src/sc2code/libs/video/vidplayer.h b/sc2/src/libs/video/vidplayer.h
similarity index 100%
rename from sc2/src/sc2code/libs/video/vidplayer.h
rename to sc2/src/libs/video/vidplayer.h
diff --git a/sc2/src/sc2code/libs/video/vresins.c b/sc2/src/libs/video/vresins.c
similarity index 100%
rename from sc2/src/sc2code/libs/video/vresins.c
rename to sc2/src/libs/video/vresins.c
diff --git a/sc2/src/sc2code/libs/vidlib.h b/sc2/src/libs/vidlib.h
similarity index 100%
rename from sc2/src/sc2code/libs/vidlib.h
rename to sc2/src/libs/vidlib.h