diff --git a/include/dolphin/os2/OSAddress.h b/include/dolphin/os/OSAddress.h
similarity index 100%
rename from include/dolphin/os2/OSAddress.h
rename to include/dolphin/os/OSAddress.h
diff --git a/include/dolphin/os2/OSAlloc.h b/include/dolphin/os/OSAlloc.h
similarity index 100%
rename from include/dolphin/os2/OSAlloc.h
rename to include/dolphin/os/OSAlloc.h
diff --git a/include/dolphin/os2/OSArena.h b/include/dolphin/os/OSArena.h
similarity index 100%
rename from include/dolphin/os2/OSArena.h
rename to include/dolphin/os/OSArena.h
diff --git a/include/dolphin/os2/OSCache.h b/include/dolphin/os/OSCache.h
similarity index 100%
rename from include/dolphin/os2/OSCache.h
rename to include/dolphin/os/OSCache.h
diff --git a/include/dolphin/os2/OSContext.h b/include/dolphin/os/OSContext.h
similarity index 100%
rename from include/dolphin/os2/OSContext.h
rename to include/dolphin/os/OSContext.h
diff --git a/include/dolphin/os2/OSError.h b/include/dolphin/os/OSError.h
similarity index 100%
rename from include/dolphin/os2/OSError.h
rename to include/dolphin/os/OSError.h
diff --git a/include/dolphin/os2/OSMemory.h b/include/dolphin/os/OSMemory.h
similarity index 100%
rename from include/dolphin/os2/OSMemory.h
rename to include/dolphin/os/OSMemory.h
diff --git a/include/dolphin/os2/OSMutex.h b/include/dolphin/os/OSMutex.h
similarity index 100%
rename from include/dolphin/os2/OSMutex.h
rename to include/dolphin/os/OSMutex.h
diff --git a/include/dolphin/os2/OSThread.h b/include/dolphin/os/OSThread.h
similarity index 100%
rename from include/dolphin/os2/OSThread.h
rename to include/dolphin/os/OSThread.h
diff --git a/include/dolphin/os2/OSTime.h b/include/dolphin/os/OSTime.h
similarity index 100%
rename from include/dolphin/os2/OSTime.h
rename to include/dolphin/os/OSTime.h
diff --git a/include/dolphin/os2/OSUtil.h b/include/dolphin/os/OSUtil.h
similarity index 100%
rename from include/dolphin/os2/OSUtil.h
rename to include/dolphin/os/OSUtil.h
diff --git a/src/dolphin/os2/OSAlarm.c b/src/dolphin/os/OSAlarm.c
similarity index 100%
rename from src/dolphin/os2/OSAlarm.c
rename to src/dolphin/os/OSAlarm.c
diff --git a/src/dolphin/os2/OSArena.c b/src/dolphin/os/OSArena.c
similarity index 100%
rename from src/dolphin/os2/OSArena.c
rename to src/dolphin/os/OSArena.c
diff --git a/src/dolphin/os2/OSAudioSystem.C b/src/dolphin/os/OSAudioSystem.C
similarity index 100%
rename from src/dolphin/os2/OSAudioSystem.C
rename to src/dolphin/os/OSAudioSystem.C
diff --git a/src/dolphin/os2/OSCache.c b/src/dolphin/os/OSCache.c
similarity index 100%
rename from src/dolphin/os2/OSCache.c
rename to src/dolphin/os/OSCache.c
diff --git a/src/dolphin/os2/OSContext.c b/src/dolphin/os/OSContext.c
similarity index 100%
rename from src/dolphin/os2/OSContext.c
rename to src/dolphin/os/OSContext.c
diff --git a/src/dolphin/os2/OSDisableInterrupts.c b/src/dolphin/os/OSDisableInterrupts.c
similarity index 100%
rename from src/dolphin/os2/OSDisableInterrupts.c
rename to src/dolphin/os/OSDisableInterrupts.c
diff --git a/src/dolphin/os2/OSEnableInterrupts.c b/src/dolphin/os/OSEnableInterrupts.c
similarity index 100%
rename from src/dolphin/os2/OSEnableInterrupts.c
rename to src/dolphin/os/OSEnableInterrupts.c
diff --git a/src/dolphin/os2/OSError.c b/src/dolphin/os/OSError.c
similarity index 100%
rename from src/dolphin/os2/OSError.c
rename to src/dolphin/os/OSError.c
diff --git a/src/dolphin/os2/OSMemory.c b/src/dolphin/os/OSMemory.c
similarity index 100%
rename from src/dolphin/os2/OSMemory.c
rename to src/dolphin/os/OSMemory.c
diff --git a/src/dolphin/os2/OSRestoreInterrupts.c b/src/dolphin/os/OSRestoreInterrupts.c
similarity index 100%
rename from src/dolphin/os2/OSRestoreInterrupts.c
rename to src/dolphin/os/OSRestoreInterrupts.c