renamed: 16/adplug/adplug-2.2.1/.DS_Store -> 16/adplug/adplug/.DS_Store

	renamed:    16/adplug/adplug-2.2.1/AUTHORS -> 16/adplug/adplug/AUTHORS
	renamed:    16/adplug/adplug-2.2.1/BUGS -> 16/adplug/adplug/BUGS
	renamed:    16/adplug/adplug-2.2.1/COPYING -> 16/adplug/adplug/COPYING
	renamed:    16/adplug/adplug-2.2.1/ChangeLog -> 16/adplug/adplug/ChangeLog
	renamed:    16/adplug/adplug-2.2.1/INSTALL -> 16/adplug/adplug/INSTALL
	renamed:    16/adplug/adplug-2.2.1/Makefile.am -> 16/adplug/adplug/Makefile.am
	renamed:    16/adplug/adplug-2.2.1/Makefile.in -> 16/adplug/adplug/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/NEWS -> 16/adplug/adplug/NEWS
	renamed:    16/adplug/adplug-2.2.1/README -> 16/adplug/adplug/README
	renamed:    16/adplug/adplug-2.2.1/TODO -> 16/adplug/adplug/TODO
	renamed:    16/adplug/adplug-2.2.1/aclocal.m4 -> 16/adplug/adplug/aclocal.m4
	renamed:    16/adplug/adplug-2.2.1/adplug.pc.in -> 16/adplug/adplug/adplug.pc.in
	renamed:    16/adplug/adplug-2.2.1/adplug.qpg -> 16/adplug/adplug/adplug.qpg
	renamed:    16/adplug/adplug-2.2.1/adplug.spec -> 16/adplug/adplug/adplug.spec
	renamed:    16/adplug/adplug-2.2.1/adplugdb/Makefile.am -> 16/adplug/adplug/adplugdb/Makefile.am
	renamed:    16/adplug/adplug-2.2.1/adplugdb/Makefile.in -> 16/adplug/adplug/adplugdb/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/adplugdb/adplugdb.cpp -> 16/adplug/adplug/adplugdb/adplugdb.cpp
	renamed:    16/adplug/adplug-2.2.1/adplugdb/getopt.c -> 16/adplug/adplug/adplugdb/getopt.c
	renamed:    16/adplug/adplug-2.2.1/adplugdb/mygetopt.h -> 16/adplug/adplug/adplugdb/mygetopt.h
	renamed:    16/adplug/adplug-2.2.1/config.guess -> 16/adplug/adplug/config.guess
	renamed:    16/adplug/adplug-2.2.1/config.sub -> 16/adplug/adplug/config.sub
	renamed:    16/adplug/adplug-2.2.1/configure -> 16/adplug/adplug/configure
	renamed:    16/adplug/adplug-2.2.1/configure.in -> 16/adplug/adplug/configure.in
	renamed:    16/adplug/adplug-2.2.1/depcomp -> 16/adplug/adplug/depcomp
	renamed:    16/adplug/adplug-2.2.1/doc/Makefile.am -> 16/adplug/adplug/doc/Makefile.am
	renamed:    16/adplug/adplug-2.2.1/doc/Makefile.in -> 16/adplug/adplug/doc/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/doc/adplugdb.1.in -> 16/adplug/adplug/doc/adplugdb.1.in
	renamed:    16/adplug/libbinio-1.4/doc/fdl.texi -> 16/adplug/adplug/doc/fdl.texi
	renamed:    16/adplug/adplug-2.2.1/doc/libadplug.info -> 16/adplug/adplug/doc/libadplug.info
	renamed:    16/adplug/adplug-2.2.1/doc/libadplug.texi -> 16/adplug/adplug/doc/libadplug.texi
	renamed:    16/adplug/adplug-2.2.1/doc/mdate-sh -> 16/adplug/adplug/doc/mdate-sh
	renamed:    16/adplug/adplug-2.2.1/doc/stamp-vti -> 16/adplug/adplug/doc/stamp-vti
	renamed:    16/adplug/adplug-2.2.1/doc/texinfo.tex -> 16/adplug/adplug/doc/texinfo.tex
	renamed:    16/adplug/adplug-2.2.1/doc/version.texi -> 16/adplug/adplug/doc/version.texi
	renamed:    16/adplug/adplug-2.2.1/install-sh -> 16/adplug/adplug/install-sh
	renamed:    16/adplug/adplug-2.2.1/missing -> 16/adplug/adplug/missing
	renamed:    16/adplug/adplug-2.2.1/src/Makefile.am -> 16/adplug/adplug/src/Makefile.am
	renamed:    16/adplug/adplug-2.2.1/src/Makefile.in -> 16/adplug/adplug/src/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/src/a2m.cpp -> 16/adplug/adplug/src/a2m.cpp
	renamed:    16/adplug/adplug-2.2.1/src/a2m.h -> 16/adplug/adplug/src/a2m.h
	renamed:    16/adplug/adplug-2.2.1/src/adl.cpp -> 16/adplug/adplug/src/adl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/adl.h -> 16/adplug/adplug/src/adl.h
	renamed:    16/adplug/adplug-2.2.1/src/adlibemu.c -> 16/adplug/adplug/src/adlibemu.c
	renamed:    16/adplug/adplug-2.2.1/src/adlibemu.h -> 16/adplug/adplug/src/adlibemu.h
	renamed:    16/adplug/adplug-2.2.1/src/adplug.cpp -> 16/adplug/adplug/src/adplug.cpp
	renamed:    16/adplug/adplug-2.2.1/src/adplug.h -> 16/adplug/adplug/src/adplug.h
	renamed:    16/adplug/adplug-2.2.1/src/adtrack.cpp -> 16/adplug/adplug/src/adtrack.cpp
	renamed:    16/adplug/adplug-2.2.1/src/adtrack.h -> 16/adplug/adplug/src/adtrack.h
	renamed:    16/adplug/adplug-2.2.1/src/amd.cpp -> 16/adplug/adplug/src/amd.cpp
	renamed:    16/adplug/adplug-2.2.1/src/amd.h -> 16/adplug/adplug/src/amd.h
	renamed:    16/adplug/adplug-2.2.1/src/analopl.cpp -> 16/adplug/adplug/src/analopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/analopl.h -> 16/adplug/adplug/src/analopl.h
	renamed:    16/adplug/adplug-2.2.1/src/bam.cpp -> 16/adplug/adplug/src/bam.cpp
	renamed:    16/adplug/adplug-2.2.1/src/bam.h -> 16/adplug/adplug/src/bam.h
	renamed:    16/adplug/adplug-2.2.1/src/bmf.cpp -> 16/adplug/adplug/src/bmf.cpp
	renamed:    16/adplug/adplug-2.2.1/src/bmf.h -> 16/adplug/adplug/src/bmf.h
	renamed:    16/adplug/adplug-2.2.1/src/cff.cpp -> 16/adplug/adplug/src/cff.cpp
	renamed:    16/adplug/adplug-2.2.1/src/cff.h -> 16/adplug/adplug/src/cff.h
	renamed:    16/adplug/adplug-2.2.1/src/cmf.cpp -> 16/adplug/adplug/src/cmf.cpp
	renamed:    16/adplug/adplug-2.2.1/src/cmf.h -> 16/adplug/adplug/src/cmf.h
	renamed:    16/adplug/adplug-2.2.1/src/d00.cpp -> 16/adplug/adplug/src/d00.cpp
	renamed:    16/adplug/adplug-2.2.1/src/d00.h -> 16/adplug/adplug/src/d00.h
	renamed:    16/adplug/adplug-2.2.1/src/database.cpp -> 16/adplug/adplug/src/database.cpp
	renamed:    16/adplug/adplug-2.2.1/src/database.h -> 16/adplug/adplug/src/database.h
	renamed:    16/adplug/adplug-2.2.1/src/debug.c -> 16/adplug/adplug/src/debug.c
	renamed:    16/adplug/adplug-2.2.1/src/debug.h -> 16/adplug/adplug/src/debug.h
	renamed:    16/adplug/adplug-2.2.1/src/dfm.cpp -> 16/adplug/adplug/src/dfm.cpp
	renamed:    16/adplug/adplug-2.2.1/src/dfm.h -> 16/adplug/adplug/src/dfm.h
	renamed:    16/adplug/adplug-2.2.1/src/diskopl.cpp -> 16/adplug/adplug/src/diskopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/diskopl.h -> 16/adplug/adplug/src/diskopl.h
	renamed:    16/adplug/adplug-2.2.1/src/dmo.cpp -> 16/adplug/adplug/src/dmo.cpp
	renamed:    16/adplug/adplug-2.2.1/src/dmo.h -> 16/adplug/adplug/src/dmo.h
	renamed:    16/adplug/adplug-2.2.1/src/dro.cpp -> 16/adplug/adplug/src/dro.cpp
	renamed:    16/adplug/adplug-2.2.1/src/dro.h -> 16/adplug/adplug/src/dro.h
	renamed:    16/adplug/adplug-2.2.1/src/dro2.cpp -> 16/adplug/adplug/src/dro2.cpp
	renamed:    16/adplug/adplug-2.2.1/src/dro2.h -> 16/adplug/adplug/src/dro2.h
	renamed:    16/adplug/adplug-2.2.1/src/dtm.cpp -> 16/adplug/adplug/src/dtm.cpp
	renamed:    16/adplug/adplug-2.2.1/src/dtm.h -> 16/adplug/adplug/src/dtm.h
	renamed:    16/adplug/adplug-2.2.1/src/emuopl.cpp -> 16/adplug/adplug/src/emuopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/emuopl.h -> 16/adplug/adplug/src/emuopl.h
	renamed:    16/adplug/adplug-2.2.1/src/flash.cpp -> 16/adplug/adplug/src/flash.cpp
	renamed:    16/adplug/adplug-2.2.1/src/flash.h -> 16/adplug/adplug/src/flash.h
	renamed:    16/adplug/adplug-2.2.1/src/fmc.cpp -> 16/adplug/adplug/src/fmc.cpp
	renamed:    16/adplug/adplug-2.2.1/src/fmc.h -> 16/adplug/adplug/src/fmc.h
	renamed:    16/adplug/adplug-2.2.1/src/fmopl.c -> 16/adplug/adplug/src/fmopl.c
	renamed:    16/adplug/adplug-2.2.1/src/fmopl.h -> 16/adplug/adplug/src/fmopl.h
	renamed:    16/adplug/adplug-2.2.1/src/fprovide.cpp -> 16/adplug/adplug/src/fprovide.cpp
	renamed:    16/adplug/adplug-2.2.1/src/fprovide.h -> 16/adplug/adplug/src/fprovide.h
	renamed:    16/adplug/adplug-2.2.1/src/hsc.cpp -> 16/adplug/adplug/src/hsc.cpp
	renamed:    16/adplug/adplug-2.2.1/src/hsc.h -> 16/adplug/adplug/src/hsc.h
	renamed:    16/adplug/adplug-2.2.1/src/hsp.cpp -> 16/adplug/adplug/src/hsp.cpp
	renamed:    16/adplug/adplug-2.2.1/src/hsp.h -> 16/adplug/adplug/src/hsp.h
	renamed:    16/adplug/adplug-2.2.1/src/hybrid.cpp -> 16/adplug/adplug/src/hybrid.cpp
	renamed:    16/adplug/adplug-2.2.1/src/hybrid.h -> 16/adplug/adplug/src/hybrid.h
	renamed:    16/adplug/adplug-2.2.1/src/hyp.cpp -> 16/adplug/adplug/src/hyp.cpp
	renamed:    16/adplug/adplug-2.2.1/src/hyp.h -> 16/adplug/adplug/src/hyp.h
	renamed:    16/adplug/adplug-2.2.1/src/imf.cpp -> 16/adplug/adplug/src/imf.cpp
	renamed:    16/adplug/adplug-2.2.1/src/imf.h -> 16/adplug/adplug/src/imf.h
	renamed:    16/adplug/adplug-2.2.1/src/jbm.cpp -> 16/adplug/adplug/src/jbm.cpp
	renamed:    16/adplug/adplug-2.2.1/src/jbm.h -> 16/adplug/adplug/src/jbm.h
	renamed:    16/adplug/adplug-2.2.1/src/kemuopl.h -> 16/adplug/adplug/src/kemuopl.h
	renamed:    16/adplug/adplug-2.2.1/src/ksm.cpp -> 16/adplug/adplug/src/ksm.cpp
	renamed:    16/adplug/adplug-2.2.1/src/ksm.h -> 16/adplug/adplug/src/ksm.h
	renamed:    16/adplug/adplug-2.2.1/src/lds.cpp -> 16/adplug/adplug/src/lds.cpp
	renamed:    16/adplug/adplug-2.2.1/src/lds.h -> 16/adplug/adplug/src/lds.h
	renamed:    16/adplug/adplug-2.2.1/src/mad.cpp -> 16/adplug/adplug/src/mad.cpp
	renamed:    16/adplug/adplug-2.2.1/src/mad.h -> 16/adplug/adplug/src/mad.h
	renamed:    16/adplug/adplug-2.2.1/src/mid.cpp -> 16/adplug/adplug/src/mid.cpp
	renamed:    16/adplug/adplug-2.2.1/src/mid.h -> 16/adplug/adplug/src/mid.h
	renamed:    16/adplug/adplug-2.2.1/src/mididata.h -> 16/adplug/adplug/src/mididata.h
	renamed:    16/adplug/adplug-2.2.1/src/mkj.cpp -> 16/adplug/adplug/src/mkj.cpp
	renamed:    16/adplug/adplug-2.2.1/src/mkj.h -> 16/adplug/adplug/src/mkj.h
	renamed:    16/adplug/adplug-2.2.1/src/msc.cpp -> 16/adplug/adplug/src/msc.cpp
	renamed:    16/adplug/adplug-2.2.1/src/msc.h -> 16/adplug/adplug/src/msc.h
	renamed:    16/adplug/adplug-2.2.1/src/mtk.cpp -> 16/adplug/adplug/src/mtk.cpp
	renamed:    16/adplug/adplug-2.2.1/src/mtk.h -> 16/adplug/adplug/src/mtk.h
	renamed:    16/adplug/adplug-2.2.1/src/opl.h -> 16/adplug/adplug/src/opl.h
	renamed:    16/adplug/adplug-2.2.1/src/player.cpp -> 16/adplug/adplug/src/player.cpp
	renamed:    16/adplug/adplug-2.2.1/src/player.h -> 16/adplug/adplug/src/player.h
	renamed:    16/adplug/adplug-2.2.1/src/players.cpp -> 16/adplug/adplug/src/players.cpp
	renamed:    16/adplug/adplug-2.2.1/src/players.h -> 16/adplug/adplug/src/players.h
	renamed:    16/adplug/adplug-2.2.1/src/protrack.cpp -> 16/adplug/adplug/src/protrack.cpp
	renamed:    16/adplug/adplug-2.2.1/src/protrack.h -> 16/adplug/adplug/src/protrack.h
	renamed:    16/adplug/adplug-2.2.1/src/psi.cpp -> 16/adplug/adplug/src/psi.cpp
	renamed:    16/adplug/adplug-2.2.1/src/psi.h -> 16/adplug/adplug/src/psi.h
	renamed:    16/adplug/adplug-2.2.1/src/rad.cpp -> 16/adplug/adplug/src/rad.cpp
	renamed:    16/adplug/adplug-2.2.1/src/rad.h -> 16/adplug/adplug/src/rad.h
	renamed:    16/adplug/adplug-2.2.1/src/rat.cpp -> 16/adplug/adplug/src/rat.cpp
	renamed:    16/adplug/adplug-2.2.1/src/rat.h -> 16/adplug/adplug/src/rat.h
	renamed:    16/adplug/adplug-2.2.1/src/raw.cpp -> 16/adplug/adplug/src/raw.cpp
	renamed:    16/adplug/adplug-2.2.1/src/raw.h -> 16/adplug/adplug/src/raw.h
	renamed:    16/adplug/adplug-2.2.1/src/realopl.cpp -> 16/adplug/adplug/src/realopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/realopl.h -> 16/adplug/adplug/src/realopl.h
	renamed:    16/adplug/adplug-2.2.1/src/rix.cpp -> 16/adplug/adplug/src/rix.cpp
	renamed:    16/adplug/adplug-2.2.1/src/rix.h -> 16/adplug/adplug/src/rix.h
	renamed:    16/adplug/adplug-2.2.1/src/rol.cpp -> 16/adplug/adplug/src/rol.cpp
	renamed:    16/adplug/adplug-2.2.1/src/rol.h -> 16/adplug/adplug/src/rol.h
	renamed:    16/adplug/adplug-2.2.1/src/s3m.cpp -> 16/adplug/adplug/src/s3m.cpp
	renamed:    16/adplug/adplug-2.2.1/src/s3m.h -> 16/adplug/adplug/src/s3m.h
	renamed:    16/adplug/adplug-2.2.1/src/sa2.cpp -> 16/adplug/adplug/src/sa2.cpp
	renamed:    16/adplug/adplug-2.2.1/src/sa2.h -> 16/adplug/adplug/src/sa2.h
	renamed:    16/adplug/adplug-2.2.1/src/silentopl.h -> 16/adplug/adplug/src/silentopl.h
	renamed:    16/adplug/adplug-2.2.1/src/sng.cpp -> 16/adplug/adplug/src/sng.cpp
	renamed:    16/adplug/adplug-2.2.1/src/sng.h -> 16/adplug/adplug/src/sng.h
	renamed:    16/adplug/adplug-2.2.1/src/surroundopl.cpp -> 16/adplug/adplug/src/surroundopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/surroundopl.h -> 16/adplug/adplug/src/surroundopl.h
	renamed:    16/adplug/adplug-2.2.1/src/temuopl.cpp -> 16/adplug/adplug/src/temuopl.cpp
	renamed:    16/adplug/adplug-2.2.1/src/temuopl.h -> 16/adplug/adplug/src/temuopl.h
	renamed:    16/adplug/adplug-2.2.1/src/u6m.cpp -> 16/adplug/adplug/src/u6m.cpp
	renamed:    16/adplug/adplug-2.2.1/src/u6m.h -> 16/adplug/adplug/src/u6m.h
	renamed:    16/adplug/adplug-2.2.1/src/xad.cpp -> 16/adplug/adplug/src/xad.cpp
	renamed:    16/adplug/adplug-2.2.1/src/xad.h -> 16/adplug/adplug/src/xad.h
	renamed:    16/adplug/adplug-2.2.1/src/xsm.cpp -> 16/adplug/adplug/src/xsm.cpp
	renamed:    16/adplug/adplug-2.2.1/src/xsm.h -> 16/adplug/adplug/src/xsm.h
	renamed:    16/adplug/adplug-2.2.1/test/2001.MKJ -> 16/adplug/adplug/test/2001.MKJ
	renamed:    16/adplug/adplug-2.2.1/test/2001.ref -> 16/adplug/adplug/test/2001.ref
	renamed:    16/adplug/adplug-2.2.1/test/ADAGIO.DFM -> 16/adplug/adplug/test/ADAGIO.DFM
	renamed:    16/adplug/adplug-2.2.1/test/ADAGIO.ref -> 16/adplug/adplug/test/ADAGIO.ref
	renamed:    16/adplug/adplug-2.2.1/test/ALLOYRUN.RAD -> 16/adplug/adplug/test/ALLOYRUN.RAD
	renamed:    16/adplug/adplug-2.2.1/test/ALLOYRUN.ref -> 16/adplug/adplug/test/ALLOYRUN.ref
	renamed:    16/adplug/adplug-2.2.1/test/ARAB.BAM -> 16/adplug/adplug/test/ARAB.BAM
	renamed:    16/adplug/adplug-2.2.1/test/ARAB.ref -> 16/adplug/adplug/test/ARAB.ref
	renamed:    16/adplug/adplug-2.2.1/test/BEGIN.KSM -> 16/adplug/adplug/test/BEGIN.KSM
	renamed:    16/adplug/adplug-2.2.1/test/BEGIN.ref -> 16/adplug/adplug/test/BEGIN.ref
	renamed:    16/adplug/adplug-2.2.1/test/BOOTUP.M -> 16/adplug/adplug/test/BOOTUP.M
	renamed:    16/adplug/adplug-2.2.1/test/BOOTUP.ref -> 16/adplug/adplug/test/BOOTUP.ref
	renamed:    16/adplug/adplug-2.2.1/test/CHILD1.XSM -> 16/adplug/adplug/test/CHILD1.XSM
	renamed:    16/adplug/adplug-2.2.1/test/CHILD1.ref -> 16/adplug/adplug/test/CHILD1.ref
	renamed:    16/adplug/adplug-2.2.1/test/DEMO4.JBM -> 16/adplug/adplug/test/DEMO4.JBM
	renamed:    16/adplug/adplug-2.2.1/test/DEMO4.ref -> 16/adplug/adplug/test/DEMO4.ref
	renamed:    16/adplug/adplug-2.2.1/test/DTM-TRK1.DTM -> 16/adplug/adplug/test/DTM-TRK1.DTM
	renamed:    16/adplug/adplug-2.2.1/test/DTM-TRK1.ref -> 16/adplug/adplug/test/DTM-TRK1.ref
	renamed:    16/adplug/adplug-2.2.1/test/DUNE19.ADL -> 16/adplug/adplug/test/DUNE19.ADL
	renamed:    16/adplug/adplug-2.2.1/test/DUNE19.ref -> 16/adplug/adplug/test/DUNE19.ref
	renamed:    16/adplug/adplug-2.2.1/test/HIP_D.ROL -> 16/adplug/adplug/test/HIP_D.ROL
	renamed:    16/adplug/adplug-2.2.1/test/HIP_D.ref -> 16/adplug/adplug/test/HIP_D.ref
	renamed:    16/adplug/adplug-2.2.1/test/MARIO.A2M -> 16/adplug/adplug/test/MARIO.A2M
	renamed:    16/adplug/adplug-2.2.1/test/MARIO.ref -> 16/adplug/adplug/test/MARIO.ref
	renamed:    16/adplug/adplug-2.2.1/test/Makefile.am -> 16/adplug/adplug/test/Makefile.am
	renamed:    16/adplug/adplug-2.2.1/test/Makefile.in -> 16/adplug/adplug/test/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/test/PLAYMUS1.SNG -> 16/adplug/adplug/test/PLAYMUS1.SNG
	renamed:    16/adplug/adplug-2.2.1/test/PLAYMUS1.ref -> 16/adplug/adplug/test/PLAYMUS1.ref
	renamed:    16/adplug/adplug-2.2.1/test/REVELAT.SNG -> 16/adplug/adplug/test/REVELAT.SNG
	renamed:    16/adplug/adplug-2.2.1/test/REVELAT.ref -> 16/adplug/adplug/test/REVELAT.ref
	renamed:    16/adplug/adplug-2.2.1/test/RI051.RIX -> 16/adplug/adplug/test/RI051.RIX
	renamed:    16/adplug/adplug-2.2.1/test/RI051.ref -> 16/adplug/adplug/test/RI051.ref
	renamed:    16/adplug/adplug-2.2.1/test/SAILOR.CFF -> 16/adplug/adplug/test/SAILOR.CFF
	renamed:    16/adplug/adplug-2.2.1/test/SAILOR.ref -> 16/adplug/adplug/test/SAILOR.ref
	renamed:    16/adplug/adplug-2.2.1/test/SATNIGHT.HSP -> 16/adplug/adplug/test/SATNIGHT.HSP
	renamed:    16/adplug/adplug-2.2.1/test/SATNIGHT.ref -> 16/adplug/adplug/test/SATNIGHT.ref
	renamed:    16/adplug/adplug-2.2.1/test/SCALES.SA2 -> 16/adplug/adplug/test/SCALES.SA2
	renamed:    16/adplug/adplug-2.2.1/test/SCALES.ref -> 16/adplug/adplug/test/SCALES.ref
	renamed:    16/adplug/adplug-2.2.1/test/SMKEREM.HSC -> 16/adplug/adplug/test/SMKEREM.HSC
	renamed:    16/adplug/adplug-2.2.1/test/SMKEREM.ref -> 16/adplug/adplug/test/SMKEREM.ref
	renamed:    16/adplug/adplug-2.2.1/test/SONG1.ins -> 16/adplug/adplug/test/SONG1.ins
	renamed:    16/adplug/adplug-2.2.1/test/SONG1.ref -> 16/adplug/adplug/test/SONG1.ref
	renamed:    16/adplug/adplug-2.2.1/test/SONG1.sng -> 16/adplug/adplug/test/SONG1.sng
	renamed:    16/adplug/adplug-2.2.1/test/TOCCATA.MAD -> 16/adplug/adplug/test/TOCCATA.MAD
	renamed:    16/adplug/adplug-2.2.1/test/TOCCATA.ref -> 16/adplug/adplug/test/TOCCATA.ref
	renamed:    16/adplug/adplug-2.2.1/test/TUBES.SAT -> 16/adplug/adplug/test/TUBES.SAT
	renamed:    16/adplug/adplug-2.2.1/test/TUBES.ref -> 16/adplug/adplug/test/TUBES.ref
	renamed:    16/adplug/adplug-2.2.1/test/TU_BLESS.AMD -> 16/adplug/adplug/test/TU_BLESS.AMD
	renamed:    16/adplug/adplug-2.2.1/test/TU_BLESS.ref -> 16/adplug/adplug/test/TU_BLESS.ref
	renamed:    16/adplug/adplug-2.2.1/test/VIB_VOL3.D00 -> 16/adplug/adplug/test/VIB_VOL3.D00
	renamed:    16/adplug/adplug-2.2.1/test/VIB_VOL3.ref -> 16/adplug/adplug/test/VIB_VOL3.ref
	renamed:    16/adplug/adplug-2.2.1/test/WONDERIN.WLF -> 16/adplug/adplug/test/WONDERIN.WLF
	renamed:    16/adplug/adplug-2.2.1/test/WONDERIN.ref -> 16/adplug/adplug/test/WONDERIN.ref
	renamed:    16/adplug/adplug-2.2.1/test/adlibsp.ref -> 16/adplug/adplug/test/adlibsp.ref
	renamed:    16/adplug/adplug-2.2.1/test/adlibsp.s3m -> 16/adplug/adplug/test/adlibsp.s3m
	renamed:    16/adplug/adplug-2.2.1/test/blaster2.msc -> 16/adplug/adplug/test/blaster2.msc
	renamed:    16/adplug/adplug-2.2.1/test/blaster2.ref -> 16/adplug/adplug/test/blaster2.ref
	renamed:    16/adplug/adplug-2.2.1/test/bmf1_2.ref -> 16/adplug/adplug/test/bmf1_2.ref
	renamed:    16/adplug/adplug-2.2.1/test/bmf1_2.xad -> 16/adplug/adplug/test/bmf1_2.xad
	renamed:    16/adplug/adplug-2.2.1/test/doofus.dro -> 16/adplug/adplug/test/doofus.dro
	renamed:    16/adplug/adplug-2.2.1/test/doofus.ref -> 16/adplug/adplug/test/doofus.ref
	renamed:    16/adplug/adplug-2.2.1/test/dro_v2.dro -> 16/adplug/adplug/test/dro_v2.dro
	renamed:    16/adplug/adplug-2.2.1/test/dro_v2.ref -> 16/adplug/adplug/test/dro_v2.ref
	renamed:    16/adplug/adplug-2.2.1/test/emutest.cpp -> 16/adplug/adplug/test/emutest.cpp
	renamed:    16/adplug/adplug-2.2.1/test/fdance03.dmo -> 16/adplug/adplug/test/fdance03.dmo
	renamed:    16/adplug/adplug-2.2.1/test/fdance03.ref -> 16/adplug/adplug/test/fdance03.ref
	renamed:    16/adplug/adplug-2.2.1/test/flash.ref -> 16/adplug/adplug/test/flash.ref
	renamed:    16/adplug/adplug-2.2.1/test/flash.xad -> 16/adplug/adplug/test/flash.xad
	renamed:    16/adplug/adplug-2.2.1/test/hybrid.ref -> 16/adplug/adplug/test/hybrid.ref
	renamed:    16/adplug/adplug-2.2.1/test/hybrid.xad -> 16/adplug/adplug/test/hybrid.xad
	renamed:    16/adplug/adplug-2.2.1/test/hyp.ref -> 16/adplug/adplug/test/hyp.ref
	renamed:    16/adplug/adplug-2.2.1/test/hyp.xad -> 16/adplug/adplug/test/hyp.xad
	renamed:    16/adplug/adplug-2.2.1/test/ice_thnk.ref -> 16/adplug/adplug/test/ice_thnk.ref
	renamed:    16/adplug/adplug-2.2.1/test/ice_thnk.sci -> 16/adplug/adplug/test/ice_thnk.sci
	renamed:    16/adplug/adplug-2.2.1/test/icepatch.003 -> 16/adplug/adplug/test/icepatch.003
	renamed:    16/adplug/adplug-2.2.1/test/inc.raw -> 16/adplug/adplug/test/inc.raw
	renamed:    16/adplug/adplug-2.2.1/test/inc.ref -> 16/adplug/adplug/test/inc.ref
	renamed:    16/adplug/adplug-2.2.1/test/insts.dat -> 16/adplug/adplug/test/insts.dat
	renamed:    16/adplug/adplug-2.2.1/test/loudness.lds -> 16/adplug/adplug/test/loudness.lds
	renamed:    16/adplug/adplug-2.2.1/test/loudness.ref -> 16/adplug/adplug/test/loudness.ref
	renamed:    16/adplug/adplug-2.2.1/test/mi2.laa -> 16/adplug/adplug/test/mi2.laa
	renamed:    16/adplug/adplug-2.2.1/test/mi2.ref -> 16/adplug/adplug/test/mi2.ref
	renamed:    16/adplug/adplug-2.2.1/test/michaeld.cmf -> 16/adplug/adplug/test/michaeld.cmf
	renamed:    16/adplug/adplug-2.2.1/test/michaeld.ref -> 16/adplug/adplug/test/michaeld.ref
	renamed:    16/adplug/adplug-2.2.1/test/playertest.cpp -> 16/adplug/adplug/test/playertest.cpp
	renamed:    16/adplug/adplug-2.2.1/test/psi1.ref -> 16/adplug/adplug/test/psi1.ref
	renamed:    16/adplug/adplug-2.2.1/test/psi1.xad -> 16/adplug/adplug/test/psi1.xad
	renamed:    16/adplug/adplug-2.2.1/test/rat.ref -> 16/adplug/adplug/test/rat.ref
	renamed:    16/adplug/adplug-2.2.1/test/rat.xad -> 16/adplug/adplug/test/rat.xad
	renamed:    16/adplug/adplug-2.2.1/test/samurai.dro -> 16/adplug/adplug/test/samurai.dro
	renamed:    16/adplug/adplug-2.2.1/test/samurai.ref -> 16/adplug/adplug/test/samurai.ref
	renamed:    16/adplug/adplug-2.2.1/test/standard.bnk -> 16/adplug/adplug/test/standard.bnk
	renamed:    16/adplug/libbinio-1.4/AUTHORS -> 16/adplug/libbinio/AUTHORS
	renamed:    16/adplug/libbinio-1.4/COPYING -> 16/adplug/libbinio/COPYING
	renamed:    16/adplug/libbinio-1.4/ChangeLog -> 16/adplug/libbinio/ChangeLog
	renamed:    16/adplug/libbinio-1.4/INSTALL -> 16/adplug/libbinio/INSTALL
	renamed:    16/adplug/libbinio-1.4/INSTALL.dos -> 16/adplug/libbinio/INSTALL.dos
	renamed:    16/adplug/libbinio-1.4/INSTALL.unix -> 16/adplug/libbinio/INSTALL.unix
	renamed:    16/adplug/libbinio-1.4/INSTALL.win32 -> 16/adplug/libbinio/INSTALL.win32
	renamed:    16/adplug/libbinio-1.4/Makefile.am -> 16/adplug/libbinio/Makefile.am
	renamed:    16/adplug/libbinio-1.4/Makefile.bt -> 16/adplug/libbinio/Makefile.bt
	renamed:    16/adplug/libbinio-1.4/Makefile.in -> 16/adplug/libbinio/Makefile.in
	renamed:    16/adplug/libbinio-1.4/Makefile.wat -> 16/adplug/libbinio/Makefile.wat
	renamed:    16/adplug/libbinio-1.4/NEWS -> 16/adplug/libbinio/NEWS
	renamed:    16/adplug/libbinio-1.4/README -> 16/adplug/libbinio/README
	renamed:    16/adplug/libbinio-1.4/TODO -> 16/adplug/libbinio/TODO
	renamed:    16/adplug/libbinio-1.4/aclocal.m4 -> 16/adplug/libbinio/aclocal.m4
	renamed:    16/adplug/libbinio-1.4/binio.spec -> 16/adplug/libbinio/binio.spec
	renamed:    16/adplug/libbinio-1.4/binio_mdk.spec -> 16/adplug/libbinio/binio_mdk.spec
	renamed:    16/adplug/libbinio-1.4/config.guess -> 16/adplug/libbinio/config.guess
	renamed:    16/adplug/libbinio-1.4/config.sub -> 16/adplug/libbinio/config.sub
	renamed:    16/adplug/libbinio-1.4/configure -> 16/adplug/libbinio/configure
	renamed:    16/adplug/libbinio-1.4/configure.in -> 16/adplug/libbinio/configure.in
	renamed:    16/adplug/libbinio-1.4/depcomp -> 16/adplug/libbinio/depcomp
	renamed:    16/adplug/libbinio-1.4/doc/Makefile.am -> 16/adplug/libbinio/doc/Makefile.am
	renamed:    16/adplug/libbinio-1.4/doc/Makefile.in -> 16/adplug/libbinio/doc/Makefile.in
	renamed:    16/adplug/adplug-2.2.1/doc/fdl.texi -> 16/adplug/libbinio/doc/fdl.texi
	renamed:    16/adplug/libbinio-1.4/doc/libbinio.info -> 16/adplug/libbinio/doc/libbinio.info
	renamed:    16/adplug/libbinio-1.4/doc/libbinio.info-1 -> 16/adplug/libbinio/doc/libbinio.info-1
	renamed:    16/adplug/libbinio-1.4/doc/libbinio.info-2 -> 16/adplug/libbinio/doc/libbinio.info-2
	renamed:    16/adplug/libbinio-1.4/doc/libbinio.texi -> 16/adplug/libbinio/doc/libbinio.texi
	renamed:    16/adplug/libbinio-1.4/doc/mdate-sh -> 16/adplug/libbinio/doc/mdate-sh
	renamed:    16/adplug/libbinio-1.4/doc/stamp-vti -> 16/adplug/libbinio/doc/stamp-vti
	renamed:    16/adplug/libbinio-1.4/doc/texinfo.tex -> 16/adplug/libbinio/doc/texinfo.tex
	renamed:    16/adplug/libbinio-1.4/doc/version.texi -> 16/adplug/libbinio/doc/version.texi
	renamed:    16/adplug/libbinio-1.4/install-sh -> 16/adplug/libbinio/install-sh
	renamed:    16/adplug/libbinio-1.4/libbinio.pc.in -> 16/adplug/libbinio/libbinio.pc.in
	renamed:    16/adplug/libbinio-1.4/libbinio.qpg -> 16/adplug/libbinio/libbinio.qpg
	renamed:    16/adplug/libbinio-1.4/missing -> 16/adplug/libbinio/missing
	renamed:    16/adplug/libbinio-1.4/mkinstalldirs -> 16/adplug/libbinio/mkinstalldirs
	renamed:    16/adplug/libbinio-1.4/src/Makefile.am -> 16/adplug/libbinio/src/Makefile.am
	renamed:    16/adplug/libbinio-1.4/src/Makefile.bt -> 16/adplug/libbinio/src/Makefile.bt
	renamed:    16/adplug/libbinio-1.4/src/Makefile.in -> 16/adplug/libbinio/src/Makefile.in
	renamed:    16/adplug/libbinio-1.4/src/binfile.cpp -> 16/adplug/libbinio/src/binfile.cpp
	renamed:    16/adplug/libbinio-1.4/src/binfile.h -> 16/adplug/libbinio/src/binfile.h
	renamed:    16/adplug/libbinio-1.4/src/binio.cpp -> 16/adplug/libbinio/src/binio.cpp
	renamed:    16/adplug/libbinio-1.4/src/binio.h -> 16/adplug/libbinio/src/binio.h
	renamed:    16/adplug/libbinio-1.4/src/binio.h.in -> 16/adplug/libbinio/src/binio.h.in
	renamed:    16/adplug/libbinio-1.4/src/binstr.cpp -> 16/adplug/libbinio/src/binstr.cpp
	renamed:    16/adplug/libbinio-1.4/src/binstr.h -> 16/adplug/libbinio/src/binstr.h
	renamed:    16/adplug/libbinio-1.4/src/binwrap.cpp -> 16/adplug/libbinio/src/binwrap.cpp
	renamed:    16/adplug/libbinio-1.4/src/binwrap.h -> 16/adplug/libbinio/src/binwrap.h
	renamed:    16/adplug/libbinio-1.4/src/libbinio.dsp -> 16/adplug/libbinio/src/libbinio.dsp
	renamed:    16/adplug/libbinio-1.4/src/vc6inst.bat -> 16/adplug/libbinio/src/vc6inst.bat

diff --git a/16/adplug/adplug-2.2.1/.DS_Store b/16/adplug/adplug/.DS_Store
similarity index 100%
rename from 16/adplug/adplug-2.2.1/.DS_Store
rename to 16/adplug/adplug/.DS_Store

diff --git a/16/adplug/adplug-2.2.1/AUTHORS b/16/adplug/adplug/AUTHORS
similarity index 100%
rename from 16/adplug/adplug-2.2.1/AUTHORS
rename to 16/adplug/adplug/AUTHORS

diff --git a/16/adplug/adplug-2.2.1/BUGS b/16/adplug/adplug/BUGS
similarity index 100%
rename from 16/adplug/adplug-2.2.1/BUGS
rename to 16/adplug/adplug/BUGS

diff --git a/16/adplug/adplug-2.2.1/COPYING b/16/adplug/adplug/COPYING
similarity index 100%
rename from 16/adplug/adplug-2.2.1/COPYING
rename to 16/adplug/adplug/COPYING

diff --git a/16/adplug/adplug-2.2.1/ChangeLog b/16/adplug/adplug/ChangeLog
similarity index 100%
rename from 16/adplug/adplug-2.2.1/ChangeLog
rename to 16/adplug/adplug/ChangeLog

diff --git a/16/adplug/adplug-2.2.1/INSTALL b/16/adplug/adplug/INSTALL
similarity index 100%
rename from 16/adplug/adplug-2.2.1/INSTALL
rename to 16/adplug/adplug/INSTALL

diff --git a/16/adplug/adplug-2.2.1/Makefile.am b/16/adplug/adplug/Makefile.am
similarity index 100%
rename from 16/adplug/adplug-2.2.1/Makefile.am
rename to 16/adplug/adplug/Makefile.am

diff --git a/16/adplug/adplug-2.2.1/Makefile.in b/16/adplug/adplug/Makefile.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/Makefile.in
rename to 16/adplug/adplug/Makefile.in

diff --git a/16/adplug/adplug-2.2.1/NEWS b/16/adplug/adplug/NEWS
similarity index 100%
rename from 16/adplug/adplug-2.2.1/NEWS
rename to 16/adplug/adplug/NEWS

diff --git a/16/adplug/adplug-2.2.1/README b/16/adplug/adplug/README
similarity index 100%
rename from 16/adplug/adplug-2.2.1/README
rename to 16/adplug/adplug/README

diff --git a/16/adplug/adplug-2.2.1/TODO b/16/adplug/adplug/TODO
similarity index 100%
rename from 16/adplug/adplug-2.2.1/TODO
rename to 16/adplug/adplug/TODO

diff --git a/16/adplug/adplug-2.2.1/aclocal.m4 b/16/adplug/adplug/aclocal.m4
similarity index 100%
rename from 16/adplug/adplug-2.2.1/aclocal.m4
rename to 16/adplug/adplug/aclocal.m4

diff --git a/16/adplug/adplug-2.2.1/adplug.pc.in b/16/adplug/adplug/adplug.pc.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplug.pc.in
rename to 16/adplug/adplug/adplug.pc.in

diff --git a/16/adplug/adplug-2.2.1/adplug.qpg b/16/adplug/adplug/adplug.qpg
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplug.qpg
rename to 16/adplug/adplug/adplug.qpg

diff --git a/16/adplug/adplug-2.2.1/adplug.spec b/16/adplug/adplug/adplug.spec
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplug.spec
rename to 16/adplug/adplug/adplug.spec

diff --git a/16/adplug/adplug-2.2.1/adplugdb/Makefile.am b/16/adplug/adplug/adplugdb/Makefile.am
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplugdb/Makefile.am
rename to 16/adplug/adplug/adplugdb/Makefile.am

diff --git a/16/adplug/adplug-2.2.1/adplugdb/Makefile.in b/16/adplug/adplug/adplugdb/Makefile.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplugdb/Makefile.in
rename to 16/adplug/adplug/adplugdb/Makefile.in

diff --git a/16/adplug/adplug-2.2.1/adplugdb/adplugdb.cpp b/16/adplug/adplug/adplugdb/adplugdb.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplugdb/adplugdb.cpp
rename to 16/adplug/adplug/adplugdb/adplugdb.cpp

diff --git a/16/adplug/adplug-2.2.1/adplugdb/getopt.c b/16/adplug/adplug/adplugdb/getopt.c
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplugdb/getopt.c
rename to 16/adplug/adplug/adplugdb/getopt.c

diff --git a/16/adplug/adplug-2.2.1/adplugdb/mygetopt.h b/16/adplug/adplug/adplugdb/mygetopt.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/adplugdb/mygetopt.h
rename to 16/adplug/adplug/adplugdb/mygetopt.h

diff --git a/16/adplug/adplug-2.2.1/config.guess b/16/adplug/adplug/config.guess
similarity index 100%
rename from 16/adplug/adplug-2.2.1/config.guess
rename to 16/adplug/adplug/config.guess

diff --git a/16/adplug/adplug-2.2.1/config.sub b/16/adplug/adplug/config.sub
similarity index 100%
rename from 16/adplug/adplug-2.2.1/config.sub
rename to 16/adplug/adplug/config.sub

diff --git a/16/adplug/adplug-2.2.1/configure b/16/adplug/adplug/configure
similarity index 100%
rename from 16/adplug/adplug-2.2.1/configure
rename to 16/adplug/adplug/configure

diff --git a/16/adplug/adplug-2.2.1/configure.in b/16/adplug/adplug/configure.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/configure.in
rename to 16/adplug/adplug/configure.in

diff --git a/16/adplug/adplug-2.2.1/depcomp b/16/adplug/adplug/depcomp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/depcomp
rename to 16/adplug/adplug/depcomp

diff --git a/16/adplug/adplug-2.2.1/doc/Makefile.am b/16/adplug/adplug/doc/Makefile.am
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/Makefile.am
rename to 16/adplug/adplug/doc/Makefile.am

diff --git a/16/adplug/adplug-2.2.1/doc/Makefile.in b/16/adplug/adplug/doc/Makefile.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/Makefile.in
rename to 16/adplug/adplug/doc/Makefile.in

diff --git a/16/adplug/adplug-2.2.1/doc/adplugdb.1.in b/16/adplug/adplug/doc/adplugdb.1.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/adplugdb.1.in
rename to 16/adplug/adplug/doc/adplugdb.1.in

diff --git a/16/adplug/adplug-2.2.1/doc/fdl.texi b/16/adplug/adplug/doc/fdl.texi
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/fdl.texi
rename to 16/adplug/adplug/doc/fdl.texi

diff --git a/16/adplug/adplug-2.2.1/doc/libadplug.info b/16/adplug/adplug/doc/libadplug.info
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/libadplug.info
rename to 16/adplug/adplug/doc/libadplug.info

diff --git a/16/adplug/adplug-2.2.1/doc/libadplug.texi b/16/adplug/adplug/doc/libadplug.texi
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/libadplug.texi
rename to 16/adplug/adplug/doc/libadplug.texi

diff --git a/16/adplug/adplug-2.2.1/doc/mdate-sh b/16/adplug/adplug/doc/mdate-sh
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/mdate-sh
rename to 16/adplug/adplug/doc/mdate-sh

diff --git a/16/adplug/adplug-2.2.1/doc/stamp-vti b/16/adplug/adplug/doc/stamp-vti
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/stamp-vti
rename to 16/adplug/adplug/doc/stamp-vti

diff --git a/16/adplug/adplug-2.2.1/doc/texinfo.tex b/16/adplug/adplug/doc/texinfo.tex
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/texinfo.tex
rename to 16/adplug/adplug/doc/texinfo.tex

diff --git a/16/adplug/adplug-2.2.1/doc/version.texi b/16/adplug/adplug/doc/version.texi
similarity index 100%
rename from 16/adplug/adplug-2.2.1/doc/version.texi
rename to 16/adplug/adplug/doc/version.texi

diff --git a/16/adplug/adplug-2.2.1/install-sh b/16/adplug/adplug/install-sh
similarity index 100%
rename from 16/adplug/adplug-2.2.1/install-sh
rename to 16/adplug/adplug/install-sh

diff --git a/16/adplug/adplug-2.2.1/missing b/16/adplug/adplug/missing
similarity index 100%
rename from 16/adplug/adplug-2.2.1/missing
rename to 16/adplug/adplug/missing

diff --git a/16/adplug/adplug-2.2.1/src/Makefile.am b/16/adplug/adplug/src/Makefile.am
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/Makefile.am
rename to 16/adplug/adplug/src/Makefile.am

diff --git a/16/adplug/adplug-2.2.1/src/Makefile.in b/16/adplug/adplug/src/Makefile.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/Makefile.in
rename to 16/adplug/adplug/src/Makefile.in

diff --git a/16/adplug/adplug-2.2.1/src/a2m.cpp b/16/adplug/adplug/src/a2m.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/a2m.cpp
rename to 16/adplug/adplug/src/a2m.cpp

diff --git a/16/adplug/adplug-2.2.1/src/a2m.h b/16/adplug/adplug/src/a2m.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/a2m.h
rename to 16/adplug/adplug/src/a2m.h

diff --git a/16/adplug/adplug-2.2.1/src/adl.cpp b/16/adplug/adplug/src/adl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adl.cpp
rename to 16/adplug/adplug/src/adl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/adl.h b/16/adplug/adplug/src/adl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adl.h
rename to 16/adplug/adplug/src/adl.h

diff --git a/16/adplug/adplug-2.2.1/src/adlibemu.c b/16/adplug/adplug/src/adlibemu.c
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adlibemu.c
rename to 16/adplug/adplug/src/adlibemu.c

diff --git a/16/adplug/adplug-2.2.1/src/adlibemu.h b/16/adplug/adplug/src/adlibemu.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adlibemu.h
rename to 16/adplug/adplug/src/adlibemu.h

diff --git a/16/adplug/adplug-2.2.1/src/adplug.cpp b/16/adplug/adplug/src/adplug.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adplug.cpp
rename to 16/adplug/adplug/src/adplug.cpp

diff --git a/16/adplug/adplug-2.2.1/src/adplug.h b/16/adplug/adplug/src/adplug.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adplug.h
rename to 16/adplug/adplug/src/adplug.h

diff --git a/16/adplug/adplug-2.2.1/src/adtrack.cpp b/16/adplug/adplug/src/adtrack.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adtrack.cpp
rename to 16/adplug/adplug/src/adtrack.cpp

diff --git a/16/adplug/adplug-2.2.1/src/adtrack.h b/16/adplug/adplug/src/adtrack.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/adtrack.h
rename to 16/adplug/adplug/src/adtrack.h

diff --git a/16/adplug/adplug-2.2.1/src/amd.cpp b/16/adplug/adplug/src/amd.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/amd.cpp
rename to 16/adplug/adplug/src/amd.cpp

diff --git a/16/adplug/adplug-2.2.1/src/amd.h b/16/adplug/adplug/src/amd.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/amd.h
rename to 16/adplug/adplug/src/amd.h

diff --git a/16/adplug/adplug-2.2.1/src/analopl.cpp b/16/adplug/adplug/src/analopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/analopl.cpp
rename to 16/adplug/adplug/src/analopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/analopl.h b/16/adplug/adplug/src/analopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/analopl.h
rename to 16/adplug/adplug/src/analopl.h

diff --git a/16/adplug/adplug-2.2.1/src/bam.cpp b/16/adplug/adplug/src/bam.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/bam.cpp
rename to 16/adplug/adplug/src/bam.cpp

diff --git a/16/adplug/adplug-2.2.1/src/bam.h b/16/adplug/adplug/src/bam.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/bam.h
rename to 16/adplug/adplug/src/bam.h

diff --git a/16/adplug/adplug-2.2.1/src/bmf.cpp b/16/adplug/adplug/src/bmf.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/bmf.cpp
rename to 16/adplug/adplug/src/bmf.cpp

diff --git a/16/adplug/adplug-2.2.1/src/bmf.h b/16/adplug/adplug/src/bmf.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/bmf.h
rename to 16/adplug/adplug/src/bmf.h

diff --git a/16/adplug/adplug-2.2.1/src/cff.cpp b/16/adplug/adplug/src/cff.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/cff.cpp
rename to 16/adplug/adplug/src/cff.cpp

diff --git a/16/adplug/adplug-2.2.1/src/cff.h b/16/adplug/adplug/src/cff.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/cff.h
rename to 16/adplug/adplug/src/cff.h

diff --git a/16/adplug/adplug-2.2.1/src/cmf.cpp b/16/adplug/adplug/src/cmf.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/cmf.cpp
rename to 16/adplug/adplug/src/cmf.cpp

diff --git a/16/adplug/adplug-2.2.1/src/cmf.h b/16/adplug/adplug/src/cmf.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/cmf.h
rename to 16/adplug/adplug/src/cmf.h

diff --git a/16/adplug/adplug-2.2.1/src/d00.cpp b/16/adplug/adplug/src/d00.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/d00.cpp
rename to 16/adplug/adplug/src/d00.cpp

diff --git a/16/adplug/adplug-2.2.1/src/d00.h b/16/adplug/adplug/src/d00.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/d00.h
rename to 16/adplug/adplug/src/d00.h

diff --git a/16/adplug/adplug-2.2.1/src/database.cpp b/16/adplug/adplug/src/database.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/database.cpp
rename to 16/adplug/adplug/src/database.cpp

diff --git a/16/adplug/adplug-2.2.1/src/database.h b/16/adplug/adplug/src/database.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/database.h
rename to 16/adplug/adplug/src/database.h

diff --git a/16/adplug/adplug-2.2.1/src/debug.c b/16/adplug/adplug/src/debug.c
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/debug.c
rename to 16/adplug/adplug/src/debug.c

diff --git a/16/adplug/adplug-2.2.1/src/debug.h b/16/adplug/adplug/src/debug.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/debug.h
rename to 16/adplug/adplug/src/debug.h

diff --git a/16/adplug/adplug-2.2.1/src/dfm.cpp b/16/adplug/adplug/src/dfm.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dfm.cpp
rename to 16/adplug/adplug/src/dfm.cpp

diff --git a/16/adplug/adplug-2.2.1/src/dfm.h b/16/adplug/adplug/src/dfm.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dfm.h
rename to 16/adplug/adplug/src/dfm.h

diff --git a/16/adplug/adplug-2.2.1/src/diskopl.cpp b/16/adplug/adplug/src/diskopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/diskopl.cpp
rename to 16/adplug/adplug/src/diskopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/diskopl.h b/16/adplug/adplug/src/diskopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/diskopl.h
rename to 16/adplug/adplug/src/diskopl.h

diff --git a/16/adplug/adplug-2.2.1/src/dmo.cpp b/16/adplug/adplug/src/dmo.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dmo.cpp
rename to 16/adplug/adplug/src/dmo.cpp

diff --git a/16/adplug/adplug-2.2.1/src/dmo.h b/16/adplug/adplug/src/dmo.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dmo.h
rename to 16/adplug/adplug/src/dmo.h

diff --git a/16/adplug/adplug-2.2.1/src/dro.cpp b/16/adplug/adplug/src/dro.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dro.cpp
rename to 16/adplug/adplug/src/dro.cpp

diff --git a/16/adplug/adplug-2.2.1/src/dro.h b/16/adplug/adplug/src/dro.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dro.h
rename to 16/adplug/adplug/src/dro.h

diff --git a/16/adplug/adplug-2.2.1/src/dro2.cpp b/16/adplug/adplug/src/dro2.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dro2.cpp
rename to 16/adplug/adplug/src/dro2.cpp

diff --git a/16/adplug/adplug-2.2.1/src/dro2.h b/16/adplug/adplug/src/dro2.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dro2.h
rename to 16/adplug/adplug/src/dro2.h

diff --git a/16/adplug/adplug-2.2.1/src/dtm.cpp b/16/adplug/adplug/src/dtm.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dtm.cpp
rename to 16/adplug/adplug/src/dtm.cpp

diff --git a/16/adplug/adplug-2.2.1/src/dtm.h b/16/adplug/adplug/src/dtm.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/dtm.h
rename to 16/adplug/adplug/src/dtm.h

diff --git a/16/adplug/adplug-2.2.1/src/emuopl.cpp b/16/adplug/adplug/src/emuopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/emuopl.cpp
rename to 16/adplug/adplug/src/emuopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/emuopl.h b/16/adplug/adplug/src/emuopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/emuopl.h
rename to 16/adplug/adplug/src/emuopl.h

diff --git a/16/adplug/adplug-2.2.1/src/flash.cpp b/16/adplug/adplug/src/flash.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/flash.cpp
rename to 16/adplug/adplug/src/flash.cpp

diff --git a/16/adplug/adplug-2.2.1/src/flash.h b/16/adplug/adplug/src/flash.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/flash.h
rename to 16/adplug/adplug/src/flash.h

diff --git a/16/adplug/adplug-2.2.1/src/fmc.cpp b/16/adplug/adplug/src/fmc.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fmc.cpp
rename to 16/adplug/adplug/src/fmc.cpp

diff --git a/16/adplug/adplug-2.2.1/src/fmc.h b/16/adplug/adplug/src/fmc.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fmc.h
rename to 16/adplug/adplug/src/fmc.h

diff --git a/16/adplug/adplug-2.2.1/src/fmopl.c b/16/adplug/adplug/src/fmopl.c
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fmopl.c
rename to 16/adplug/adplug/src/fmopl.c

diff --git a/16/adplug/adplug-2.2.1/src/fmopl.h b/16/adplug/adplug/src/fmopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fmopl.h
rename to 16/adplug/adplug/src/fmopl.h

diff --git a/16/adplug/adplug-2.2.1/src/fprovide.cpp b/16/adplug/adplug/src/fprovide.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fprovide.cpp
rename to 16/adplug/adplug/src/fprovide.cpp

diff --git a/16/adplug/adplug-2.2.1/src/fprovide.h b/16/adplug/adplug/src/fprovide.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/fprovide.h
rename to 16/adplug/adplug/src/fprovide.h

diff --git a/16/adplug/adplug-2.2.1/src/hsc.cpp b/16/adplug/adplug/src/hsc.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hsc.cpp
rename to 16/adplug/adplug/src/hsc.cpp

diff --git a/16/adplug/adplug-2.2.1/src/hsc.h b/16/adplug/adplug/src/hsc.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hsc.h
rename to 16/adplug/adplug/src/hsc.h

diff --git a/16/adplug/adplug-2.2.1/src/hsp.cpp b/16/adplug/adplug/src/hsp.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hsp.cpp
rename to 16/adplug/adplug/src/hsp.cpp

diff --git a/16/adplug/adplug-2.2.1/src/hsp.h b/16/adplug/adplug/src/hsp.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hsp.h
rename to 16/adplug/adplug/src/hsp.h

diff --git a/16/adplug/adplug-2.2.1/src/hybrid.cpp b/16/adplug/adplug/src/hybrid.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hybrid.cpp
rename to 16/adplug/adplug/src/hybrid.cpp

diff --git a/16/adplug/adplug-2.2.1/src/hybrid.h b/16/adplug/adplug/src/hybrid.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hybrid.h
rename to 16/adplug/adplug/src/hybrid.h

diff --git a/16/adplug/adplug-2.2.1/src/hyp.cpp b/16/adplug/adplug/src/hyp.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hyp.cpp
rename to 16/adplug/adplug/src/hyp.cpp

diff --git a/16/adplug/adplug-2.2.1/src/hyp.h b/16/adplug/adplug/src/hyp.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/hyp.h
rename to 16/adplug/adplug/src/hyp.h

diff --git a/16/adplug/adplug-2.2.1/src/imf.cpp b/16/adplug/adplug/src/imf.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/imf.cpp
rename to 16/adplug/adplug/src/imf.cpp

diff --git a/16/adplug/adplug-2.2.1/src/imf.h b/16/adplug/adplug/src/imf.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/imf.h
rename to 16/adplug/adplug/src/imf.h

diff --git a/16/adplug/adplug-2.2.1/src/jbm.cpp b/16/adplug/adplug/src/jbm.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/jbm.cpp
rename to 16/adplug/adplug/src/jbm.cpp

diff --git a/16/adplug/adplug-2.2.1/src/jbm.h b/16/adplug/adplug/src/jbm.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/jbm.h
rename to 16/adplug/adplug/src/jbm.h

diff --git a/16/adplug/adplug-2.2.1/src/kemuopl.h b/16/adplug/adplug/src/kemuopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/kemuopl.h
rename to 16/adplug/adplug/src/kemuopl.h

diff --git a/16/adplug/adplug-2.2.1/src/ksm.cpp b/16/adplug/adplug/src/ksm.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/ksm.cpp
rename to 16/adplug/adplug/src/ksm.cpp

diff --git a/16/adplug/adplug-2.2.1/src/ksm.h b/16/adplug/adplug/src/ksm.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/ksm.h
rename to 16/adplug/adplug/src/ksm.h

diff --git a/16/adplug/adplug-2.2.1/src/lds.cpp b/16/adplug/adplug/src/lds.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/lds.cpp
rename to 16/adplug/adplug/src/lds.cpp

diff --git a/16/adplug/adplug-2.2.1/src/lds.h b/16/adplug/adplug/src/lds.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/lds.h
rename to 16/adplug/adplug/src/lds.h

diff --git a/16/adplug/adplug-2.2.1/src/mad.cpp b/16/adplug/adplug/src/mad.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mad.cpp
rename to 16/adplug/adplug/src/mad.cpp

diff --git a/16/adplug/adplug-2.2.1/src/mad.h b/16/adplug/adplug/src/mad.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mad.h
rename to 16/adplug/adplug/src/mad.h

diff --git a/16/adplug/adplug-2.2.1/src/mid.cpp b/16/adplug/adplug/src/mid.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mid.cpp
rename to 16/adplug/adplug/src/mid.cpp

diff --git a/16/adplug/adplug-2.2.1/src/mid.h b/16/adplug/adplug/src/mid.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mid.h
rename to 16/adplug/adplug/src/mid.h

diff --git a/16/adplug/adplug-2.2.1/src/mididata.h b/16/adplug/adplug/src/mididata.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mididata.h
rename to 16/adplug/adplug/src/mididata.h

diff --git a/16/adplug/adplug-2.2.1/src/mkj.cpp b/16/adplug/adplug/src/mkj.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mkj.cpp
rename to 16/adplug/adplug/src/mkj.cpp

diff --git a/16/adplug/adplug-2.2.1/src/mkj.h b/16/adplug/adplug/src/mkj.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mkj.h
rename to 16/adplug/adplug/src/mkj.h

diff --git a/16/adplug/adplug-2.2.1/src/msc.cpp b/16/adplug/adplug/src/msc.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/msc.cpp
rename to 16/adplug/adplug/src/msc.cpp

diff --git a/16/adplug/adplug-2.2.1/src/msc.h b/16/adplug/adplug/src/msc.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/msc.h
rename to 16/adplug/adplug/src/msc.h

diff --git a/16/adplug/adplug-2.2.1/src/mtk.cpp b/16/adplug/adplug/src/mtk.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mtk.cpp
rename to 16/adplug/adplug/src/mtk.cpp

diff --git a/16/adplug/adplug-2.2.1/src/mtk.h b/16/adplug/adplug/src/mtk.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/mtk.h
rename to 16/adplug/adplug/src/mtk.h

diff --git a/16/adplug/adplug-2.2.1/src/opl.h b/16/adplug/adplug/src/opl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/opl.h
rename to 16/adplug/adplug/src/opl.h

diff --git a/16/adplug/adplug-2.2.1/src/player.cpp b/16/adplug/adplug/src/player.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/player.cpp
rename to 16/adplug/adplug/src/player.cpp

diff --git a/16/adplug/adplug-2.2.1/src/player.h b/16/adplug/adplug/src/player.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/player.h
rename to 16/adplug/adplug/src/player.h

diff --git a/16/adplug/adplug-2.2.1/src/players.cpp b/16/adplug/adplug/src/players.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/players.cpp
rename to 16/adplug/adplug/src/players.cpp

diff --git a/16/adplug/adplug-2.2.1/src/players.h b/16/adplug/adplug/src/players.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/players.h
rename to 16/adplug/adplug/src/players.h

diff --git a/16/adplug/adplug-2.2.1/src/protrack.cpp b/16/adplug/adplug/src/protrack.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/protrack.cpp
rename to 16/adplug/adplug/src/protrack.cpp

diff --git a/16/adplug/adplug-2.2.1/src/protrack.h b/16/adplug/adplug/src/protrack.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/protrack.h
rename to 16/adplug/adplug/src/protrack.h

diff --git a/16/adplug/adplug-2.2.1/src/psi.cpp b/16/adplug/adplug/src/psi.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/psi.cpp
rename to 16/adplug/adplug/src/psi.cpp

diff --git a/16/adplug/adplug-2.2.1/src/psi.h b/16/adplug/adplug/src/psi.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/psi.h
rename to 16/adplug/adplug/src/psi.h

diff --git a/16/adplug/adplug-2.2.1/src/rad.cpp b/16/adplug/adplug/src/rad.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rad.cpp
rename to 16/adplug/adplug/src/rad.cpp

diff --git a/16/adplug/adplug-2.2.1/src/rad.h b/16/adplug/adplug/src/rad.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rad.h
rename to 16/adplug/adplug/src/rad.h

diff --git a/16/adplug/adplug-2.2.1/src/rat.cpp b/16/adplug/adplug/src/rat.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rat.cpp
rename to 16/adplug/adplug/src/rat.cpp

diff --git a/16/adplug/adplug-2.2.1/src/rat.h b/16/adplug/adplug/src/rat.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rat.h
rename to 16/adplug/adplug/src/rat.h

diff --git a/16/adplug/adplug-2.2.1/src/raw.cpp b/16/adplug/adplug/src/raw.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/raw.cpp
rename to 16/adplug/adplug/src/raw.cpp

diff --git a/16/adplug/adplug-2.2.1/src/raw.h b/16/adplug/adplug/src/raw.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/raw.h
rename to 16/adplug/adplug/src/raw.h

diff --git a/16/adplug/adplug-2.2.1/src/realopl.cpp b/16/adplug/adplug/src/realopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/realopl.cpp
rename to 16/adplug/adplug/src/realopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/realopl.h b/16/adplug/adplug/src/realopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/realopl.h
rename to 16/adplug/adplug/src/realopl.h

diff --git a/16/adplug/adplug-2.2.1/src/rix.cpp b/16/adplug/adplug/src/rix.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rix.cpp
rename to 16/adplug/adplug/src/rix.cpp

diff --git a/16/adplug/adplug-2.2.1/src/rix.h b/16/adplug/adplug/src/rix.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rix.h
rename to 16/adplug/adplug/src/rix.h

diff --git a/16/adplug/adplug-2.2.1/src/rol.cpp b/16/adplug/adplug/src/rol.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rol.cpp
rename to 16/adplug/adplug/src/rol.cpp

diff --git a/16/adplug/adplug-2.2.1/src/rol.h b/16/adplug/adplug/src/rol.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/rol.h
rename to 16/adplug/adplug/src/rol.h

diff --git a/16/adplug/adplug-2.2.1/src/s3m.cpp b/16/adplug/adplug/src/s3m.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/s3m.cpp
rename to 16/adplug/adplug/src/s3m.cpp

diff --git a/16/adplug/adplug-2.2.1/src/s3m.h b/16/adplug/adplug/src/s3m.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/s3m.h
rename to 16/adplug/adplug/src/s3m.h

diff --git a/16/adplug/adplug-2.2.1/src/sa2.cpp b/16/adplug/adplug/src/sa2.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/sa2.cpp
rename to 16/adplug/adplug/src/sa2.cpp

diff --git a/16/adplug/adplug-2.2.1/src/sa2.h b/16/adplug/adplug/src/sa2.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/sa2.h
rename to 16/adplug/adplug/src/sa2.h

diff --git a/16/adplug/adplug-2.2.1/src/silentopl.h b/16/adplug/adplug/src/silentopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/silentopl.h
rename to 16/adplug/adplug/src/silentopl.h

diff --git a/16/adplug/adplug-2.2.1/src/sng.cpp b/16/adplug/adplug/src/sng.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/sng.cpp
rename to 16/adplug/adplug/src/sng.cpp

diff --git a/16/adplug/adplug-2.2.1/src/sng.h b/16/adplug/adplug/src/sng.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/sng.h
rename to 16/adplug/adplug/src/sng.h

diff --git a/16/adplug/adplug-2.2.1/src/surroundopl.cpp b/16/adplug/adplug/src/surroundopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/surroundopl.cpp
rename to 16/adplug/adplug/src/surroundopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/surroundopl.h b/16/adplug/adplug/src/surroundopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/surroundopl.h
rename to 16/adplug/adplug/src/surroundopl.h

diff --git a/16/adplug/adplug-2.2.1/src/temuopl.cpp b/16/adplug/adplug/src/temuopl.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/temuopl.cpp
rename to 16/adplug/adplug/src/temuopl.cpp

diff --git a/16/adplug/adplug-2.2.1/src/temuopl.h b/16/adplug/adplug/src/temuopl.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/temuopl.h
rename to 16/adplug/adplug/src/temuopl.h

diff --git a/16/adplug/adplug-2.2.1/src/u6m.cpp b/16/adplug/adplug/src/u6m.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/u6m.cpp
rename to 16/adplug/adplug/src/u6m.cpp

diff --git a/16/adplug/adplug-2.2.1/src/u6m.h b/16/adplug/adplug/src/u6m.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/u6m.h
rename to 16/adplug/adplug/src/u6m.h

diff --git a/16/adplug/adplug-2.2.1/src/xad.cpp b/16/adplug/adplug/src/xad.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/xad.cpp
rename to 16/adplug/adplug/src/xad.cpp

diff --git a/16/adplug/adplug-2.2.1/src/xad.h b/16/adplug/adplug/src/xad.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/xad.h
rename to 16/adplug/adplug/src/xad.h

diff --git a/16/adplug/adplug-2.2.1/src/xsm.cpp b/16/adplug/adplug/src/xsm.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/xsm.cpp
rename to 16/adplug/adplug/src/xsm.cpp

diff --git a/16/adplug/adplug-2.2.1/src/xsm.h b/16/adplug/adplug/src/xsm.h
similarity index 100%
rename from 16/adplug/adplug-2.2.1/src/xsm.h
rename to 16/adplug/adplug/src/xsm.h

diff --git a/16/adplug/adplug-2.2.1/test/2001.MKJ b/16/adplug/adplug/test/2001.MKJ
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/2001.MKJ
rename to 16/adplug/adplug/test/2001.MKJ

diff --git a/16/adplug/adplug-2.2.1/test/2001.ref b/16/adplug/adplug/test/2001.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/2001.ref
rename to 16/adplug/adplug/test/2001.ref

diff --git a/16/adplug/adplug-2.2.1/test/ADAGIO.DFM b/16/adplug/adplug/test/ADAGIO.DFM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ADAGIO.DFM
rename to 16/adplug/adplug/test/ADAGIO.DFM

diff --git a/16/adplug/adplug-2.2.1/test/ADAGIO.ref b/16/adplug/adplug/test/ADAGIO.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ADAGIO.ref
rename to 16/adplug/adplug/test/ADAGIO.ref

diff --git a/16/adplug/adplug-2.2.1/test/ALLOYRUN.RAD b/16/adplug/adplug/test/ALLOYRUN.RAD
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ALLOYRUN.RAD
rename to 16/adplug/adplug/test/ALLOYRUN.RAD

diff --git a/16/adplug/adplug-2.2.1/test/ALLOYRUN.ref b/16/adplug/adplug/test/ALLOYRUN.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ALLOYRUN.ref
rename to 16/adplug/adplug/test/ALLOYRUN.ref

diff --git a/16/adplug/adplug-2.2.1/test/ARAB.BAM b/16/adplug/adplug/test/ARAB.BAM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ARAB.BAM
rename to 16/adplug/adplug/test/ARAB.BAM

diff --git a/16/adplug/adplug-2.2.1/test/ARAB.ref b/16/adplug/adplug/test/ARAB.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ARAB.ref
rename to 16/adplug/adplug/test/ARAB.ref

diff --git a/16/adplug/adplug-2.2.1/test/BEGIN.KSM b/16/adplug/adplug/test/BEGIN.KSM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/BEGIN.KSM
rename to 16/adplug/adplug/test/BEGIN.KSM

diff --git a/16/adplug/adplug-2.2.1/test/BEGIN.ref b/16/adplug/adplug/test/BEGIN.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/BEGIN.ref
rename to 16/adplug/adplug/test/BEGIN.ref

diff --git a/16/adplug/adplug-2.2.1/test/BOOTUP.M b/16/adplug/adplug/test/BOOTUP.M
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/BOOTUP.M
rename to 16/adplug/adplug/test/BOOTUP.M

diff --git a/16/adplug/adplug-2.2.1/test/BOOTUP.ref b/16/adplug/adplug/test/BOOTUP.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/BOOTUP.ref
rename to 16/adplug/adplug/test/BOOTUP.ref

diff --git a/16/adplug/adplug-2.2.1/test/CHILD1.XSM b/16/adplug/adplug/test/CHILD1.XSM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/CHILD1.XSM
rename to 16/adplug/adplug/test/CHILD1.XSM

diff --git a/16/adplug/adplug-2.2.1/test/CHILD1.ref b/16/adplug/adplug/test/CHILD1.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/CHILD1.ref
rename to 16/adplug/adplug/test/CHILD1.ref

diff --git a/16/adplug/adplug-2.2.1/test/DEMO4.JBM b/16/adplug/adplug/test/DEMO4.JBM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DEMO4.JBM
rename to 16/adplug/adplug/test/DEMO4.JBM

diff --git a/16/adplug/adplug-2.2.1/test/DEMO4.ref b/16/adplug/adplug/test/DEMO4.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DEMO4.ref
rename to 16/adplug/adplug/test/DEMO4.ref

diff --git a/16/adplug/adplug-2.2.1/test/DTM-TRK1.DTM b/16/adplug/adplug/test/DTM-TRK1.DTM
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DTM-TRK1.DTM
rename to 16/adplug/adplug/test/DTM-TRK1.DTM

diff --git a/16/adplug/adplug-2.2.1/test/DTM-TRK1.ref b/16/adplug/adplug/test/DTM-TRK1.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DTM-TRK1.ref
rename to 16/adplug/adplug/test/DTM-TRK1.ref

diff --git a/16/adplug/adplug-2.2.1/test/DUNE19.ADL b/16/adplug/adplug/test/DUNE19.ADL
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DUNE19.ADL
rename to 16/adplug/adplug/test/DUNE19.ADL

diff --git a/16/adplug/adplug-2.2.1/test/DUNE19.ref b/16/adplug/adplug/test/DUNE19.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/DUNE19.ref
rename to 16/adplug/adplug/test/DUNE19.ref

diff --git a/16/adplug/adplug-2.2.1/test/HIP_D.ROL b/16/adplug/adplug/test/HIP_D.ROL
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/HIP_D.ROL
rename to 16/adplug/adplug/test/HIP_D.ROL

diff --git a/16/adplug/adplug-2.2.1/test/HIP_D.ref b/16/adplug/adplug/test/HIP_D.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/HIP_D.ref
rename to 16/adplug/adplug/test/HIP_D.ref

diff --git a/16/adplug/adplug-2.2.1/test/MARIO.A2M b/16/adplug/adplug/test/MARIO.A2M
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/MARIO.A2M
rename to 16/adplug/adplug/test/MARIO.A2M

diff --git a/16/adplug/adplug-2.2.1/test/MARIO.ref b/16/adplug/adplug/test/MARIO.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/MARIO.ref
rename to 16/adplug/adplug/test/MARIO.ref

diff --git a/16/adplug/adplug-2.2.1/test/Makefile.am b/16/adplug/adplug/test/Makefile.am
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/Makefile.am
rename to 16/adplug/adplug/test/Makefile.am

diff --git a/16/adplug/adplug-2.2.1/test/Makefile.in b/16/adplug/adplug/test/Makefile.in
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/Makefile.in
rename to 16/adplug/adplug/test/Makefile.in

diff --git a/16/adplug/adplug-2.2.1/test/PLAYMUS1.SNG b/16/adplug/adplug/test/PLAYMUS1.SNG
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/PLAYMUS1.SNG
rename to 16/adplug/adplug/test/PLAYMUS1.SNG

diff --git a/16/adplug/adplug-2.2.1/test/PLAYMUS1.ref b/16/adplug/adplug/test/PLAYMUS1.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/PLAYMUS1.ref
rename to 16/adplug/adplug/test/PLAYMUS1.ref

diff --git a/16/adplug/adplug-2.2.1/test/REVELAT.SNG b/16/adplug/adplug/test/REVELAT.SNG
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/REVELAT.SNG
rename to 16/adplug/adplug/test/REVELAT.SNG

diff --git a/16/adplug/adplug-2.2.1/test/REVELAT.ref b/16/adplug/adplug/test/REVELAT.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/REVELAT.ref
rename to 16/adplug/adplug/test/REVELAT.ref

diff --git a/16/adplug/adplug-2.2.1/test/RI051.RIX b/16/adplug/adplug/test/RI051.RIX
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/RI051.RIX
rename to 16/adplug/adplug/test/RI051.RIX

diff --git a/16/adplug/adplug-2.2.1/test/RI051.ref b/16/adplug/adplug/test/RI051.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/RI051.ref
rename to 16/adplug/adplug/test/RI051.ref

diff --git a/16/adplug/adplug-2.2.1/test/SAILOR.CFF b/16/adplug/adplug/test/SAILOR.CFF
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SAILOR.CFF
rename to 16/adplug/adplug/test/SAILOR.CFF

diff --git a/16/adplug/adplug-2.2.1/test/SAILOR.ref b/16/adplug/adplug/test/SAILOR.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SAILOR.ref
rename to 16/adplug/adplug/test/SAILOR.ref

diff --git a/16/adplug/adplug-2.2.1/test/SATNIGHT.HSP b/16/adplug/adplug/test/SATNIGHT.HSP
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SATNIGHT.HSP
rename to 16/adplug/adplug/test/SATNIGHT.HSP

diff --git a/16/adplug/adplug-2.2.1/test/SATNIGHT.ref b/16/adplug/adplug/test/SATNIGHT.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SATNIGHT.ref
rename to 16/adplug/adplug/test/SATNIGHT.ref

diff --git a/16/adplug/adplug-2.2.1/test/SCALES.SA2 b/16/adplug/adplug/test/SCALES.SA2
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SCALES.SA2
rename to 16/adplug/adplug/test/SCALES.SA2

diff --git a/16/adplug/adplug-2.2.1/test/SCALES.ref b/16/adplug/adplug/test/SCALES.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SCALES.ref
rename to 16/adplug/adplug/test/SCALES.ref

diff --git a/16/adplug/adplug-2.2.1/test/SMKEREM.HSC b/16/adplug/adplug/test/SMKEREM.HSC
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SMKEREM.HSC
rename to 16/adplug/adplug/test/SMKEREM.HSC

diff --git a/16/adplug/adplug-2.2.1/test/SMKEREM.ref b/16/adplug/adplug/test/SMKEREM.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SMKEREM.ref
rename to 16/adplug/adplug/test/SMKEREM.ref

diff --git a/16/adplug/adplug-2.2.1/test/SONG1.ins b/16/adplug/adplug/test/SONG1.ins
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SONG1.ins
rename to 16/adplug/adplug/test/SONG1.ins

diff --git a/16/adplug/adplug-2.2.1/test/SONG1.ref b/16/adplug/adplug/test/SONG1.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SONG1.ref
rename to 16/adplug/adplug/test/SONG1.ref

diff --git a/16/adplug/adplug-2.2.1/test/SONG1.sng b/16/adplug/adplug/test/SONG1.sng
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/SONG1.sng
rename to 16/adplug/adplug/test/SONG1.sng

diff --git a/16/adplug/adplug-2.2.1/test/TOCCATA.MAD b/16/adplug/adplug/test/TOCCATA.MAD
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TOCCATA.MAD
rename to 16/adplug/adplug/test/TOCCATA.MAD

diff --git a/16/adplug/adplug-2.2.1/test/TOCCATA.ref b/16/adplug/adplug/test/TOCCATA.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TOCCATA.ref
rename to 16/adplug/adplug/test/TOCCATA.ref

diff --git a/16/adplug/adplug-2.2.1/test/TUBES.SAT b/16/adplug/adplug/test/TUBES.SAT
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TUBES.SAT
rename to 16/adplug/adplug/test/TUBES.SAT

diff --git a/16/adplug/adplug-2.2.1/test/TUBES.ref b/16/adplug/adplug/test/TUBES.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TUBES.ref
rename to 16/adplug/adplug/test/TUBES.ref

diff --git a/16/adplug/adplug-2.2.1/test/TU_BLESS.AMD b/16/adplug/adplug/test/TU_BLESS.AMD
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TU_BLESS.AMD
rename to 16/adplug/adplug/test/TU_BLESS.AMD

diff --git a/16/adplug/adplug-2.2.1/test/TU_BLESS.ref b/16/adplug/adplug/test/TU_BLESS.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/TU_BLESS.ref
rename to 16/adplug/adplug/test/TU_BLESS.ref

diff --git a/16/adplug/adplug-2.2.1/test/VIB_VOL3.D00 b/16/adplug/adplug/test/VIB_VOL3.D00
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/VIB_VOL3.D00
rename to 16/adplug/adplug/test/VIB_VOL3.D00

diff --git a/16/adplug/adplug-2.2.1/test/VIB_VOL3.ref b/16/adplug/adplug/test/VIB_VOL3.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/VIB_VOL3.ref
rename to 16/adplug/adplug/test/VIB_VOL3.ref

diff --git a/16/adplug/adplug-2.2.1/test/WONDERIN.WLF b/16/adplug/adplug/test/WONDERIN.WLF
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/WONDERIN.WLF
rename to 16/adplug/adplug/test/WONDERIN.WLF

diff --git a/16/adplug/adplug-2.2.1/test/WONDERIN.ref b/16/adplug/adplug/test/WONDERIN.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/WONDERIN.ref
rename to 16/adplug/adplug/test/WONDERIN.ref

diff --git a/16/adplug/adplug-2.2.1/test/adlibsp.ref b/16/adplug/adplug/test/adlibsp.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/adlibsp.ref
rename to 16/adplug/adplug/test/adlibsp.ref

diff --git a/16/adplug/adplug-2.2.1/test/adlibsp.s3m b/16/adplug/adplug/test/adlibsp.s3m
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/adlibsp.s3m
rename to 16/adplug/adplug/test/adlibsp.s3m

diff --git a/16/adplug/adplug-2.2.1/test/blaster2.msc b/16/adplug/adplug/test/blaster2.msc
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/blaster2.msc
rename to 16/adplug/adplug/test/blaster2.msc

diff --git a/16/adplug/adplug-2.2.1/test/blaster2.ref b/16/adplug/adplug/test/blaster2.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/blaster2.ref
rename to 16/adplug/adplug/test/blaster2.ref

diff --git a/16/adplug/adplug-2.2.1/test/bmf1_2.ref b/16/adplug/adplug/test/bmf1_2.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/bmf1_2.ref
rename to 16/adplug/adplug/test/bmf1_2.ref

diff --git a/16/adplug/adplug-2.2.1/test/bmf1_2.xad b/16/adplug/adplug/test/bmf1_2.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/bmf1_2.xad
rename to 16/adplug/adplug/test/bmf1_2.xad

diff --git a/16/adplug/adplug-2.2.1/test/doofus.dro b/16/adplug/adplug/test/doofus.dro
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/doofus.dro
rename to 16/adplug/adplug/test/doofus.dro

diff --git a/16/adplug/adplug-2.2.1/test/doofus.ref b/16/adplug/adplug/test/doofus.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/doofus.ref
rename to 16/adplug/adplug/test/doofus.ref

diff --git a/16/adplug/adplug-2.2.1/test/dro_v2.dro b/16/adplug/adplug/test/dro_v2.dro
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/dro_v2.dro
rename to 16/adplug/adplug/test/dro_v2.dro

diff --git a/16/adplug/adplug-2.2.1/test/dro_v2.ref b/16/adplug/adplug/test/dro_v2.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/dro_v2.ref
rename to 16/adplug/adplug/test/dro_v2.ref

diff --git a/16/adplug/adplug-2.2.1/test/emutest.cpp b/16/adplug/adplug/test/emutest.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/emutest.cpp
rename to 16/adplug/adplug/test/emutest.cpp

diff --git a/16/adplug/adplug-2.2.1/test/fdance03.dmo b/16/adplug/adplug/test/fdance03.dmo
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/fdance03.dmo
rename to 16/adplug/adplug/test/fdance03.dmo

diff --git a/16/adplug/adplug-2.2.1/test/fdance03.ref b/16/adplug/adplug/test/fdance03.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/fdance03.ref
rename to 16/adplug/adplug/test/fdance03.ref

diff --git a/16/adplug/adplug-2.2.1/test/flash.ref b/16/adplug/adplug/test/flash.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/flash.ref
rename to 16/adplug/adplug/test/flash.ref

diff --git a/16/adplug/adplug-2.2.1/test/flash.xad b/16/adplug/adplug/test/flash.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/flash.xad
rename to 16/adplug/adplug/test/flash.xad

diff --git a/16/adplug/adplug-2.2.1/test/hybrid.ref b/16/adplug/adplug/test/hybrid.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/hybrid.ref
rename to 16/adplug/adplug/test/hybrid.ref

diff --git a/16/adplug/adplug-2.2.1/test/hybrid.xad b/16/adplug/adplug/test/hybrid.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/hybrid.xad
rename to 16/adplug/adplug/test/hybrid.xad

diff --git a/16/adplug/adplug-2.2.1/test/hyp.ref b/16/adplug/adplug/test/hyp.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/hyp.ref
rename to 16/adplug/adplug/test/hyp.ref

diff --git a/16/adplug/adplug-2.2.1/test/hyp.xad b/16/adplug/adplug/test/hyp.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/hyp.xad
rename to 16/adplug/adplug/test/hyp.xad

diff --git a/16/adplug/adplug-2.2.1/test/ice_thnk.ref b/16/adplug/adplug/test/ice_thnk.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ice_thnk.ref
rename to 16/adplug/adplug/test/ice_thnk.ref

diff --git a/16/adplug/adplug-2.2.1/test/ice_thnk.sci b/16/adplug/adplug/test/ice_thnk.sci
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/ice_thnk.sci
rename to 16/adplug/adplug/test/ice_thnk.sci

diff --git a/16/adplug/adplug-2.2.1/test/icepatch.003 b/16/adplug/adplug/test/icepatch.003
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/icepatch.003
rename to 16/adplug/adplug/test/icepatch.003

diff --git a/16/adplug/adplug-2.2.1/test/inc.raw b/16/adplug/adplug/test/inc.raw
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/inc.raw
rename to 16/adplug/adplug/test/inc.raw

diff --git a/16/adplug/adplug-2.2.1/test/inc.ref b/16/adplug/adplug/test/inc.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/inc.ref
rename to 16/adplug/adplug/test/inc.ref

diff --git a/16/adplug/adplug-2.2.1/test/insts.dat b/16/adplug/adplug/test/insts.dat
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/insts.dat
rename to 16/adplug/adplug/test/insts.dat

diff --git a/16/adplug/adplug-2.2.1/test/loudness.lds b/16/adplug/adplug/test/loudness.lds
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/loudness.lds
rename to 16/adplug/adplug/test/loudness.lds

diff --git a/16/adplug/adplug-2.2.1/test/loudness.ref b/16/adplug/adplug/test/loudness.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/loudness.ref
rename to 16/adplug/adplug/test/loudness.ref

diff --git a/16/adplug/adplug-2.2.1/test/mi2.laa b/16/adplug/adplug/test/mi2.laa
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/mi2.laa
rename to 16/adplug/adplug/test/mi2.laa

diff --git a/16/adplug/adplug-2.2.1/test/mi2.ref b/16/adplug/adplug/test/mi2.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/mi2.ref
rename to 16/adplug/adplug/test/mi2.ref

diff --git a/16/adplug/adplug-2.2.1/test/michaeld.cmf b/16/adplug/adplug/test/michaeld.cmf
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/michaeld.cmf
rename to 16/adplug/adplug/test/michaeld.cmf

diff --git a/16/adplug/adplug-2.2.1/test/michaeld.ref b/16/adplug/adplug/test/michaeld.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/michaeld.ref
rename to 16/adplug/adplug/test/michaeld.ref

diff --git a/16/adplug/adplug-2.2.1/test/playertest.cpp b/16/adplug/adplug/test/playertest.cpp
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/playertest.cpp
rename to 16/adplug/adplug/test/playertest.cpp

diff --git a/16/adplug/adplug-2.2.1/test/psi1.ref b/16/adplug/adplug/test/psi1.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/psi1.ref
rename to 16/adplug/adplug/test/psi1.ref

diff --git a/16/adplug/adplug-2.2.1/test/psi1.xad b/16/adplug/adplug/test/psi1.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/psi1.xad
rename to 16/adplug/adplug/test/psi1.xad

diff --git a/16/adplug/adplug-2.2.1/test/rat.ref b/16/adplug/adplug/test/rat.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/rat.ref
rename to 16/adplug/adplug/test/rat.ref

diff --git a/16/adplug/adplug-2.2.1/test/rat.xad b/16/adplug/adplug/test/rat.xad
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/rat.xad
rename to 16/adplug/adplug/test/rat.xad

diff --git a/16/adplug/adplug-2.2.1/test/samurai.dro b/16/adplug/adplug/test/samurai.dro
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/samurai.dro
rename to 16/adplug/adplug/test/samurai.dro

diff --git a/16/adplug/adplug-2.2.1/test/samurai.ref b/16/adplug/adplug/test/samurai.ref
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/samurai.ref
rename to 16/adplug/adplug/test/samurai.ref

diff --git a/16/adplug/adplug-2.2.1/test/standard.bnk b/16/adplug/adplug/test/standard.bnk
similarity index 100%
rename from 16/adplug/adplug-2.2.1/test/standard.bnk
rename to 16/adplug/adplug/test/standard.bnk

diff --git a/16/adplug/libbinio-1.4/AUTHORS b/16/adplug/libbinio/AUTHORS
similarity index 100%
rename from 16/adplug/libbinio-1.4/AUTHORS
rename to 16/adplug/libbinio/AUTHORS

diff --git a/16/adplug/libbinio-1.4/COPYING b/16/adplug/libbinio/COPYING
similarity index 100%
rename from 16/adplug/libbinio-1.4/COPYING
rename to 16/adplug/libbinio/COPYING

diff --git a/16/adplug/libbinio-1.4/ChangeLog b/16/adplug/libbinio/ChangeLog
similarity index 100%
rename from 16/adplug/libbinio-1.4/ChangeLog
rename to 16/adplug/libbinio/ChangeLog

diff --git a/16/adplug/libbinio-1.4/INSTALL b/16/adplug/libbinio/INSTALL
similarity index 100%
rename from 16/adplug/libbinio-1.4/INSTALL
rename to 16/adplug/libbinio/INSTALL

diff --git a/16/adplug/libbinio-1.4/INSTALL.dos b/16/adplug/libbinio/INSTALL.dos
similarity index 100%
rename from 16/adplug/libbinio-1.4/INSTALL.dos
rename to 16/adplug/libbinio/INSTALL.dos

diff --git a/16/adplug/libbinio-1.4/INSTALL.unix b/16/adplug/libbinio/INSTALL.unix
similarity index 100%
rename from 16/adplug/libbinio-1.4/INSTALL.unix
rename to 16/adplug/libbinio/INSTALL.unix

diff --git a/16/adplug/libbinio-1.4/INSTALL.win32 b/16/adplug/libbinio/INSTALL.win32
similarity index 100%
rename from 16/adplug/libbinio-1.4/INSTALL.win32
rename to 16/adplug/libbinio/INSTALL.win32

diff --git a/16/adplug/libbinio-1.4/Makefile.am b/16/adplug/libbinio/Makefile.am
similarity index 100%
rename from 16/adplug/libbinio-1.4/Makefile.am
rename to 16/adplug/libbinio/Makefile.am

diff --git a/16/adplug/libbinio-1.4/Makefile.bt b/16/adplug/libbinio/Makefile.bt
similarity index 100%
rename from 16/adplug/libbinio-1.4/Makefile.bt
rename to 16/adplug/libbinio/Makefile.bt

diff --git a/16/adplug/libbinio-1.4/Makefile.in b/16/adplug/libbinio/Makefile.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/Makefile.in
rename to 16/adplug/libbinio/Makefile.in

diff --git a/16/adplug/libbinio-1.4/Makefile.wat b/16/adplug/libbinio/Makefile.wat
similarity index 100%
rename from 16/adplug/libbinio-1.4/Makefile.wat
rename to 16/adplug/libbinio/Makefile.wat

diff --git a/16/adplug/libbinio-1.4/NEWS b/16/adplug/libbinio/NEWS
similarity index 100%
rename from 16/adplug/libbinio-1.4/NEWS
rename to 16/adplug/libbinio/NEWS

diff --git a/16/adplug/libbinio-1.4/README b/16/adplug/libbinio/README
similarity index 100%
rename from 16/adplug/libbinio-1.4/README
rename to 16/adplug/libbinio/README

diff --git a/16/adplug/libbinio-1.4/TODO b/16/adplug/libbinio/TODO
similarity index 100%
rename from 16/adplug/libbinio-1.4/TODO
rename to 16/adplug/libbinio/TODO

diff --git a/16/adplug/libbinio-1.4/aclocal.m4 b/16/adplug/libbinio/aclocal.m4
similarity index 100%
rename from 16/adplug/libbinio-1.4/aclocal.m4
rename to 16/adplug/libbinio/aclocal.m4

diff --git a/16/adplug/libbinio-1.4/binio.spec b/16/adplug/libbinio/binio.spec
similarity index 100%
rename from 16/adplug/libbinio-1.4/binio.spec
rename to 16/adplug/libbinio/binio.spec

diff --git a/16/adplug/libbinio-1.4/binio_mdk.spec b/16/adplug/libbinio/binio_mdk.spec
similarity index 100%
rename from 16/adplug/libbinio-1.4/binio_mdk.spec
rename to 16/adplug/libbinio/binio_mdk.spec

diff --git a/16/adplug/libbinio-1.4/config.guess b/16/adplug/libbinio/config.guess
similarity index 100%
rename from 16/adplug/libbinio-1.4/config.guess
rename to 16/adplug/libbinio/config.guess

diff --git a/16/adplug/libbinio-1.4/config.sub b/16/adplug/libbinio/config.sub
similarity index 100%
rename from 16/adplug/libbinio-1.4/config.sub
rename to 16/adplug/libbinio/config.sub

diff --git a/16/adplug/libbinio-1.4/configure b/16/adplug/libbinio/configure
similarity index 100%
rename from 16/adplug/libbinio-1.4/configure
rename to 16/adplug/libbinio/configure

diff --git a/16/adplug/libbinio-1.4/configure.in b/16/adplug/libbinio/configure.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/configure.in
rename to 16/adplug/libbinio/configure.in

diff --git a/16/adplug/libbinio-1.4/depcomp b/16/adplug/libbinio/depcomp
similarity index 100%
rename from 16/adplug/libbinio-1.4/depcomp
rename to 16/adplug/libbinio/depcomp

diff --git a/16/adplug/libbinio-1.4/doc/Makefile.am b/16/adplug/libbinio/doc/Makefile.am
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/Makefile.am
rename to 16/adplug/libbinio/doc/Makefile.am

diff --git a/16/adplug/libbinio-1.4/doc/Makefile.in b/16/adplug/libbinio/doc/Makefile.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/Makefile.in
rename to 16/adplug/libbinio/doc/Makefile.in

diff --git a/16/adplug/libbinio-1.4/doc/fdl.texi b/16/adplug/libbinio/doc/fdl.texi
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/fdl.texi
rename to 16/adplug/libbinio/doc/fdl.texi

diff --git a/16/adplug/libbinio-1.4/doc/libbinio.info b/16/adplug/libbinio/doc/libbinio.info
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/libbinio.info
rename to 16/adplug/libbinio/doc/libbinio.info

diff --git a/16/adplug/libbinio-1.4/doc/libbinio.info-1 b/16/adplug/libbinio/doc/libbinio.info-1
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/libbinio.info-1
rename to 16/adplug/libbinio/doc/libbinio.info-1

diff --git a/16/adplug/libbinio-1.4/doc/libbinio.info-2 b/16/adplug/libbinio/doc/libbinio.info-2
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/libbinio.info-2
rename to 16/adplug/libbinio/doc/libbinio.info-2

diff --git a/16/adplug/libbinio-1.4/doc/libbinio.texi b/16/adplug/libbinio/doc/libbinio.texi
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/libbinio.texi
rename to 16/adplug/libbinio/doc/libbinio.texi

diff --git a/16/adplug/libbinio-1.4/doc/mdate-sh b/16/adplug/libbinio/doc/mdate-sh
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/mdate-sh
rename to 16/adplug/libbinio/doc/mdate-sh

diff --git a/16/adplug/libbinio-1.4/doc/stamp-vti b/16/adplug/libbinio/doc/stamp-vti
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/stamp-vti
rename to 16/adplug/libbinio/doc/stamp-vti

diff --git a/16/adplug/libbinio-1.4/doc/texinfo.tex b/16/adplug/libbinio/doc/texinfo.tex
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/texinfo.tex
rename to 16/adplug/libbinio/doc/texinfo.tex

diff --git a/16/adplug/libbinio-1.4/doc/version.texi b/16/adplug/libbinio/doc/version.texi
similarity index 100%
rename from 16/adplug/libbinio-1.4/doc/version.texi
rename to 16/adplug/libbinio/doc/version.texi

diff --git a/16/adplug/libbinio-1.4/install-sh b/16/adplug/libbinio/install-sh
similarity index 100%
rename from 16/adplug/libbinio-1.4/install-sh
rename to 16/adplug/libbinio/install-sh

diff --git a/16/adplug/libbinio-1.4/libbinio.pc.in b/16/adplug/libbinio/libbinio.pc.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/libbinio.pc.in
rename to 16/adplug/libbinio/libbinio.pc.in

diff --git a/16/adplug/libbinio-1.4/libbinio.qpg b/16/adplug/libbinio/libbinio.qpg
similarity index 100%
rename from 16/adplug/libbinio-1.4/libbinio.qpg
rename to 16/adplug/libbinio/libbinio.qpg

diff --git a/16/adplug/libbinio-1.4/missing b/16/adplug/libbinio/missing
similarity index 100%
rename from 16/adplug/libbinio-1.4/missing
rename to 16/adplug/libbinio/missing

diff --git a/16/adplug/libbinio-1.4/mkinstalldirs b/16/adplug/libbinio/mkinstalldirs
similarity index 100%
rename from 16/adplug/libbinio-1.4/mkinstalldirs
rename to 16/adplug/libbinio/mkinstalldirs

diff --git a/16/adplug/libbinio-1.4/src/Makefile.am b/16/adplug/libbinio/src/Makefile.am
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/Makefile.am
rename to 16/adplug/libbinio/src/Makefile.am

diff --git a/16/adplug/libbinio-1.4/src/Makefile.bt b/16/adplug/libbinio/src/Makefile.bt
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/Makefile.bt
rename to 16/adplug/libbinio/src/Makefile.bt

diff --git a/16/adplug/libbinio-1.4/src/Makefile.in b/16/adplug/libbinio/src/Makefile.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/Makefile.in
rename to 16/adplug/libbinio/src/Makefile.in

diff --git a/16/adplug/libbinio-1.4/src/binfile.cpp b/16/adplug/libbinio/src/binfile.cpp
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binfile.cpp
rename to 16/adplug/libbinio/src/binfile.cpp

diff --git a/16/adplug/libbinio-1.4/src/binfile.h b/16/adplug/libbinio/src/binfile.h
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binfile.h
rename to 16/adplug/libbinio/src/binfile.h

diff --git a/16/adplug/libbinio-1.4/src/binio.cpp b/16/adplug/libbinio/src/binio.cpp
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binio.cpp
rename to 16/adplug/libbinio/src/binio.cpp

diff --git a/16/adplug/libbinio-1.4/src/binio.h b/16/adplug/libbinio/src/binio.h
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binio.h
rename to 16/adplug/libbinio/src/binio.h

diff --git a/16/adplug/libbinio-1.4/src/binio.h.in b/16/adplug/libbinio/src/binio.h.in
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binio.h.in
rename to 16/adplug/libbinio/src/binio.h.in

diff --git a/16/adplug/libbinio-1.4/src/binstr.cpp b/16/adplug/libbinio/src/binstr.cpp
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binstr.cpp
rename to 16/adplug/libbinio/src/binstr.cpp

diff --git a/16/adplug/libbinio-1.4/src/binstr.h b/16/adplug/libbinio/src/binstr.h
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binstr.h
rename to 16/adplug/libbinio/src/binstr.h

diff --git a/16/adplug/libbinio-1.4/src/binwrap.cpp b/16/adplug/libbinio/src/binwrap.cpp
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binwrap.cpp
rename to 16/adplug/libbinio/src/binwrap.cpp

diff --git a/16/adplug/libbinio-1.4/src/binwrap.h b/16/adplug/libbinio/src/binwrap.h
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/binwrap.h
rename to 16/adplug/libbinio/src/binwrap.h

diff --git a/16/adplug/libbinio-1.4/src/libbinio.dsp b/16/adplug/libbinio/src/libbinio.dsp
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/libbinio.dsp
rename to 16/adplug/libbinio/src/libbinio.dsp

diff --git a/16/adplug/libbinio-1.4/src/vc6inst.bat b/16/adplug/libbinio/src/vc6inst.bat
similarity index 100%
rename from 16/adplug/libbinio-1.4/src/vc6inst.bat
rename to 16/adplug/libbinio/src/vc6inst.bat