diff --git a/plugins/cdvd/CDVDpeops/CDVDiso.c b/plugins/CDVDpeops/CDVDiso.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CDVDiso.c
rename to plugins/CDVDpeops/CDVDiso.c
diff --git a/plugins/cdvd/CDVDpeops/CDVDiso.h b/plugins/CDVDpeops/CDVDiso.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CDVDiso.h
rename to plugins/CDVDpeops/CDVDiso.h
diff --git a/plugins/cdvd/CDVDpeops/CDVDisodrv.c b/plugins/CDVDpeops/CDVDisodrv.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CDVDisodrv.c
rename to plugins/CDVDpeops/CDVDisodrv.c
diff --git a/plugins/cdvd/CDVDpeops/CDVDisodrv.h b/plugins/CDVDpeops/CDVDisodrv.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CDVDisodrv.h
rename to plugins/CDVDpeops/CDVDisodrv.h
diff --git a/plugins/cdvd/CDVDpeops/CDVDlib.h b/plugins/CDVDpeops/CDVDlib.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CDVDlib.h
rename to plugins/CDVDpeops/CDVDlib.h
diff --git a/plugins/cdvd/CDVDpeops/CLEAN.BAT b/plugins/CDVDpeops/CLEAN.BAT
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CLEAN.BAT
rename to plugins/CDVDpeops/CLEAN.BAT
diff --git a/plugins/cdvd/CDVDpeops/Cdr.c b/plugins/CDVDpeops/Cdr.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Cdr.c
rename to plugins/CDVDpeops/Cdr.c
diff --git a/plugins/cdvd/CDVDpeops/Cdr.c.bak b/plugins/CDVDpeops/Cdr.c.bak
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Cdr.c.bak
rename to plugins/CDVDpeops/Cdr.c.bak
diff --git a/plugins/cdvd/CDVDpeops/Cfg.c b/plugins/CDVDpeops/Cfg.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Cfg.c
rename to plugins/CDVDpeops/Cfg.c
diff --git a/plugins/cdvd/CDVDpeops/CheckDiskType.c b/plugins/CDVDpeops/CheckDiskType.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/CheckDiskType.c
rename to plugins/CDVDpeops/CheckDiskType.c
diff --git a/plugins/cdvd/CDVDpeops/Ioctrl.c b/plugins/CDVDpeops/Ioctrl.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Ioctrl.c
rename to plugins/CDVDpeops/Ioctrl.c
diff --git a/plugins/cdvd/CDVDpeops/Makefile.win b/plugins/CDVDpeops/Makefile.win
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Makefile.win
rename to plugins/CDVDpeops/Makefile.win
diff --git a/plugins/cdvd/CDVDpeops/PS2Edefs.h b/plugins/CDVDpeops/PS2Edefs.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/PS2Edefs.h
rename to plugins/CDVDpeops/PS2Edefs.h
diff --git a/plugins/cdvd/CDVDpeops/PS2Etypes.h b/plugins/CDVDpeops/PS2Etypes.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/PS2Etypes.h
rename to plugins/CDVDpeops/PS2Etypes.h
diff --git a/plugins/cdvd/CDVDpeops/ReadMe.txt b/plugins/CDVDpeops/ReadMe.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/ReadMe.txt
rename to plugins/CDVDpeops/ReadMe.txt
diff --git a/plugins/cdvd/CDVDpeops/Scsi.c b/plugins/CDVDpeops/Scsi.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/Scsi.c
rename to plugins/CDVDpeops/Scsi.c
diff --git a/plugins/cdvd/CDVDpeops/StdAfx.c b/plugins/CDVDpeops/StdAfx.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/StdAfx.c
rename to plugins/CDVDpeops/StdAfx.c
diff --git a/plugins/cdvd/CDVDpeops/StdAfx.h b/plugins/CDVDpeops/StdAfx.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/StdAfx.h
rename to plugins/CDVDpeops/StdAfx.h
diff --git a/plugins/cdvd/CDVDpeops/build.sh b/plugins/CDVDpeops/build.sh
similarity index 100%
rename from plugins/cdvd/CDVDpeops/build.sh
rename to plugins/CDVDpeops/build.sh
diff --git a/plugins/cdvd/CDVDpeops/cdda.c b/plugins/CDVDpeops/cdda.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdda.c
rename to plugins/CDVDpeops/cdda.c
diff --git a/plugins/cdvd/CDVDpeops/cdda.h b/plugins/CDVDpeops/cdda.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdda.h
rename to plugins/CDVDpeops/cdda.h
diff --git a/plugins/cdvd/CDVDpeops/cdr.h b/plugins/CDVDpeops/cdr.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdr.h
rename to plugins/CDVDpeops/cdr.h
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.aps b/plugins/CDVDpeops/cdvdPeops.aps
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.aps
rename to plugins/CDVDpeops/cdvdPeops.aps
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.c b/plugins/CDVDpeops/cdvdPeops.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.c
rename to plugins/CDVDpeops/cdvdPeops.c
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.def b/plugins/CDVDpeops/cdvdPeops.def
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.def
rename to plugins/CDVDpeops/cdvdPeops.def
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.def.bak b/plugins/CDVDpeops/cdvdPeops.def.bak
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.def.bak
rename to plugins/CDVDpeops/cdvdPeops.def.bak
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.dev b/plugins/CDVDpeops/cdvdPeops.dev
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.dev
rename to plugins/CDVDpeops/cdvdPeops.dev
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.dsp b/plugins/CDVDpeops/cdvdPeops.dsp
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.dsp
rename to plugins/CDVDpeops/cdvdPeops.dsp
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.dsw b/plugins/CDVDpeops/cdvdPeops.dsw
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.dsw
rename to plugins/CDVDpeops/cdvdPeops.dsw
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.h b/plugins/CDVDpeops/cdvdPeops.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.h
rename to plugins/CDVDpeops/cdvdPeops.h
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.layout b/plugins/CDVDpeops/cdvdPeops.layout
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.layout
rename to plugins/CDVDpeops/cdvdPeops.layout
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.opt b/plugins/CDVDpeops/cdvdPeops.opt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.opt
rename to plugins/CDVDpeops/cdvdPeops.opt
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.plg b/plugins/CDVDpeops/cdvdPeops.plg
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.plg
rename to plugins/CDVDpeops/cdvdPeops.plg
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.rc b/plugins/CDVDpeops/cdvdPeops.rc
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.rc
rename to plugins/CDVDpeops/cdvdPeops.rc
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.sln b/plugins/CDVDpeops/cdvdPeops.sln
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.sln
rename to plugins/CDVDpeops/cdvdPeops.sln
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops.vcproj b/plugins/CDVDpeops/cdvdPeops.vcproj
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops.vcproj
rename to plugins/CDVDpeops/cdvdPeops.vcproj
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops_2005.sln b/plugins/CDVDpeops/cdvdPeops_2005.sln
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops_2005.sln
rename to plugins/CDVDpeops/cdvdPeops_2005.sln
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops_2005.vcproj b/plugins/CDVDpeops/cdvdPeops_2005.vcproj
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops_2005.vcproj
rename to plugins/CDVDpeops/cdvdPeops_2005.vcproj
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops_private.h b/plugins/CDVDpeops/cdvdPeops_private.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops_private.h
rename to plugins/CDVDpeops/cdvdPeops_private.h
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops_private.rc b/plugins/CDVDpeops/cdvdPeops_private.rc
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops_private.rc
rename to plugins/CDVDpeops/cdvdPeops_private.rc
diff --git a/plugins/cdvd/CDVDpeops/cdvdPeops_private.res b/plugins/CDVDpeops/cdvdPeops_private.res
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cdvdPeops_private.res
rename to plugins/CDVDpeops/cdvdPeops_private.res
diff --git a/plugins/cdvd/CDVDpeops/cfg.h b/plugins/CDVDpeops/cfg.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/cfg.h
rename to plugins/CDVDpeops/cfg.h
diff --git a/plugins/cdvd/CDVDpeops/changelog.txt b/plugins/CDVDpeops/changelog.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/changelog.txt
rename to plugins/CDVDpeops/changelog.txt
diff --git a/plugins/cdvd/CDVDpeops/defines.h b/plugins/CDVDpeops/defines.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/defines.h
rename to plugins/CDVDpeops/defines.h
diff --git a/plugins/cdvd/CDVDpeops/defines.h.bak b/plugins/CDVDpeops/defines.h.bak
similarity index 100%
rename from plugins/cdvd/CDVDpeops/defines.h.bak
rename to plugins/CDVDpeops/defines.h.bak
diff --git a/plugins/cdvd/CDVDpeops/externals.h b/plugins/CDVDpeops/externals.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/externals.h
rename to plugins/CDVDpeops/externals.h
diff --git a/plugins/cdvd/CDVDpeops/externals.h.bak b/plugins/CDVDpeops/externals.h.bak
similarity index 100%
rename from plugins/cdvd/CDVDpeops/externals.h.bak
rename to plugins/CDVDpeops/externals.h.bak
diff --git a/plugins/cdvd/CDVDpeops/filemap.txt b/plugins/CDVDpeops/filemap.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/filemap.txt
rename to plugins/CDVDpeops/filemap.txt
diff --git a/plugins/cdvd/CDVDpeops/generic.c b/plugins/CDVDpeops/generic.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/generic.c
rename to plugins/CDVDpeops/generic.c
diff --git a/plugins/cdvd/CDVDpeops/generic.c.bak b/plugins/CDVDpeops/generic.c.bak
similarity index 100%
rename from plugins/cdvd/CDVDpeops/generic.c.bak
rename to plugins/CDVDpeops/generic.c.bak
diff --git a/plugins/cdvd/CDVDpeops/generic.h b/plugins/CDVDpeops/generic.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/generic.h
rename to plugins/CDVDpeops/generic.h
diff --git a/plugins/cdvd/CDVDpeops/i386.asm b/plugins/CDVDpeops/i386.asm
similarity index 100%
rename from plugins/cdvd/CDVDpeops/i386.asm
rename to plugins/CDVDpeops/i386.asm
diff --git a/plugins/cdvd/CDVDpeops/ioctrl.h b/plugins/CDVDpeops/ioctrl.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/ioctrl.h
rename to plugins/CDVDpeops/ioctrl.h
diff --git a/plugins/cdvd/CDVDpeops/libiso.c b/plugins/CDVDpeops/libiso.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/libiso.c
rename to plugins/CDVDpeops/libiso.c
diff --git a/plugins/cdvd/CDVDpeops/libiso.h b/plugins/CDVDpeops/libiso.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/libiso.h
rename to plugins/CDVDpeops/libiso.h
diff --git a/plugins/cdvd/CDVDpeops/license.txt b/plugins/CDVDpeops/license.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/license.txt
rename to plugins/CDVDpeops/license.txt
diff --git a/plugins/cdvd/CDVDpeops/macros.inc b/plugins/CDVDpeops/macros.inc
similarity index 100%
rename from plugins/cdvd/CDVDpeops/macros.inc
rename to plugins/CDVDpeops/macros.inc
diff --git a/plugins/cdvd/CDVDpeops/mingw/afxres.h b/plugins/CDVDpeops/mingw/afxres.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/mingw/afxres.h
rename to plugins/CDVDpeops/mingw/afxres.h
diff --git a/plugins/cdvd/CDVDpeops/ppf.c b/plugins/CDVDpeops/ppf.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/ppf.c
rename to plugins/CDVDpeops/ppf.c
diff --git a/plugins/cdvd/CDVDpeops/ppf.h b/plugins/CDVDpeops/ppf.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/ppf.h
rename to plugins/CDVDpeops/ppf.h
diff --git a/plugins/cdvd/CDVDpeops/read.c b/plugins/CDVDpeops/read.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/read.c
rename to plugins/CDVDpeops/read.c
diff --git a/plugins/cdvd/CDVDpeops/read.h b/plugins/CDVDpeops/read.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/read.h
rename to plugins/CDVDpeops/read.h
diff --git a/plugins/cdvd/CDVDpeops/readme_1_2.txt b/plugins/CDVDpeops/readme_1_2.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/readme_1_2.txt
rename to plugins/CDVDpeops/readme_1_2.txt
diff --git a/plugins/cdvd/CDVDpeops/resource.h b/plugins/CDVDpeops/resource.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/resource.h
rename to plugins/CDVDpeops/resource.h
diff --git a/plugins/cdvd/CDVDpeops/scsi.h b/plugins/CDVDpeops/scsi.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/scsi.h
rename to plugins/CDVDpeops/scsi.h
diff --git a/plugins/cdvd/CDVDpeops/scsidefs.h b/plugins/CDVDpeops/scsidefs.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/scsidefs.h
rename to plugins/CDVDpeops/scsidefs.h
diff --git a/plugins/cdvd/CDVDpeops/sub.c b/plugins/CDVDpeops/sub.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/sub.c
rename to plugins/CDVDpeops/sub.c
diff --git a/plugins/cdvd/CDVDpeops/sub.h b/plugins/CDVDpeops/sub.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/sub.h
rename to plugins/CDVDpeops/sub.h
diff --git a/plugins/cdvd/CDVDpeops/toc.c b/plugins/CDVDpeops/toc.c
similarity index 100%
rename from plugins/cdvd/CDVDpeops/toc.c
rename to plugins/CDVDpeops/toc.c
diff --git a/plugins/cdvd/CDVDpeops/toc.h b/plugins/CDVDpeops/toc.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/toc.h
rename to plugins/CDVDpeops/toc.h
diff --git a/plugins/cdvd/CDVDpeops/version_1_2.txt b/plugins/CDVDpeops/version_1_2.txt
similarity index 100%
rename from plugins/cdvd/CDVDpeops/version_1_2.txt
rename to plugins/CDVDpeops/version_1_2.txt
diff --git a/plugins/cdvd/CDVDpeops/wnaspi32.h b/plugins/CDVDpeops/wnaspi32.h
similarity index 100%
rename from plugins/cdvd/CDVDpeops/wnaspi32.h
rename to plugins/CDVDpeops/wnaspi32.h