diff --git a/tools/ucon64/2.0/src/GoodCodes.txt b/tools/ucon64/src/GoodCodes.txt
similarity index 100%
rename from tools/ucon64/2.0/src/GoodCodes.txt
rename to tools/ucon64/src/GoodCodes.txt
diff --git a/tools/ucon64/2.0/src/Makefile.in b/tools/ucon64/src/Makefile.in
similarity index 100%
rename from tools/ucon64/2.0/src/Makefile.in
rename to tools/ucon64/src/Makefile.in
diff --git a/tools/ucon64/2.0/src/Makefile.mingw b/tools/ucon64/src/Makefile.mingw
similarity index 100%
rename from tools/ucon64/2.0/src/Makefile.mingw
rename to tools/ucon64/src/Makefile.mingw
diff --git a/tools/ucon64/2.0/src/Makefile.orig b/tools/ucon64/src/Makefile.orig
similarity index 100%
rename from tools/ucon64/2.0/src/Makefile.orig
rename to tools/ucon64/src/Makefile.orig
diff --git a/tools/ucon64/2.0/src/Makefile.vc6 b/tools/ucon64/src/Makefile.vc6
similarity index 100%
rename from tools/ucon64/2.0/src/Makefile.vc6
rename to tools/ucon64/src/Makefile.vc6
diff --git a/tools/ucon64/2.0/src/backup/NTSC-PAL notes.txt b/tools/ucon64/src/backup/NTSC-PAL notes.txt
similarity index 100%
rename from tools/ucon64/2.0/src/backup/NTSC-PAL notes.txt
rename to tools/ucon64/src/backup/NTSC-PAL notes.txt
diff --git a/tools/ucon64/2.0/src/backup/SWC-compatibility.txt b/tools/ucon64/src/backup/SWC-compatibility.txt
similarity index 100%
rename from tools/ucon64/2.0/src/backup/SWC-compatibility.txt
rename to tools/ucon64/src/backup/SWC-compatibility.txt
diff --git a/tools/ucon64/2.0/src/backup/backup.h b/tools/ucon64/src/backup/backup.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/backup.h
rename to tools/ucon64/src/backup/backup.h
diff --git a/tools/ucon64/2.0/src/backup/cartlib.c b/tools/ucon64/src/backup/cartlib.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/cartlib.c
rename to tools/ucon64/src/backup/cartlib.c
diff --git a/tools/ucon64/2.0/src/backup/cd64.c b/tools/ucon64/src/backup/cd64.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/cd64.c
rename to tools/ucon64/src/backup/cd64.c
diff --git a/tools/ucon64/2.0/src/backup/cd64.h b/tools/ucon64/src/backup/cd64.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/cd64.h
rename to tools/ucon64/src/backup/cd64.h
diff --git a/tools/ucon64/2.0/src/backup/cmc.c b/tools/ucon64/src/backup/cmc.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/cmc.c
rename to tools/ucon64/src/backup/cmc.c
diff --git a/tools/ucon64/2.0/src/backup/cmc.h b/tools/ucon64/src/backup/cmc.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/cmc.h
rename to tools/ucon64/src/backup/cmc.h
diff --git a/tools/ucon64/2.0/src/backup/dex.c b/tools/ucon64/src/backup/dex.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/dex.c
rename to tools/ucon64/src/backup/dex.c
diff --git a/tools/ucon64/2.0/src/backup/dex.h b/tools/ucon64/src/backup/dex.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/dex.h
rename to tools/ucon64/src/backup/dex.h
diff --git a/tools/ucon64/2.0/src/backup/doctor64.c b/tools/ucon64/src/backup/doctor64.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/doctor64.c
rename to tools/ucon64/src/backup/doctor64.c
diff --git a/tools/ucon64/2.0/src/backup/doctor64.h b/tools/ucon64/src/backup/doctor64.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/doctor64.h
rename to tools/ucon64/src/backup/doctor64.h
diff --git a/tools/ucon64/2.0/src/backup/doctor64jr.c b/tools/ucon64/src/backup/doctor64jr.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/doctor64jr.c
rename to tools/ucon64/src/backup/doctor64jr.c
diff --git a/tools/ucon64/2.0/src/backup/doctor64jr.h b/tools/ucon64/src/backup/doctor64jr.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/doctor64jr.h
rename to tools/ucon64/src/backup/doctor64jr.h
diff --git a/tools/ucon64/2.0/src/backup/f2a.c b/tools/ucon64/src/backup/f2a.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/f2a.c
rename to tools/ucon64/src/backup/f2a.c
diff --git a/tools/ucon64/2.0/src/backup/f2a.h b/tools/ucon64/src/backup/f2a.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/f2a.h
rename to tools/ucon64/src/backup/f2a.h
diff --git a/tools/ucon64/2.0/src/backup/fal.c b/tools/ucon64/src/backup/fal.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/fal.c
rename to tools/ucon64/src/backup/fal.c
diff --git a/tools/ucon64/2.0/src/backup/fal.h b/tools/ucon64/src/backup/fal.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/fal.h
rename to tools/ucon64/src/backup/fal.h
diff --git a/tools/ucon64/2.0/src/backup/ffe.c b/tools/ucon64/src/backup/ffe.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ffe.c
rename to tools/ucon64/src/backup/ffe.c
diff --git a/tools/ucon64/2.0/src/backup/ffe.h b/tools/ucon64/src/backup/ffe.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ffe.h
rename to tools/ucon64/src/backup/ffe.h
diff --git a/tools/ucon64/2.0/src/backup/fig.c b/tools/ucon64/src/backup/fig.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/fig.c
rename to tools/ucon64/src/backup/fig.c
diff --git a/tools/ucon64/2.0/src/backup/fig.h b/tools/ucon64/src/backup/fig.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/fig.h
rename to tools/ucon64/src/backup/fig.h
diff --git a/tools/ucon64/2.0/src/backup/gbx.c b/tools/ucon64/src/backup/gbx.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/gbx.c
rename to tools/ucon64/src/backup/gbx.c
diff --git a/tools/ucon64/2.0/src/backup/gbx.h b/tools/ucon64/src/backup/gbx.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/gbx.h
rename to tools/ucon64/src/backup/gbx.h
diff --git a/tools/ucon64/2.0/src/backup/gd.c b/tools/ucon64/src/backup/gd.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/gd.c
rename to tools/ucon64/src/backup/gd.c
diff --git a/tools/ucon64/2.0/src/backup/gd.h b/tools/ucon64/src/backup/gd.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/gd.h
rename to tools/ucon64/src/backup/gd.h
diff --git a/tools/ucon64/2.0/src/backup/interceptor.c b/tools/ucon64/src/backup/interceptor.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/interceptor.c
rename to tools/ucon64/src/backup/interceptor.c
diff --git a/tools/ucon64/2.0/src/backup/interceptor.h b/tools/ucon64/src/backup/interceptor.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/interceptor.h
rename to tools/ucon64/src/backup/interceptor.h
diff --git a/tools/ucon64/2.0/src/backup/libcd64/Makefile b/tools/ucon64/src/backup/libcd64/Makefile
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/Makefile
rename to tools/ucon64/src/backup/libcd64/Makefile
diff --git a/tools/ucon64/2.0/src/backup/libcd64/Makefile.vc6 b/tools/ucon64/src/backup/libcd64/Makefile.vc6
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/Makefile.vc6
rename to tools/ucon64/src/backup/libcd64/Makefile.vc6
diff --git a/tools/ucon64/2.0/src/backup/libcd64/cd64.def b/tools/ucon64/src/backup/libcd64/cd64.def
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/cd64.def
rename to tools/ucon64/src/backup/libcd64/cd64.def
diff --git a/tools/ucon64/2.0/src/backup/libcd64/cd64io.c b/tools/ucon64/src/backup/libcd64/cd64io.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/cd64io.c
rename to tools/ucon64/src/backup/libcd64/cd64io.c
diff --git a/tools/ucon64/2.0/src/backup/libcd64/cd64io.h b/tools/ucon64/src/backup/libcd64/cd64io.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/cd64io.h
rename to tools/ucon64/src/backup/libcd64/cd64io.h
diff --git a/tools/ucon64/2.0/src/backup/libcd64/cd64lib.c b/tools/ucon64/src/backup/libcd64/cd64lib.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/cd64lib.c
rename to tools/ucon64/src/backup/libcd64/cd64lib.c
diff --git a/tools/ucon64/2.0/src/backup/libcd64/ultra64/cartmem.h b/tools/ucon64/src/backup/libcd64/ultra64/cartmem.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/ultra64/cartmem.h
rename to tools/ucon64/src/backup/libcd64/ultra64/cartmem.h
diff --git a/tools/ucon64/2.0/src/backup/libcd64/ultra64/host/cartinfo.h b/tools/ucon64/src/backup/libcd64/ultra64/host/cartinfo.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/ultra64/host/cartinfo.h
rename to tools/ucon64/src/backup/libcd64/ultra64/host/cartinfo.h
diff --git a/tools/ucon64/2.0/src/backup/libcd64/ultra64/host/cd64lib.h b/tools/ucon64/src/backup/libcd64/ultra64/host/cd64lib.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/ultra64/host/cd64lib.h
rename to tools/ucon64/src/backup/libcd64/ultra64/host/cd64lib.h
diff --git a/tools/ucon64/2.0/src/backup/libcd64/ultra64/rom.h b/tools/ucon64/src/backup/libcd64/ultra64/rom.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/libcd64/ultra64/rom.h
rename to tools/ucon64/src/backup/libcd64/ultra64/rom.h
diff --git a/tools/ucon64/2.0/src/backup/lynxit.c b/tools/ucon64/src/backup/lynxit.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/lynxit.c
rename to tools/ucon64/src/backup/lynxit.c
diff --git a/tools/ucon64/2.0/src/backup/lynxit.h b/tools/ucon64/src/backup/lynxit.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/lynxit.h
rename to tools/ucon64/src/backup/lynxit.h
diff --git a/tools/ucon64/2.0/src/backup/mccl.c b/tools/ucon64/src/backup/mccl.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mccl.c
rename to tools/ucon64/src/backup/mccl.c
diff --git a/tools/ucon64/2.0/src/backup/mccl.h b/tools/ucon64/src/backup/mccl.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mccl.h
rename to tools/ucon64/src/backup/mccl.h
diff --git a/tools/ucon64/2.0/src/backup/mccl.png b/tools/ucon64/src/backup/mccl.png
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mccl.png
rename to tools/ucon64/src/backup/mccl.png
diff --git a/tools/ucon64/2.0/src/backup/mcd.c b/tools/ucon64/src/backup/mcd.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mcd.c
rename to tools/ucon64/src/backup/mcd.c
diff --git a/tools/ucon64/2.0/src/backup/mcd.h b/tools/ucon64/src/backup/mcd.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mcd.h
rename to tools/ucon64/src/backup/mcd.h
diff --git a/tools/ucon64/2.0/src/backup/md-pro.c b/tools/ucon64/src/backup/md-pro.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/md-pro.c
rename to tools/ucon64/src/backup/md-pro.c
diff --git a/tools/ucon64/2.0/src/backup/md-pro.h b/tools/ucon64/src/backup/md-pro.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/md-pro.h
rename to tools/ucon64/src/backup/md-pro.h
diff --git a/tools/ucon64/2.0/src/backup/mgd.c b/tools/ucon64/src/backup/mgd.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mgd.c
rename to tools/ucon64/src/backup/mgd.c
diff --git a/tools/ucon64/2.0/src/backup/mgd.h b/tools/ucon64/src/backup/mgd.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/mgd.h
rename to tools/ucon64/src/backup/mgd.h
diff --git a/tools/ucon64/2.0/src/backup/msg.c b/tools/ucon64/src/backup/msg.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/msg.c
rename to tools/ucon64/src/backup/msg.c
diff --git a/tools/ucon64/2.0/src/backup/msg.h b/tools/ucon64/src/backup/msg.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/msg.h
rename to tools/ucon64/src/backup/msg.h
diff --git a/tools/ucon64/2.0/src/backup/pce-pro.c b/tools/ucon64/src/backup/pce-pro.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/pce-pro.c
rename to tools/ucon64/src/backup/pce-pro.c
diff --git a/tools/ucon64/2.0/src/backup/pce-pro.h b/tools/ucon64/src/backup/pce-pro.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/pce-pro.h
rename to tools/ucon64/src/backup/pce-pro.h
diff --git a/tools/ucon64/2.0/src/backup/pl.c b/tools/ucon64/src/backup/pl.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/pl.c
rename to tools/ucon64/src/backup/pl.c
diff --git a/tools/ucon64/2.0/src/backup/pl.h b/tools/ucon64/src/backup/pl.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/pl.h
rename to tools/ucon64/src/backup/pl.h
diff --git a/tools/ucon64/2.0/src/backup/psxpblib.c b/tools/ucon64/src/backup/psxpblib.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/psxpblib.c
rename to tools/ucon64/src/backup/psxpblib.c
diff --git a/tools/ucon64/2.0/src/backup/psxpblib.h b/tools/ucon64/src/backup/psxpblib.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/psxpblib.h
rename to tools/ucon64/src/backup/psxpblib.h
diff --git a/tools/ucon64/2.0/src/backup/sflash.c b/tools/ucon64/src/backup/sflash.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/sflash.c
rename to tools/ucon64/src/backup/sflash.c
diff --git a/tools/ucon64/2.0/src/backup/sflash.h b/tools/ucon64/src/backup/sflash.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/sflash.h
rename to tools/ucon64/src/backup/sflash.h
diff --git a/tools/ucon64/2.0/src/backup/smc.c b/tools/ucon64/src/backup/smc.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smc.c
rename to tools/ucon64/src/backup/smc.c
diff --git a/tools/ucon64/2.0/src/backup/smc.h b/tools/ucon64/src/backup/smc.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smc.h
rename to tools/ucon64/src/backup/smc.h
diff --git a/tools/ucon64/2.0/src/backup/smd.c b/tools/ucon64/src/backup/smd.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smd.c
rename to tools/ucon64/src/backup/smd.c
diff --git a/tools/ucon64/2.0/src/backup/smd.h b/tools/ucon64/src/backup/smd.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smd.h
rename to tools/ucon64/src/backup/smd.h
diff --git a/tools/ucon64/2.0/src/backup/smsgg-pro.c b/tools/ucon64/src/backup/smsgg-pro.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smsgg-pro.c
rename to tools/ucon64/src/backup/smsgg-pro.c
diff --git a/tools/ucon64/2.0/src/backup/smsgg-pro.h b/tools/ucon64/src/backup/smsgg-pro.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/smsgg-pro.h
rename to tools/ucon64/src/backup/smsgg-pro.h
diff --git a/tools/ucon64/2.0/src/backup/snesram.c b/tools/ucon64/src/backup/snesram.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/snesram.c
rename to tools/ucon64/src/backup/snesram.c
diff --git a/tools/ucon64/2.0/src/backup/snesram.h b/tools/ucon64/src/backup/snesram.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/snesram.h
rename to tools/ucon64/src/backup/snesram.h
diff --git a/tools/ucon64/2.0/src/backup/ssc.c b/tools/ucon64/src/backup/ssc.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ssc.c
rename to tools/ucon64/src/backup/ssc.c
diff --git a/tools/ucon64/2.0/src/backup/ssc.h b/tools/ucon64/src/backup/ssc.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ssc.h
rename to tools/ucon64/src/backup/ssc.h
diff --git a/tools/ucon64/2.0/src/backup/swc.c b/tools/ucon64/src/backup/swc.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/swc.c
rename to tools/ucon64/src/backup/swc.c
diff --git a/tools/ucon64/2.0/src/backup/swc.h b/tools/ucon64/src/backup/swc.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/swc.h
rename to tools/ucon64/src/backup/swc.h
diff --git a/tools/ucon64/2.0/src/backup/tototek.c b/tools/ucon64/src/backup/tototek.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/tototek.c
rename to tools/ucon64/src/backup/tototek.c
diff --git a/tools/ucon64/2.0/src/backup/tototek.h b/tools/ucon64/src/backup/tototek.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/tototek.h
rename to tools/ucon64/src/backup/tototek.h
diff --git a/tools/ucon64/2.0/src/backup/ufo.c b/tools/ucon64/src/backup/ufo.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ufo.c
rename to tools/ucon64/src/backup/ufo.c
diff --git a/tools/ucon64/2.0/src/backup/ufo.h b/tools/ucon64/src/backup/ufo.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/ufo.h
rename to tools/ucon64/src/backup/ufo.h
diff --git a/tools/ucon64/2.0/src/backup/yoko.c b/tools/ucon64/src/backup/yoko.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/yoko.c
rename to tools/ucon64/src/backup/yoko.c
diff --git a/tools/ucon64/2.0/src/backup/yoko.h b/tools/ucon64/src/backup/yoko.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/yoko.h
rename to tools/ucon64/src/backup/yoko.h
diff --git a/tools/ucon64/2.0/src/backup/z64.c b/tools/ucon64/src/backup/z64.c
similarity index 100%
rename from tools/ucon64/2.0/src/backup/z64.c
rename to tools/ucon64/src/backup/z64.c
diff --git a/tools/ucon64/2.0/src/backup/z64.h b/tools/ucon64/src/backup/z64.h
similarity index 100%
rename from tools/ucon64/2.0/src/backup/z64.h
rename to tools/ucon64/src/backup/z64.h
diff --git a/tools/ucon64/2.0/src/config.h.in b/tools/ucon64/src/config.h.in
similarity index 100%
rename from tools/ucon64/2.0/src/config.h.in
rename to tools/ucon64/src/config.h.in
diff --git a/tools/ucon64/2.0/src/config.h.orig b/tools/ucon64/src/config.h.orig
similarity index 100%
rename from tools/ucon64/2.0/src/config.h.orig
rename to tools/ucon64/src/config.h.orig
diff --git a/tools/ucon64/2.0/src/config.h.vc6 b/tools/ucon64/src/config.h.vc6
similarity index 100%
rename from tools/ucon64/2.0/src/config.h.vc6
rename to tools/ucon64/src/config.h.vc6
diff --git a/tools/ucon64/2.0/src/configure b/tools/ucon64/src/configure
similarity index 100%
rename from tools/ucon64/2.0/src/configure
rename to tools/ucon64/src/configure
diff --git a/tools/ucon64/2.0/src/configure.in b/tools/ucon64/src/configure.in
similarity index 100%
rename from tools/ucon64/2.0/src/configure.in
rename to tools/ucon64/src/configure.in
diff --git a/tools/ucon64/2.0/src/console/boardnames b/tools/ucon64/src/console/boardnames
similarity index 100%
rename from tools/ucon64/2.0/src/console/boardnames
rename to tools/ucon64/src/console/boardnames
diff --git a/tools/ucon64/2.0/src/console/boardtable.txt b/tools/ucon64/src/console/boardtable.txt
similarity index 100%
rename from tools/ucon64/2.0/src/console/boardtable.txt
rename to tools/ucon64/src/console/boardtable.txt
diff --git a/tools/ucon64/2.0/src/console/console.h b/tools/ucon64/src/console/console.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/console.h
rename to tools/ucon64/src/console/console.h
diff --git a/tools/ucon64/2.0/src/console/dc.c b/tools/ucon64/src/console/dc.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/dc.c
rename to tools/ucon64/src/console/dc.c
diff --git a/tools/ucon64/2.0/src/console/dc.h b/tools/ucon64/src/console/dc.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/dc.h
rename to tools/ucon64/src/console/dc.h
diff --git a/tools/ucon64/2.0/src/console/gb.c b/tools/ucon64/src/console/gb.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/gb.c
rename to tools/ucon64/src/console/gb.c
diff --git a/tools/ucon64/2.0/src/console/gb.h b/tools/ucon64/src/console/gb.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/gb.h
rename to tools/ucon64/src/console/gb.h
diff --git a/tools/ucon64/2.0/src/console/gba.c b/tools/ucon64/src/console/gba.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/gba.c
rename to tools/ucon64/src/console/gba.c
diff --git a/tools/ucon64/2.0/src/console/gba.h b/tools/ucon64/src/console/gba.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/gba.h
rename to tools/ucon64/src/console/gba.h
diff --git a/tools/ucon64/2.0/src/console/genesis.c b/tools/ucon64/src/console/genesis.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/genesis.c
rename to tools/ucon64/src/console/genesis.c
diff --git a/tools/ucon64/2.0/src/console/genesis.h b/tools/ucon64/src/console/genesis.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/genesis.h
rename to tools/ucon64/src/console/genesis.h
diff --git a/tools/ucon64/2.0/src/console/jaguar.c b/tools/ucon64/src/console/jaguar.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/jaguar.c
rename to tools/ucon64/src/console/jaguar.c
diff --git a/tools/ucon64/2.0/src/console/jaguar.h b/tools/ucon64/src/console/jaguar.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/jaguar.h
rename to tools/ucon64/src/console/jaguar.h
diff --git a/tools/ucon64/2.0/src/console/lynx.c b/tools/ucon64/src/console/lynx.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/lynx.c
rename to tools/ucon64/src/console/lynx.c
diff --git a/tools/ucon64/2.0/src/console/lynx.h b/tools/ucon64/src/console/lynx.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/lynx.h
rename to tools/ucon64/src/console/lynx.h
diff --git a/tools/ucon64/2.0/src/console/n64.c b/tools/ucon64/src/console/n64.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/n64.c
rename to tools/ucon64/src/console/n64.c
diff --git a/tools/ucon64/2.0/src/console/n64.h b/tools/ucon64/src/console/n64.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/n64.h
rename to tools/ucon64/src/console/n64.h
diff --git a/tools/ucon64/2.0/src/console/neogeo.c b/tools/ucon64/src/console/neogeo.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/neogeo.c
rename to tools/ucon64/src/console/neogeo.c
diff --git a/tools/ucon64/2.0/src/console/neogeo.h b/tools/ucon64/src/console/neogeo.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/neogeo.h
rename to tools/ucon64/src/console/neogeo.h
diff --git a/tools/ucon64/2.0/src/console/nes.c b/tools/ucon64/src/console/nes.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/nes.c
rename to tools/ucon64/src/console/nes.c
diff --git a/tools/ucon64/2.0/src/console/nes.h b/tools/ucon64/src/console/nes.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/nes.h
rename to tools/ucon64/src/console/nes.h
diff --git a/tools/ucon64/2.0/src/console/ngp.c b/tools/ucon64/src/console/ngp.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/ngp.c
rename to tools/ucon64/src/console/ngp.c
diff --git a/tools/ucon64/2.0/src/console/ngp.h b/tools/ucon64/src/console/ngp.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/ngp.h
rename to tools/ucon64/src/console/ngp.h
diff --git a/tools/ucon64/2.0/src/console/pce.c b/tools/ucon64/src/console/pce.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/pce.c
rename to tools/ucon64/src/console/pce.c
diff --git a/tools/ucon64/2.0/src/console/pce.h b/tools/ucon64/src/console/pce.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/pce.h
rename to tools/ucon64/src/console/pce.h
diff --git a/tools/ucon64/2.0/src/console/psx.c b/tools/ucon64/src/console/psx.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/psx.c
rename to tools/ucon64/src/console/psx.c
diff --git a/tools/ucon64/2.0/src/console/psx.h b/tools/ucon64/src/console/psx.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/psx.h
rename to tools/ucon64/src/console/psx.h
diff --git a/tools/ucon64/2.0/src/console/sms.c b/tools/ucon64/src/console/sms.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/sms.c
rename to tools/ucon64/src/console/sms.c
diff --git a/tools/ucon64/2.0/src/console/sms.h b/tools/ucon64/src/console/sms.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/sms.h
rename to tools/ucon64/src/console/sms.h
diff --git a/tools/ucon64/2.0/src/console/snes.c b/tools/ucon64/src/console/snes.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/snes.c
rename to tools/ucon64/src/console/snes.c
diff --git a/tools/ucon64/2.0/src/console/snes.h b/tools/ucon64/src/console/snes.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/snes.h
rename to tools/ucon64/src/console/snes.h
diff --git a/tools/ucon64/2.0/src/console/swan.c b/tools/ucon64/src/console/swan.c
similarity index 100%
rename from tools/ucon64/2.0/src/console/swan.c
rename to tools/ucon64/src/console/swan.c
diff --git a/tools/ucon64/2.0/src/console/swan.h b/tools/ucon64/src/console/swan.h
similarity index 100%
rename from tools/ucon64/2.0/src/console/swan.h
rename to tools/ucon64/src/console/swan.h
diff --git a/tools/ucon64/2.0/src/genpal.txt b/tools/ucon64/src/genpal.txt
similarity index 100%
rename from tools/ucon64/2.0/src/genpal.txt
rename to tools/ucon64/src/genpal.txt
diff --git a/tools/ucon64/2.0/src/install.sh b/tools/ucon64/src/install.sh
similarity index 100%
rename from tools/ucon64/2.0/src/install.sh
rename to tools/ucon64/src/install.sh
diff --git a/tools/ucon64/2.0/src/libdiscmage/Makefile.in b/tools/ucon64/src/libdiscmage/Makefile.in
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/Makefile.in
rename to tools/ucon64/src/libdiscmage/Makefile.in
diff --git a/tools/ucon64/2.0/src/libdiscmage/Makefile.orig b/tools/ucon64/src/libdiscmage/Makefile.orig
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/Makefile.orig
rename to tools/ucon64/src/libdiscmage/Makefile.orig
diff --git a/tools/ucon64/2.0/src/libdiscmage/Makefile.vc6 b/tools/ucon64/src/libdiscmage/Makefile.vc6
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/Makefile.vc6
rename to tools/ucon64/src/libdiscmage/Makefile.vc6
diff --git a/tools/ucon64/2.0/src/libdiscmage/config.h.in b/tools/ucon64/src/libdiscmage/config.h.in
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/config.h.in
rename to tools/ucon64/src/libdiscmage/config.h.in
diff --git a/tools/ucon64/2.0/src/libdiscmage/discmage.def b/tools/ucon64/src/libdiscmage/discmage.def
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/discmage.def
rename to tools/ucon64/src/libdiscmage/discmage.def
diff --git a/tools/ucon64/2.0/src/libdiscmage/djimport.c b/tools/ucon64/src/libdiscmage/djimport.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/djimport.c
rename to tools/ucon64/src/libdiscmage/djimport.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/dllinit.c b/tools/ucon64/src/libdiscmage/dllinit.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dllinit.c
rename to tools/ucon64/src/libdiscmage/dllinit.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/dlopen.c b/tools/ucon64/src/libdiscmage/dlopen.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dlopen.c
rename to tools/ucon64/src/libdiscmage/dlopen.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/dlopen.h b/tools/ucon64/src/libdiscmage/dlopen.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dlopen.h
rename to tools/ucon64/src/libdiscmage/dlopen.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/dxe_misc.c b/tools/ucon64/src/libdiscmage/dxe_misc.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dxe_misc.c
rename to tools/ucon64/src/libdiscmage/dxe_misc.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/dxedll_priv.h b/tools/ucon64/src/libdiscmage/dxedll_priv.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dxedll_priv.h
rename to tools/ucon64/src/libdiscmage/dxedll_priv.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/dxedll_pub.h b/tools/ucon64/src/libdiscmage/dxedll_pub.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/dxedll_pub.h
rename to tools/ucon64/src/libdiscmage/dxedll_pub.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/ccd.c b/tools/ucon64/src/libdiscmage/format/ccd.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/ccd.c
rename to tools/ucon64/src/libdiscmage/format/ccd.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/ccd.h b/tools/ucon64/src/libdiscmage/format/ccd.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/ccd.h
rename to tools/ucon64/src/libdiscmage/format/ccd.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/cdi.c b/tools/ucon64/src/libdiscmage/format/cdi.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/cdi.c
rename to tools/ucon64/src/libdiscmage/format/cdi.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/cdi.h b/tools/ucon64/src/libdiscmage/format/cdi.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/cdi.h
rename to tools/ucon64/src/libdiscmage/format/cdi.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/cue.c b/tools/ucon64/src/libdiscmage/format/cue.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/cue.c
rename to tools/ucon64/src/libdiscmage/format/cue.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/cue.h b/tools/ucon64/src/libdiscmage/format/cue.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/cue.h
rename to tools/ucon64/src/libdiscmage/format/cue.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/format.c b/tools/ucon64/src/libdiscmage/format/format.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/format.c
rename to tools/ucon64/src/libdiscmage/format/format.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/format.h b/tools/ucon64/src/libdiscmage/format/format.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/format.h
rename to tools/ucon64/src/libdiscmage/format/format.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/nero.c b/tools/ucon64/src/libdiscmage/format/nero.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/nero.c
rename to tools/ucon64/src/libdiscmage/format/nero.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/nero.h b/tools/ucon64/src/libdiscmage/format/nero.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/nero.h
rename to tools/ucon64/src/libdiscmage/format/nero.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/other.c b/tools/ucon64/src/libdiscmage/format/other.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/other.c
rename to tools/ucon64/src/libdiscmage/format/other.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/other.h b/tools/ucon64/src/libdiscmage/format/other.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/other.h
rename to tools/ucon64/src/libdiscmage/format/other.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/toc.c b/tools/ucon64/src/libdiscmage/format/toc.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/toc.c
rename to tools/ucon64/src/libdiscmage/format/toc.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/format/toc.h b/tools/ucon64/src/libdiscmage/format/toc.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/format/toc.h
rename to tools/ucon64/src/libdiscmage/format/toc.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/getopt.h b/tools/ucon64/src/libdiscmage/getopt.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/getopt.h
rename to tools/ucon64/src/libdiscmage/getopt.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/libdiscmage.h b/tools/ucon64/src/libdiscmage/libdiscmage.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/libdiscmage.h
rename to tools/ucon64/src/libdiscmage/libdiscmage.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/libdm_misc.c b/tools/ucon64/src/libdiscmage/libdm_misc.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/libdm_misc.c
rename to tools/ucon64/src/libdiscmage/libdm_misc.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/libdm_misc.h b/tools/ucon64/src/libdiscmage/libdm_misc.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/libdm_misc.h
rename to tools/ucon64/src/libdiscmage/libdm_misc.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/map.c b/tools/ucon64/src/libdiscmage/map.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/map.c
rename to tools/ucon64/src/libdiscmage/map.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/map.h b/tools/ucon64/src/libdiscmage/map.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/map.h
rename to tools/ucon64/src/libdiscmage/map.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc.c b/tools/ucon64/src/libdiscmage/misc.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc.c
rename to tools/ucon64/src/libdiscmage/misc.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc.h b/tools/ucon64/src/libdiscmage/misc.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc.h
rename to tools/ucon64/src/libdiscmage/misc.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc_wav.c b/tools/ucon64/src/libdiscmage/misc_wav.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc_wav.c
rename to tools/ucon64/src/libdiscmage/misc_wav.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc_wav.h b/tools/ucon64/src/libdiscmage/misc_wav.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc_wav.h
rename to tools/ucon64/src/libdiscmage/misc_wav.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc_z.c b/tools/ucon64/src/libdiscmage/misc_z.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc_z.c
rename to tools/ucon64/src/libdiscmage/misc_z.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/misc_z.h b/tools/ucon64/src/libdiscmage/misc_z.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/misc_z.h
rename to tools/ucon64/src/libdiscmage/misc_z.h
diff --git a/tools/ucon64/2.0/src/libdiscmage/unzip.c b/tools/ucon64/src/libdiscmage/unzip.c
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/unzip.c
rename to tools/ucon64/src/libdiscmage/unzip.c
diff --git a/tools/ucon64/2.0/src/libdiscmage/unzip.h b/tools/ucon64/src/libdiscmage/unzip.h
similarity index 100%
rename from tools/ucon64/2.0/src/libdiscmage/unzip.h
rename to tools/ucon64/src/libdiscmage/unzip.h
diff --git a/tools/ucon64/2.0/src/mdntsc.txt b/tools/ucon64/src/mdntsc.txt
similarity index 100%
rename from tools/ucon64/2.0/src/mdntsc.txt
rename to tools/ucon64/src/mdntsc.txt
diff --git a/tools/ucon64/2.0/src/misc/archive.c b/tools/ucon64/src/misc/archive.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/archive.c
rename to tools/ucon64/src/misc/archive.c
diff --git a/tools/ucon64/2.0/src/misc/archive.h b/tools/ucon64/src/misc/archive.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/archive.h
rename to tools/ucon64/src/misc/archive.h
diff --git a/tools/ucon64/2.0/src/misc/bswap.h b/tools/ucon64/src/misc/bswap.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/bswap.h
rename to tools/ucon64/src/misc/bswap.h
diff --git a/tools/ucon64/2.0/src/misc/chksum.c b/tools/ucon64/src/misc/chksum.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/chksum.c
rename to tools/ucon64/src/misc/chksum.c
diff --git a/tools/ucon64/2.0/src/misc/chksum.h b/tools/ucon64/src/misc/chksum.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/chksum.h
rename to tools/ucon64/src/misc/chksum.h
diff --git a/tools/ucon64/2.0/src/misc/dlopen.c b/tools/ucon64/src/misc/dlopen.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/dlopen.c
rename to tools/ucon64/src/misc/dlopen.c
diff --git a/tools/ucon64/2.0/src/misc/dlopen.h b/tools/ucon64/src/misc/dlopen.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/dlopen.h
rename to tools/ucon64/src/misc/dlopen.h
diff --git a/tools/ucon64/2.0/src/misc/dxedll_pub.h b/tools/ucon64/src/misc/dxedll_pub.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/dxedll_pub.h
rename to tools/ucon64/src/misc/dxedll_pub.h
diff --git a/tools/ucon64/2.0/src/misc/file.c b/tools/ucon64/src/misc/file.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/file.c
rename to tools/ucon64/src/misc/file.c
diff --git a/tools/ucon64/2.0/src/misc/file.h b/tools/ucon64/src/misc/file.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/file.h
rename to tools/ucon64/src/misc/file.h
diff --git a/tools/ucon64/2.0/src/misc/getopt.c b/tools/ucon64/src/misc/getopt.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/getopt.c
rename to tools/ucon64/src/misc/getopt.c
diff --git a/tools/ucon64/2.0/src/misc/getopt.h b/tools/ucon64/src/misc/getopt.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/getopt.h
rename to tools/ucon64/src/misc/getopt.h
diff --git a/tools/ucon64/2.0/src/misc/getopt2.c b/tools/ucon64/src/misc/getopt2.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/getopt2.c
rename to tools/ucon64/src/misc/getopt2.c
diff --git a/tools/ucon64/2.0/src/misc/getopt2.h b/tools/ucon64/src/misc/getopt2.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/getopt2.h
rename to tools/ucon64/src/misc/getopt2.h
diff --git a/tools/ucon64/2.0/src/misc/itypes.h b/tools/ucon64/src/misc/itypes.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/itypes.h
rename to tools/ucon64/src/misc/itypes.h
diff --git a/tools/ucon64/2.0/src/misc/map.c b/tools/ucon64/src/misc/map.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/map.c
rename to tools/ucon64/src/misc/map.c
diff --git a/tools/ucon64/2.0/src/misc/map.h b/tools/ucon64/src/misc/map.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/map.h
rename to tools/ucon64/src/misc/map.h
diff --git a/tools/ucon64/2.0/src/misc/misc.c b/tools/ucon64/src/misc/misc.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/misc.c
rename to tools/ucon64/src/misc/misc.c
diff --git a/tools/ucon64/2.0/src/misc/misc.h b/tools/ucon64/src/misc/misc.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/misc.h
rename to tools/ucon64/src/misc/misc.h
diff --git a/tools/ucon64/2.0/src/misc/opendevice.c b/tools/ucon64/src/misc/opendevice.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/opendevice.c
rename to tools/ucon64/src/misc/opendevice.c
diff --git a/tools/ucon64/2.0/src/misc/opendevice.h b/tools/ucon64/src/misc/opendevice.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/opendevice.h
rename to tools/ucon64/src/misc/opendevice.h
diff --git a/tools/ucon64/2.0/src/misc/parallel.c b/tools/ucon64/src/misc/parallel.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/parallel.c
rename to tools/ucon64/src/misc/parallel.c
diff --git a/tools/ucon64/2.0/src/misc/parallel.h b/tools/ucon64/src/misc/parallel.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/parallel.h
rename to tools/ucon64/src/misc/parallel.h
diff --git a/tools/ucon64/2.0/src/misc/property.c b/tools/ucon64/src/misc/property.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/property.c
rename to tools/ucon64/src/misc/property.c
diff --git a/tools/ucon64/2.0/src/misc/property.h b/tools/ucon64/src/misc/property.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/property.h
rename to tools/ucon64/src/misc/property.h
diff --git a/tools/ucon64/2.0/src/misc/string.c b/tools/ucon64/src/misc/string.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/string.c
rename to tools/ucon64/src/misc/string.c
diff --git a/tools/ucon64/2.0/src/misc/string.h b/tools/ucon64/src/misc/string.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/string.h
rename to tools/ucon64/src/misc/string.h
diff --git a/tools/ucon64/2.0/src/misc/unzip.c b/tools/ucon64/src/misc/unzip.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/unzip.c
rename to tools/ucon64/src/misc/unzip.c
diff --git a/tools/ucon64/2.0/src/misc/unzip.h b/tools/ucon64/src/misc/unzip.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/unzip.h
rename to tools/ucon64/src/misc/unzip.h
diff --git a/tools/ucon64/2.0/src/misc/usb.c b/tools/ucon64/src/misc/usb.c
similarity index 100%
rename from tools/ucon64/2.0/src/misc/usb.c
rename to tools/ucon64/src/misc/usb.c
diff --git a/tools/ucon64/2.0/src/misc/usb.h b/tools/ucon64/src/misc/usb.h
similarity index 100%
rename from tools/ucon64/2.0/src/misc/usb.h
rename to tools/ucon64/src/misc/usb.h
diff --git a/tools/ucon64/2.0/src/patch/aps.c b/tools/ucon64/src/patch/aps.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/aps.c
rename to tools/ucon64/src/patch/aps.c
diff --git a/tools/ucon64/2.0/src/patch/aps.h b/tools/ucon64/src/patch/aps.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/aps.h
rename to tools/ucon64/src/patch/aps.h
diff --git a/tools/ucon64/2.0/src/patch/bsl.c b/tools/ucon64/src/patch/bsl.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/bsl.c
rename to tools/ucon64/src/patch/bsl.c
diff --git a/tools/ucon64/2.0/src/patch/bsl.h b/tools/ucon64/src/patch/bsl.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/bsl.h
rename to tools/ucon64/src/patch/bsl.h
diff --git a/tools/ucon64/2.0/src/patch/gg.c b/tools/ucon64/src/patch/gg.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/gg.c
rename to tools/ucon64/src/patch/gg.c
diff --git a/tools/ucon64/2.0/src/patch/gg.h b/tools/ucon64/src/patch/gg.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/gg.h
rename to tools/ucon64/src/patch/gg.h
diff --git a/tools/ucon64/2.0/src/patch/ips.c b/tools/ucon64/src/patch/ips.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/ips.c
rename to tools/ucon64/src/patch/ips.c
diff --git a/tools/ucon64/2.0/src/patch/ips.h b/tools/ucon64/src/patch/ips.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/ips.h
rename to tools/ucon64/src/patch/ips.h
diff --git a/tools/ucon64/2.0/src/patch/pal4u.c b/tools/ucon64/src/patch/pal4u.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/pal4u.c
rename to tools/ucon64/src/patch/pal4u.c
diff --git a/tools/ucon64/2.0/src/patch/pal4u.h b/tools/ucon64/src/patch/pal4u.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/pal4u.h
rename to tools/ucon64/src/patch/pal4u.h
diff --git a/tools/ucon64/2.0/src/patch/patch.h b/tools/ucon64/src/patch/patch.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/patch.h
rename to tools/ucon64/src/patch/patch.h
diff --git a/tools/ucon64/2.0/src/patch/ppf.c b/tools/ucon64/src/patch/ppf.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/ppf.c
rename to tools/ucon64/src/patch/ppf.c
diff --git a/tools/ucon64/2.0/src/patch/ppf.h b/tools/ucon64/src/patch/ppf.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/ppf.h
rename to tools/ucon64/src/patch/ppf.h
diff --git a/tools/ucon64/2.0/src/patch/xps.c b/tools/ucon64/src/patch/xps.c
similarity index 100%
rename from tools/ucon64/2.0/src/patch/xps.c
rename to tools/ucon64/src/patch/xps.c
diff --git a/tools/ucon64/2.0/src/patch/xps.h b/tools/ucon64/src/patch/xps.h
similarity index 100%
rename from tools/ucon64/2.0/src/patch/xps.h
rename to tools/ucon64/src/patch/xps.h
diff --git a/tools/ucon64/2.0/src/snescopy.txt b/tools/ucon64/src/snescopy.txt
similarity index 100%
rename from tools/ucon64/2.0/src/snescopy.txt
rename to tools/ucon64/src/snescopy.txt
diff --git a/tools/ucon64/2.0/src/snesntsc.txt b/tools/ucon64/src/snesntsc.txt
similarity index 100%
rename from tools/ucon64/2.0/src/snesntsc.txt
rename to tools/ucon64/src/snesntsc.txt
diff --git a/tools/ucon64/2.0/src/snespal.txt b/tools/ucon64/src/snespal.txt
similarity index 100%
rename from tools/ucon64/2.0/src/snespal.txt
rename to tools/ucon64/src/snespal.txt
diff --git a/tools/ucon64/2.0/src/snesslow.txt b/tools/ucon64/src/snesslow.txt
similarity index 100%
rename from tools/ucon64/2.0/src/snesslow.txt
rename to tools/ucon64/src/snesslow.txt
diff --git a/tools/ucon64/2.0/src/ucon64.c b/tools/ucon64/src/ucon64.c
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64.c
rename to tools/ucon64/src/ucon64.c
diff --git a/tools/ucon64/2.0/src/ucon64.h b/tools/ucon64/src/ucon64.h
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64.h
rename to tools/ucon64/src/ucon64.h
diff --git a/tools/ucon64/2.0/src/ucon64_dat.c b/tools/ucon64/src/ucon64_dat.c
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_dat.c
rename to tools/ucon64/src/ucon64_dat.c
diff --git a/tools/ucon64/2.0/src/ucon64_dat.h b/tools/ucon64/src/ucon64_dat.h
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_dat.h
rename to tools/ucon64/src/ucon64_dat.h
diff --git a/tools/ucon64/2.0/src/ucon64_defines.h b/tools/ucon64/src/ucon64_defines.h
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_defines.h
rename to tools/ucon64/src/ucon64_defines.h
diff --git a/tools/ucon64/2.0/src/ucon64_misc.c b/tools/ucon64/src/ucon64_misc.c
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_misc.c
rename to tools/ucon64/src/ucon64_misc.c
diff --git a/tools/ucon64/2.0/src/ucon64_misc.h b/tools/ucon64/src/ucon64_misc.h
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_misc.h
rename to tools/ucon64/src/ucon64_misc.h
diff --git a/tools/ucon64/2.0/src/ucon64_opts.c b/tools/ucon64/src/ucon64_opts.c
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_opts.c
rename to tools/ucon64/src/ucon64_opts.c
diff --git a/tools/ucon64/2.0/src/ucon64_opts.h b/tools/ucon64/src/ucon64_opts.h
similarity index 100%
rename from tools/ucon64/2.0/src/ucon64_opts.h
rename to tools/ucon64/src/ucon64_opts.h
diff --git a/tools/ucon64/2.0/src/win32/inf-wizard.exe b/tools/ucon64/src/win32/inf-wizard.exe
similarity index 100%
rename from tools/ucon64/2.0/src/win32/inf-wizard.exe
rename to tools/ucon64/src/win32/inf-wizard.exe
diff --git a/tools/ucon64/2.0/src/win32/install-filter.exe b/tools/ucon64/src/win32/install-filter.exe
similarity index 100%
rename from tools/ucon64/2.0/src/win32/install-filter.exe
rename to tools/ucon64/src/win32/install-filter.exe
diff --git a/tools/ucon64/2.0/src/win32/libusb0.dll b/tools/ucon64/src/win32/libusb0.dll
similarity index 100%
rename from tools/ucon64/2.0/src/win32/libusb0.dll
rename to tools/ucon64/src/win32/libusb0.dll
diff --git a/tools/ucon64/2.0/src/win32/libusb0.sys b/tools/ucon64/src/win32/libusb0.sys
similarity index 100%
rename from tools/ucon64/2.0/src/win32/libusb0.sys
rename to tools/ucon64/src/win32/libusb0.sys
diff --git a/tools/ucon64/2.0/src/win32/libusb0_x64.dll b/tools/ucon64/src/win32/libusb0_x64.dll
similarity index 100%
rename from tools/ucon64/2.0/src/win32/libusb0_x64.dll
rename to tools/ucon64/src/win32/libusb0_x64.dll
diff --git a/tools/ucon64/2.0/src/win32/libusb0_x64.sys b/tools/ucon64/src/win32/libusb0_x64.sys
similarity index 100%
rename from tools/ucon64/2.0/src/win32/libusb0_x64.sys
rename to tools/ucon64/src/win32/libusb0_x64.sys
diff --git a/tools/ucon64/2.0/src/win32/quickdev16.cat b/tools/ucon64/src/win32/quickdev16.cat
similarity index 100%
rename from tools/ucon64/2.0/src/win32/quickdev16.cat
rename to tools/ucon64/src/win32/quickdev16.cat
diff --git a/tools/ucon64/2.0/src/win32/quickdev16.inf b/tools/ucon64/src/win32/quickdev16.inf
similarity index 100%
rename from tools/ucon64/2.0/src/win32/quickdev16.inf
rename to tools/ucon64/src/win32/quickdev16.inf
diff --git a/tools/ucon64/2.0/src/win32/quickdev16_x64.cat b/tools/ucon64/src/win32/quickdev16_x64.cat
similarity index 100%
rename from tools/ucon64/2.0/src/win32/quickdev16_x64.cat
rename to tools/ucon64/src/win32/quickdev16_x64.cat
diff --git a/tools/ucon64/2.0/src/win32/testlibusb-win.exe b/tools/ucon64/src/win32/testlibusb-win.exe
similarity index 100%
rename from tools/ucon64/2.0/src/win32/testlibusb-win.exe
rename to tools/ucon64/src/win32/testlibusb-win.exe
diff --git a/tools/ucon64/2.0/src/win32/testlibusb.exe b/tools/ucon64/src/win32/testlibusb.exe
similarity index 100%
rename from tools/ucon64/2.0/src/win32/testlibusb.exe
rename to tools/ucon64/src/win32/testlibusb.exe
diff --git a/tools/ucon64/2.0/src/win32/ucon64.exe b/tools/ucon64/src/win32/ucon64.exe
similarity index 100%
rename from tools/ucon64/2.0/src/win32/ucon64.exe
rename to tools/ucon64/src/win32/ucon64.exe