diff --git a/plugins/spu2/PeopsSPU2/Filemap.txt b/plugins/PeopsSPU2/Filemap.txt
similarity index 100%
rename from plugins/spu2/PeopsSPU2/Filemap.txt
rename to plugins/PeopsSPU2/Filemap.txt
diff --git a/plugins/spu2/PeopsSPU2/Makefile b/plugins/PeopsSPU2/Makefile
similarity index 100%
rename from plugins/spu2/PeopsSPU2/Makefile
rename to plugins/PeopsSPU2/Makefile
diff --git a/plugins/spu2/PeopsSPU2/Makefile.win b/plugins/PeopsSPU2/Makefile.win
similarity index 100%
rename from plugins/spu2/PeopsSPU2/Makefile.win
rename to plugins/PeopsSPU2/Makefile.win
diff --git a/plugins/spu2/PeopsSPU2/_bsc.txt b/plugins/PeopsSPU2/_bsc.txt
similarity index 100%
rename from plugins/spu2/PeopsSPU2/_bsc.txt
rename to plugins/PeopsSPU2/_bsc.txt
diff --git a/plugins/spu2/PeopsSPU2/adsr.c b/plugins/PeopsSPU2/adsr.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/adsr.c
rename to plugins/PeopsSPU2/adsr.c
diff --git a/plugins/spu2/PeopsSPU2/adsr.h b/plugins/PeopsSPU2/adsr.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/adsr.h
rename to plugins/PeopsSPU2/adsr.h
diff --git a/plugins/spu2/PeopsSPU2/alsa.c b/plugins/PeopsSPU2/alsa.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/alsa.c
rename to plugins/PeopsSPU2/alsa.c
diff --git a/plugins/spu2/PeopsSPU2/alsa.h b/plugins/PeopsSPU2/alsa.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/alsa.h
rename to plugins/PeopsSPU2/alsa.h
diff --git a/plugins/spu2/PeopsSPU2/build.sh b/plugins/PeopsSPU2/build.sh
similarity index 100%
rename from plugins/spu2/PeopsSPU2/build.sh
rename to plugins/PeopsSPU2/build.sh
diff --git a/plugins/spu2/PeopsSPU2/cfg.c b/plugins/PeopsSPU2/cfg.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/cfg.c
rename to plugins/PeopsSPU2/cfg.c
diff --git a/plugins/spu2/PeopsSPU2/cfg.h b/plugins/PeopsSPU2/cfg.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/cfg.h
rename to plugins/PeopsSPU2/cfg.h
diff --git a/plugins/spu2/PeopsSPU2/clean.bat b/plugins/PeopsSPU2/clean.bat
similarity index 100%
rename from plugins/spu2/PeopsSPU2/clean.bat
rename to plugins/PeopsSPU2/clean.bat
diff --git a/plugins/spu2/PeopsSPU2/debug.c b/plugins/PeopsSPU2/debug.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/debug.c
rename to plugins/PeopsSPU2/debug.c
diff --git a/plugins/spu2/PeopsSPU2/debug.h b/plugins/PeopsSPU2/debug.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/debug.h
rename to plugins/PeopsSPU2/debug.h
diff --git a/plugins/spu2/PeopsSPU2/dma.c b/plugins/PeopsSPU2/dma.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/dma.c
rename to plugins/PeopsSPU2/dma.c
diff --git a/plugins/spu2/PeopsSPU2/dma.h b/plugins/PeopsSPU2/dma.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/dma.h
rename to plugins/PeopsSPU2/dma.h
diff --git a/plugins/spu2/PeopsSPU2/dsound.c b/plugins/PeopsSPU2/dsound.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/dsound.c
rename to plugins/PeopsSPU2/dsound.c
diff --git a/plugins/spu2/PeopsSPU2/dsound.h b/plugins/PeopsSPU2/dsound.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/dsound.h
rename to plugins/PeopsSPU2/dsound.h
diff --git a/plugins/spu2/PeopsSPU2/dsoundoss.h b/plugins/PeopsSPU2/dsoundoss.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/dsoundoss.h
rename to plugins/PeopsSPU2/dsoundoss.h
diff --git a/plugins/spu2/PeopsSPU2/externals.h b/plugins/PeopsSPU2/externals.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/externals.h
rename to plugins/PeopsSPU2/externals.h
diff --git a/plugins/spu2/PeopsSPU2/freeze.c b/plugins/PeopsSPU2/freeze.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/freeze.c
rename to plugins/PeopsSPU2/freeze.c
diff --git a/plugins/spu2/PeopsSPU2/gauss_i.h b/plugins/PeopsSPU2/gauss_i.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/gauss_i.h
rename to plugins/PeopsSPU2/gauss_i.h
diff --git a/plugins/spu2/PeopsSPU2/mingw/afxres.h b/plugins/PeopsSPU2/mingw/afxres.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/mingw/afxres.h
rename to plugins/PeopsSPU2/mingw/afxres.h
diff --git a/plugins/spu2/PeopsSPU2/oss.c b/plugins/PeopsSPU2/oss.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/oss.c
rename to plugins/PeopsSPU2/oss.c
diff --git a/plugins/spu2/PeopsSPU2/oss.h b/plugins/PeopsSPU2/oss.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/oss.h
rename to plugins/PeopsSPU2/oss.h
diff --git a/plugins/spu2/PeopsSPU2/psemu.c b/plugins/PeopsSPU2/psemu.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/psemu.c
rename to plugins/PeopsSPU2/psemu.c
diff --git a/plugins/spu2/PeopsSPU2/psemuxa.h b/plugins/PeopsSPU2/psemuxa.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/psemuxa.h
rename to plugins/PeopsSPU2/psemuxa.h
diff --git a/plugins/spu2/PeopsSPU2/record.c b/plugins/PeopsSPU2/record.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/record.c
rename to plugins/PeopsSPU2/record.c
diff --git a/plugins/spu2/PeopsSPU2/record.h b/plugins/PeopsSPU2/record.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/record.h
rename to plugins/PeopsSPU2/record.h
diff --git a/plugins/spu2/PeopsSPU2/registers.c b/plugins/PeopsSPU2/registers.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/registers.c
rename to plugins/PeopsSPU2/registers.c
diff --git a/plugins/spu2/PeopsSPU2/registers.h b/plugins/PeopsSPU2/registers.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/registers.h
rename to plugins/PeopsSPU2/registers.h
diff --git a/plugins/spu2/PeopsSPU2/regs.h b/plugins/PeopsSPU2/regs.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/regs.h
rename to plugins/PeopsSPU2/regs.h
diff --git a/plugins/spu2/PeopsSPU2/res/spu2PeopsSound.rc2 b/plugins/PeopsSPU2/res/spu2PeopsSound.rc2
similarity index 100%
rename from plugins/spu2/PeopsSPU2/res/spu2PeopsSound.rc2
rename to plugins/PeopsSPU2/res/spu2PeopsSound.rc2
diff --git a/plugins/spu2/PeopsSPU2/resource.h b/plugins/PeopsSPU2/resource.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/resource.h
rename to plugins/PeopsSPU2/resource.h
diff --git a/plugins/spu2/PeopsSPU2/reverb.c b/plugins/PeopsSPU2/reverb.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/reverb.c
rename to plugins/PeopsSPU2/reverb.c
diff --git a/plugins/spu2/PeopsSPU2/reverb.h b/plugins/PeopsSPU2/reverb.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/reverb.h
rename to plugins/PeopsSPU2/reverb.h
diff --git a/plugins/spu2/PeopsSPU2/spu.c b/plugins/PeopsSPU2/spu.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu.c
rename to plugins/PeopsSPU2/spu.c
diff --git a/plugins/spu2/PeopsSPU2/spu.h b/plugins/PeopsSPU2/spu.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu.h
rename to plugins/PeopsSPU2/spu.h
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.aps b/plugins/PeopsSPU2/spu2PeopsSound.aps
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.aps
rename to plugins/PeopsSPU2/spu2PeopsSound.aps
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.c b/plugins/PeopsSPU2/spu2PeopsSound.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.c
rename to plugins/PeopsSPU2/spu2PeopsSound.c
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.def b/plugins/PeopsSPU2/spu2PeopsSound.def
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.def
rename to plugins/PeopsSPU2/spu2PeopsSound.def
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.dev b/plugins/PeopsSPU2/spu2PeopsSound.dev
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.dev
rename to plugins/PeopsSPU2/spu2PeopsSound.dev
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.dsp b/plugins/PeopsSPU2/spu2PeopsSound.dsp
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.dsp
rename to plugins/PeopsSPU2/spu2PeopsSound.dsp
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.dsw b/plugins/PeopsSPU2/spu2PeopsSound.dsw
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.dsw
rename to plugins/PeopsSPU2/spu2PeopsSound.dsw
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.layout b/plugins/PeopsSPU2/spu2PeopsSound.layout
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.layout
rename to plugins/PeopsSPU2/spu2PeopsSound.layout
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.opt b/plugins/PeopsSPU2/spu2PeopsSound.opt
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.opt
rename to plugins/PeopsSPU2/spu2PeopsSound.opt
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.plg b/plugins/PeopsSPU2/spu2PeopsSound.plg
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.plg
rename to plugins/PeopsSPU2/spu2PeopsSound.plg
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.rc b/plugins/PeopsSPU2/spu2PeopsSound.rc
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.rc
rename to plugins/PeopsSPU2/spu2PeopsSound.rc
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.sln b/plugins/PeopsSPU2/spu2PeopsSound.sln
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.sln
rename to plugins/PeopsSPU2/spu2PeopsSound.sln
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound.vcproj b/plugins/PeopsSPU2/spu2PeopsSound.vcproj
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound.vcproj
rename to plugins/PeopsSPU2/spu2PeopsSound.vcproj
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_2005.sln b/plugins/PeopsSPU2/spu2PeopsSound_2005.sln
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_2005.sln
rename to plugins/PeopsSPU2/spu2PeopsSound_2005.sln
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_2005.vcproj b/plugins/PeopsSPU2/spu2PeopsSound_2005.vcproj
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_2005.vcproj
rename to plugins/PeopsSPU2/spu2PeopsSound_2005.vcproj
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_2005_x64.sln b/plugins/PeopsSPU2/spu2PeopsSound_2005_x64.sln
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_2005_x64.sln
rename to plugins/PeopsSPU2/spu2PeopsSound_2005_x64.sln
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_2005_x64.vcproj b/plugins/PeopsSPU2/spu2PeopsSound_2005_x64.vcproj
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_2005_x64.vcproj
rename to plugins/PeopsSPU2/spu2PeopsSound_2005_x64.vcproj
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_2008.vcproj b/plugins/PeopsSPU2/spu2PeopsSound_2008.vcproj
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_2008.vcproj
rename to plugins/PeopsSPU2/spu2PeopsSound_2008.vcproj
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_private.h b/plugins/PeopsSPU2/spu2PeopsSound_private.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_private.h
rename to plugins/PeopsSPU2/spu2PeopsSound_private.h
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_private.rc b/plugins/PeopsSPU2/spu2PeopsSound_private.rc
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_private.rc
rename to plugins/PeopsSPU2/spu2PeopsSound_private.rc
diff --git a/plugins/spu2/PeopsSPU2/spu2PeopsSound_private.res b/plugins/PeopsSPU2/spu2PeopsSound_private.res
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spu2PeopsSound_private.res
rename to plugins/PeopsSPU2/spu2PeopsSound_private.res
diff --git a/plugins/spu2/PeopsSPU2/spunew.c b/plugins/PeopsSPU2/spunew.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/spunew.c
rename to plugins/PeopsSPU2/spunew.c
diff --git a/plugins/spu2/PeopsSPU2/stdafx.c b/plugins/PeopsSPU2/stdafx.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/stdafx.c
rename to plugins/PeopsSPU2/stdafx.c
diff --git a/plugins/spu2/PeopsSPU2/stdafx.h b/plugins/PeopsSPU2/stdafx.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/stdafx.h
rename to plugins/PeopsSPU2/stdafx.h
diff --git a/plugins/spu2/PeopsSPU2/xa.c b/plugins/PeopsSPU2/xa.c
similarity index 100%
rename from plugins/spu2/PeopsSPU2/xa.c
rename to plugins/PeopsSPU2/xa.c
diff --git a/plugins/spu2/PeopsSPU2/xa.h b/plugins/PeopsSPU2/xa.h
similarity index 100%
rename from plugins/spu2/PeopsSPU2/xa.h
rename to plugins/PeopsSPU2/xa.h