diff --git a/plugins/fw/FWnull/FW.c b/plugins/FWnull/FW.c
similarity index 100%
rename from plugins/fw/FWnull/FW.c
rename to plugins/FWnull/FW.c
diff --git a/plugins/fw/FWnull/FW.h b/plugins/FWnull/FW.h
similarity index 100%
rename from plugins/fw/FWnull/FW.h
rename to plugins/FWnull/FW.h
diff --git a/plugins/fw/FWnull/License.txt b/plugins/FWnull/License.txt
similarity index 100%
rename from plugins/fw/FWnull/License.txt
rename to plugins/FWnull/License.txt
diff --git a/plugins/fw/FWnull/Linux/Config.c b/plugins/FWnull/Linux/Config.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/Config.c
rename to plugins/FWnull/Linux/Config.c
diff --git a/plugins/fw/FWnull/Linux/Config.h b/plugins/FWnull/Linux/Config.h
similarity index 100%
rename from plugins/fw/FWnull/Linux/Config.h
rename to plugins/FWnull/Linux/Config.h
diff --git a/plugins/fw/FWnull/Linux/Linux.c b/plugins/FWnull/Linux/Linux.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/Linux.c
rename to plugins/FWnull/Linux/Linux.c
diff --git a/plugins/fw/FWnull/Linux/Makefile b/plugins/FWnull/Linux/Makefile
similarity index 100%
rename from plugins/fw/FWnull/Linux/Makefile
rename to plugins/FWnull/Linux/Makefile
diff --git a/plugins/fw/FWnull/Linux/callbacks.c b/plugins/FWnull/Linux/callbacks.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/callbacks.c
rename to plugins/FWnull/Linux/callbacks.c
diff --git a/plugins/fw/FWnull/Linux/callbacks.h b/plugins/FWnull/Linux/callbacks.h
similarity index 100%
rename from plugins/fw/FWnull/Linux/callbacks.h
rename to plugins/FWnull/Linux/callbacks.h
diff --git a/plugins/fw/FWnull/Linux/conf.c b/plugins/FWnull/Linux/conf.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/conf.c
rename to plugins/FWnull/Linux/conf.c
diff --git a/plugins/fw/FWnull/Linux/firewire.glade b/plugins/FWnull/Linux/firewire.glade
similarity index 100%
rename from plugins/fw/FWnull/Linux/firewire.glade
rename to plugins/FWnull/Linux/firewire.glade
diff --git a/plugins/fw/FWnull/Linux/interface.c b/plugins/FWnull/Linux/interface.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/interface.c
rename to plugins/FWnull/Linux/interface.c
diff --git a/plugins/fw/FWnull/Linux/interface.h b/plugins/FWnull/Linux/interface.h
similarity index 100%
rename from plugins/fw/FWnull/Linux/interface.h
rename to plugins/FWnull/Linux/interface.h
diff --git a/plugins/fw/FWnull/Linux/support.c b/plugins/FWnull/Linux/support.c
similarity index 100%
rename from plugins/fw/FWnull/Linux/support.c
rename to plugins/FWnull/Linux/support.c
diff --git a/plugins/fw/FWnull/Linux/support.h b/plugins/FWnull/Linux/support.h
similarity index 100%
rename from plugins/fw/FWnull/Linux/support.h
rename to plugins/FWnull/Linux/support.h
diff --git a/plugins/fw/FWnull/PS2Edefs.h b/plugins/FWnull/PS2Edefs.h
similarity index 100%
rename from plugins/fw/FWnull/PS2Edefs.h
rename to plugins/FWnull/PS2Edefs.h
diff --git a/plugins/fw/FWnull/PS2Etypes.h b/plugins/FWnull/PS2Etypes.h
similarity index 100%
rename from plugins/fw/FWnull/PS2Etypes.h
rename to plugins/FWnull/PS2Etypes.h
diff --git a/plugins/fw/FWnull/ReadMe.txt b/plugins/FWnull/ReadMe.txt
similarity index 100%
rename from plugins/fw/FWnull/ReadMe.txt
rename to plugins/FWnull/ReadMe.txt
diff --git a/plugins/fw/FWnull/Win32/Config.c b/plugins/FWnull/Win32/Config.c
similarity index 100%
rename from plugins/fw/FWnull/Win32/Config.c
rename to plugins/FWnull/Win32/Config.c
diff --git a/plugins/fw/FWnull/Win32/FireWireNull.def b/plugins/FWnull/Win32/FireWireNull.def
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull.def
rename to plugins/FWnull/Win32/FireWireNull.def
diff --git a/plugins/fw/FWnull/Win32/FireWireNull.rc b/plugins/FWnull/Win32/FireWireNull.rc
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull.rc
rename to plugins/FWnull/Win32/FireWireNull.rc
diff --git a/plugins/fw/FWnull/Win32/FireWireNull.sln b/plugins/FWnull/Win32/FireWireNull.sln
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull.sln
rename to plugins/FWnull/Win32/FireWireNull.sln
diff --git a/plugins/fw/FWnull/Win32/FireWireNull.suo b/plugins/FWnull/Win32/FireWireNull.suo
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull.suo
rename to plugins/FWnull/Win32/FireWireNull.suo
diff --git a/plugins/fw/FWnull/Win32/FireWireNull.vcproj b/plugins/FWnull/Win32/FireWireNull.vcproj
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull.vcproj
rename to plugins/FWnull/Win32/FireWireNull.vcproj
diff --git a/plugins/fw/FWnull/Win32/FireWireNull_2005_x64.vcproj b/plugins/FWnull/Win32/FireWireNull_2005_x64.vcproj
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull_2005_x64.vcproj
rename to plugins/FWnull/Win32/FireWireNull_2005_x64.vcproj
diff --git a/plugins/fw/FWnull/Win32/FireWireNull_vsnet2005beta1.sln b/plugins/FWnull/Win32/FireWireNull_vsnet2005beta1.sln
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull_vsnet2005beta1.sln
rename to plugins/FWnull/Win32/FireWireNull_vsnet2005beta1.sln
diff --git a/plugins/fw/FWnull/Win32/FireWireNull_vsnet2005beta1.vcproj b/plugins/FWnull/Win32/FireWireNull_vsnet2005beta1.vcproj
similarity index 100%
rename from plugins/fw/FWnull/Win32/FireWireNull_vsnet2005beta1.vcproj
rename to plugins/FWnull/Win32/FireWireNull_vsnet2005beta1.vcproj
diff --git a/plugins/fw/FWnull/Win32/Makefile b/plugins/FWnull/Win32/Makefile
similarity index 100%
rename from plugins/fw/FWnull/Win32/Makefile
rename to plugins/FWnull/Win32/Makefile
diff --git a/plugins/fw/FWnull/Win32/Win32.c b/plugins/FWnull/Win32/Win32.c
similarity index 100%
rename from plugins/fw/FWnull/Win32/Win32.c
rename to plugins/FWnull/Win32/Win32.c
diff --git a/plugins/fw/FWnull/Win32/afxresmw.h b/plugins/FWnull/Win32/afxresmw.h
similarity index 100%
rename from plugins/fw/FWnull/Win32/afxresmw.h
rename to plugins/FWnull/Win32/afxresmw.h
diff --git a/plugins/fw/FWnull/Win32/resource.h b/plugins/FWnull/Win32/resource.h
similarity index 100%
rename from plugins/fw/FWnull/Win32/resource.h
rename to plugins/FWnull/Win32/resource.h
diff --git a/plugins/fw/FWnull/build.sh b/plugins/FWnull/build.sh
similarity index 100%
rename from plugins/fw/FWnull/build.sh
rename to plugins/FWnull/build.sh