diff --git a/psx/octoshock/octoshock.sln b/psx/octoshock/bizhawk/octoshock.sln
similarity index 100%
rename from psx/octoshock/octoshock.sln
rename to psx/octoshock/bizhawk/octoshock.sln
diff --git a/psx/octoshock/octoshock.vcxproj b/psx/octoshock/bizhawk/octoshock.vcxproj
similarity index 100%
rename from psx/octoshock/octoshock.vcxproj
rename to psx/octoshock/bizhawk/octoshock.vcxproj
diff --git a/psx/octoshock/octoshock.vcxproj.filters b/psx/octoshock/bizhawk/octoshock.vcxproj.filters
similarity index 100%
rename from psx/octoshock/octoshock.vcxproj.filters
rename to psx/octoshock/bizhawk/octoshock.vcxproj.filters
diff --git a/psx/upstream/cdc.cpp b/psx/octoshock/cdc.cpp
similarity index 100%
rename from psx/upstream/cdc.cpp
rename to psx/octoshock/cdc.cpp
diff --git a/psx/upstream/cdc.h b/psx/octoshock/cdc.h
similarity index 100%
rename from psx/upstream/cdc.h
rename to psx/octoshock/cdc.h
diff --git a/psx/upstream/cpu.cpp b/psx/octoshock/cpu.cpp
similarity index 100%
rename from psx/upstream/cpu.cpp
rename to psx/octoshock/cpu.cpp
diff --git a/psx/upstream/cpu.h b/psx/octoshock/cpu.h
similarity index 100%
rename from psx/upstream/cpu.h
rename to psx/octoshock/cpu.h
diff --git a/psx/upstream/debug.cpp b/psx/octoshock/debug.cpp
similarity index 100%
rename from psx/upstream/debug.cpp
rename to psx/octoshock/debug.cpp
diff --git a/psx/upstream/debug.h b/psx/octoshock/debug.h
similarity index 100%
rename from psx/upstream/debug.h
rename to psx/octoshock/debug.h
diff --git a/psx/upstream/dis.cpp b/psx/octoshock/dis.cpp
similarity index 100%
rename from psx/upstream/dis.cpp
rename to psx/octoshock/dis.cpp
diff --git a/psx/upstream/dis.h b/psx/octoshock/dis.h
similarity index 100%
rename from psx/upstream/dis.h
rename to psx/octoshock/dis.h
diff --git a/psx/upstream/dma.cpp b/psx/octoshock/dma.cpp
similarity index 100%
rename from psx/upstream/dma.cpp
rename to psx/octoshock/dma.cpp
diff --git a/psx/upstream/dma.h b/psx/octoshock/dma.h
similarity index 100%
rename from psx/upstream/dma.h
rename to psx/octoshock/dma.h
diff --git a/psx/upstream/frontio.cpp b/psx/octoshock/frontio.cpp
similarity index 100%
rename from psx/upstream/frontio.cpp
rename to psx/octoshock/frontio.cpp
diff --git a/psx/upstream/frontio.h b/psx/octoshock/frontio.h
similarity index 100%
rename from psx/upstream/frontio.h
rename to psx/octoshock/frontio.h
diff --git a/psx/upstream/gpu.cpp b/psx/octoshock/gpu.cpp
similarity index 100%
rename from psx/upstream/gpu.cpp
rename to psx/octoshock/gpu.cpp
diff --git a/psx/upstream/gpu.h b/psx/octoshock/gpu.h
similarity index 100%
rename from psx/upstream/gpu.h
rename to psx/octoshock/gpu.h
diff --git a/psx/upstream/gpu_command_table.inc b/psx/octoshock/gpu_command_table.inc
similarity index 100%
rename from psx/upstream/gpu_command_table.inc
rename to psx/octoshock/gpu_command_table.inc
diff --git a/psx/upstream/gpu_line.inc b/psx/octoshock/gpu_line.inc
similarity index 100%
rename from psx/upstream/gpu_line.inc
rename to psx/octoshock/gpu_line.inc
diff --git a/psx/upstream/gpu_polygon.inc b/psx/octoshock/gpu_polygon.inc
similarity index 100%
rename from psx/upstream/gpu_polygon.inc
rename to psx/octoshock/gpu_polygon.inc
diff --git a/psx/upstream/gpu_sprite.inc b/psx/octoshock/gpu_sprite.inc
similarity index 100%
rename from psx/upstream/gpu_sprite.inc
rename to psx/octoshock/gpu_sprite.inc
diff --git a/psx/upstream/gte.cpp b/psx/octoshock/gte.cpp
similarity index 100%
rename from psx/upstream/gte.cpp
rename to psx/octoshock/gte.cpp
diff --git a/psx/upstream/gte.h b/psx/octoshock/gte.h
similarity index 100%
rename from psx/upstream/gte.h
rename to psx/octoshock/gte.h
diff --git a/psx/upstream/gte_divrecip.inc b/psx/octoshock/gte_divrecip.inc
similarity index 100%
rename from psx/upstream/gte_divrecip.inc
rename to psx/octoshock/gte_divrecip.inc
diff --git a/psx/upstream/input/dualanalog.cpp b/psx/octoshock/input/dualanalog.cpp
similarity index 100%
rename from psx/upstream/input/dualanalog.cpp
rename to psx/octoshock/input/dualanalog.cpp
diff --git a/psx/upstream/input/dualanalog.h b/psx/octoshock/input/dualanalog.h
similarity index 100%
rename from psx/upstream/input/dualanalog.h
rename to psx/octoshock/input/dualanalog.h
diff --git a/psx/upstream/input/dualshock.cpp b/psx/octoshock/input/dualshock.cpp
similarity index 100%
rename from psx/upstream/input/dualshock.cpp
rename to psx/octoshock/input/dualshock.cpp
diff --git a/psx/upstream/input/dualshock.h b/psx/octoshock/input/dualshock.h
similarity index 100%
rename from psx/upstream/input/dualshock.h
rename to psx/octoshock/input/dualshock.h
diff --git a/psx/upstream/input/gamepad.cpp b/psx/octoshock/input/gamepad.cpp
similarity index 100%
rename from psx/upstream/input/gamepad.cpp
rename to psx/octoshock/input/gamepad.cpp
diff --git a/psx/upstream/input/gamepad.h b/psx/octoshock/input/gamepad.h
similarity index 100%
rename from psx/upstream/input/gamepad.h
rename to psx/octoshock/input/gamepad.h
diff --git a/psx/upstream/input/guncon.cpp b/psx/octoshock/input/guncon.cpp
similarity index 100%
rename from psx/upstream/input/guncon.cpp
rename to psx/octoshock/input/guncon.cpp
diff --git a/psx/upstream/input/guncon.h b/psx/octoshock/input/guncon.h
similarity index 100%
rename from psx/upstream/input/guncon.h
rename to psx/octoshock/input/guncon.h
diff --git a/psx/upstream/input/justifier.cpp b/psx/octoshock/input/justifier.cpp
similarity index 100%
rename from psx/upstream/input/justifier.cpp
rename to psx/octoshock/input/justifier.cpp
diff --git a/psx/upstream/input/justifier.h b/psx/octoshock/input/justifier.h
similarity index 100%
rename from psx/upstream/input/justifier.h
rename to psx/octoshock/input/justifier.h
diff --git a/psx/upstream/input/memcard.cpp b/psx/octoshock/input/memcard.cpp
similarity index 100%
rename from psx/upstream/input/memcard.cpp
rename to psx/octoshock/input/memcard.cpp
diff --git a/psx/upstream/input/memcard.h b/psx/octoshock/input/memcard.h
similarity index 100%
rename from psx/upstream/input/memcard.h
rename to psx/octoshock/input/memcard.h
diff --git a/psx/upstream/input/mouse.cpp b/psx/octoshock/input/mouse.cpp
similarity index 100%
rename from psx/upstream/input/mouse.cpp
rename to psx/octoshock/input/mouse.cpp
diff --git a/psx/upstream/input/mouse.h b/psx/octoshock/input/mouse.h
similarity index 100%
rename from psx/upstream/input/mouse.h
rename to psx/octoshock/input/mouse.h
diff --git a/psx/upstream/input/multitap.cpp b/psx/octoshock/input/multitap.cpp
similarity index 100%
rename from psx/upstream/input/multitap.cpp
rename to psx/octoshock/input/multitap.cpp
diff --git a/psx/upstream/input/multitap.h b/psx/octoshock/input/multitap.h
similarity index 100%
rename from psx/upstream/input/multitap.h
rename to psx/octoshock/input/multitap.h
diff --git a/psx/upstream/input/negcon.cpp b/psx/octoshock/input/negcon.cpp
similarity index 100%
rename from psx/upstream/input/negcon.cpp
rename to psx/octoshock/input/negcon.cpp
diff --git a/psx/upstream/input/negcon.h b/psx/octoshock/input/negcon.h
similarity index 100%
rename from psx/upstream/input/negcon.h
rename to psx/octoshock/input/negcon.h
diff --git a/psx/upstream/irq.cpp b/psx/octoshock/irq.cpp
similarity index 100%
rename from psx/upstream/irq.cpp
rename to psx/octoshock/irq.cpp
diff --git a/psx/upstream/irq.h b/psx/octoshock/irq.h
similarity index 100%
rename from psx/upstream/irq.h
rename to psx/octoshock/irq.h
diff --git a/psx/upstream/mdec.cpp b/psx/octoshock/mdec.cpp
similarity index 100%
rename from psx/upstream/mdec.cpp
rename to psx/octoshock/mdec.cpp
diff --git a/psx/upstream/mdec.h b/psx/octoshock/mdec.h
similarity index 100%
rename from psx/upstream/mdec.h
rename to psx/octoshock/mdec.h
diff --git a/psx/upstream/psx.cpp b/psx/octoshock/psx.cpp
similarity index 100%
rename from psx/upstream/psx.cpp
rename to psx/octoshock/psx.cpp
diff --git a/psx/upstream/psx.h b/psx/octoshock/psx.h
similarity index 100%
rename from psx/upstream/psx.h
rename to psx/octoshock/psx.h
diff --git a/psx/upstream/sio.cpp b/psx/octoshock/sio.cpp
similarity index 100%
rename from psx/upstream/sio.cpp
rename to psx/octoshock/sio.cpp
diff --git a/psx/upstream/sio.h b/psx/octoshock/sio.h
similarity index 100%
rename from psx/upstream/sio.h
rename to psx/octoshock/sio.h
diff --git a/psx/upstream/spu.cpp b/psx/octoshock/spu.cpp
similarity index 100%
rename from psx/upstream/spu.cpp
rename to psx/octoshock/spu.cpp
diff --git a/psx/upstream/spu.h b/psx/octoshock/spu.h
similarity index 100%
rename from psx/upstream/spu.h
rename to psx/octoshock/spu.h
diff --git a/psx/upstream/spu_fir_table.inc b/psx/octoshock/spu_fir_table.inc
similarity index 100%
rename from psx/upstream/spu_fir_table.inc
rename to psx/octoshock/spu_fir_table.inc
diff --git a/psx/upstream/spu_nft.inc b/psx/octoshock/spu_nft.inc
similarity index 100%
rename from psx/upstream/spu_nft.inc
rename to psx/octoshock/spu_nft.inc
diff --git a/psx/upstream/spu_reverb.inc b/psx/octoshock/spu_reverb.inc
similarity index 100%
rename from psx/upstream/spu_reverb.inc
rename to psx/octoshock/spu_reverb.inc
diff --git a/psx/upstream/timer.cpp b/psx/octoshock/timer.cpp
similarity index 100%
rename from psx/upstream/timer.cpp
rename to psx/octoshock/timer.cpp
diff --git a/psx/upstream/timer.h b/psx/octoshock/timer.h
similarity index 100%
rename from psx/upstream/timer.h
rename to psx/octoshock/timer.h