diff --git a/plugins/cdvd/CDVDolio/SettingsDlg.cpp b/plugins/CDVDolio/SettingsDlg.cpp
similarity index 100%
rename from plugins/cdvd/CDVDolio/SettingsDlg.cpp
rename to plugins/CDVDolio/SettingsDlg.cpp
diff --git a/plugins/cdvd/CDVDolio/SettingsDlg.h b/plugins/CDVDolio/SettingsDlg.h
similarity index 100%
rename from plugins/cdvd/CDVDolio/SettingsDlg.h
rename to plugins/CDVDolio/SettingsDlg.h
diff --git a/plugins/cdvd/CDVDolio/cdvd.cpp b/plugins/CDVDolio/cdvd.cpp
similarity index 100%
rename from plugins/cdvd/CDVDolio/cdvd.cpp
rename to plugins/CDVDolio/cdvd.cpp
diff --git a/plugins/cdvd/CDVDolio/cdvd.def b/plugins/CDVDolio/cdvd.def
similarity index 100%
rename from plugins/cdvd/CDVDolio/cdvd.def
rename to plugins/CDVDolio/cdvd.def
diff --git a/plugins/cdvd/CDVDolio/cdvd.h b/plugins/CDVDolio/cdvd.h
similarity index 100%
rename from plugins/cdvd/CDVDolio/cdvd.h
rename to plugins/CDVDolio/cdvd.h
diff --git a/plugins/cdvd/CDVDolio/cdvd.rc b/plugins/CDVDolio/cdvd.rc
similarity index 100%
rename from plugins/cdvd/CDVDolio/cdvd.rc
rename to plugins/CDVDolio/cdvd.rc
diff --git a/plugins/cdvd/CDVDolio/cdvd_vs2008.vcproj b/plugins/CDVDolio/cdvd_vs2008.vcproj
similarity index 100%
rename from plugins/cdvd/CDVDolio/cdvd_vs2008.vcproj
rename to plugins/CDVDolio/cdvd_vs2008.vcproj
diff --git a/plugins/cdvd/CDVDolio/res/cdvd.rc2 b/plugins/CDVDolio/res/cdvd.rc2
similarity index 100%
rename from plugins/cdvd/CDVDolio/res/cdvd.rc2
rename to plugins/CDVDolio/res/cdvd.rc2
diff --git a/plugins/cdvd/CDVDolio/resource.h b/plugins/CDVDolio/resource.h
similarity index 100%
rename from plugins/cdvd/CDVDolio/resource.h
rename to plugins/CDVDolio/resource.h
diff --git a/plugins/cdvd/CDVDolio/stdafx.cpp b/plugins/CDVDolio/stdafx.cpp
similarity index 100%
rename from plugins/cdvd/CDVDolio/stdafx.cpp
rename to plugins/CDVDolio/stdafx.cpp
diff --git a/plugins/cdvd/CDVDolio/stdafx.h b/plugins/CDVDolio/stdafx.h
similarity index 100%
rename from plugins/cdvd/CDVDolio/stdafx.h
rename to plugins/CDVDolio/stdafx.h
diff --git a/plugins/cdvd/CDVDolio/svnrev_template.h b/plugins/CDVDolio/svnrev_template.h
similarity index 100%
rename from plugins/cdvd/CDVDolio/svnrev_template.h
rename to plugins/CDVDolio/svnrev_template.h
diff --git a/plugins/cdvd/CDVDolio/vsprops/common.vsprops b/plugins/CDVDolio/vsprops/common.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/common.vsprops
rename to plugins/CDVDolio/vsprops/common.vsprops
diff --git a/plugins/cdvd/CDVDolio/vsprops/debug.vsprops b/plugins/CDVDolio/vsprops/debug.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/debug.vsprops
rename to plugins/CDVDolio/vsprops/debug.vsprops
diff --git a/plugins/cdvd/CDVDolio/vsprops/release.vsprops b/plugins/CDVDolio/vsprops/release.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/release.vsprops
rename to plugins/CDVDolio/vsprops/release.vsprops
diff --git a/plugins/cdvd/CDVDolio/vsprops/sse2.vsprops b/plugins/CDVDolio/vsprops/sse2.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/sse2.vsprops
rename to plugins/CDVDolio/vsprops/sse2.vsprops
diff --git a/plugins/cdvd/CDVDolio/vsprops/sse4.vsprops b/plugins/CDVDolio/vsprops/sse4.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/sse4.vsprops
rename to plugins/CDVDolio/vsprops/sse4.vsprops
diff --git a/plugins/cdvd/CDVDolio/vsprops/ssse3.vsprops b/plugins/CDVDolio/vsprops/ssse3.vsprops
similarity index 100%
rename from plugins/cdvd/CDVDolio/vsprops/ssse3.vsprops
rename to plugins/CDVDolio/vsprops/ssse3.vsprops