diff --git a/oswan/Makefile b/Makefile
similarity index 100%
rename from oswan/Makefile
rename to Makefile
diff --git a/oswan/dumpinfo.c b/dumpinfo.c
similarity index 100%
rename from oswan/dumpinfo.c
rename to dumpinfo.c
diff --git a/oswan/main.cpp b/main.cpp
similarity index 100%
rename from oswan/main.cpp
rename to main.cpp
diff --git a/oswan/resource.h b/resource.h
similarity index 100%
rename from oswan/resource.h
rename to resource.h
diff --git a/oswan/source/SDLptc.h b/source/SDLptc.h
similarity index 100%
rename from oswan/source/SDLptc.h
rename to source/SDLptc.h
diff --git a/oswan/source/audio.cpp b/source/audio.cpp
similarity index 100%
rename from oswan/source/audio.cpp
rename to source/audio.cpp
diff --git a/oswan/source/audio.h b/source/audio.h
similarity index 100%
rename from oswan/source/audio.h
rename to source/audio.h
diff --git a/oswan/source/emulate.cpp b/source/emulate.cpp
similarity index 100%
rename from oswan/source/emulate.cpp
rename to source/emulate.cpp
diff --git a/oswan/source/emulate.h b/source/emulate.h
similarity index 100%
rename from oswan/source/emulate.h
rename to source/emulate.h
diff --git a/oswan/source/gpu.cpp b/source/gpu.cpp
similarity index 100%
rename from oswan/source/gpu.cpp
rename to source/gpu.cpp
diff --git a/oswan/source/gpu.h b/source/gpu.h
similarity index 100%
rename from oswan/source/gpu.h
rename to source/gpu.h
diff --git a/oswan/source/ieeprom.h b/source/ieeprom.h
similarity index 100%
rename from oswan/source/ieeprom.h
rename to source/ieeprom.h
diff --git a/oswan/source/initialIo.h b/source/initialIo.h
similarity index 100%
rename from oswan/source/initialIo.h
rename to source/initialIo.h
diff --git a/oswan/source/io.cpp b/source/io.cpp
similarity index 100%
rename from oswan/source/io.cpp
rename to source/io.cpp
diff --git a/oswan/source/io.h b/source/io.h
similarity index 100%
rename from oswan/source/io.h
rename to source/io.h
diff --git a/oswan/source/log.cpp b/source/log.cpp
similarity index 100%
rename from oswan/source/log.cpp
rename to source/log.cpp
diff --git a/oswan/source/log.h b/source/log.h
similarity index 100%
rename from oswan/source/log.h
rename to source/log.h
diff --git a/oswan/source/memory.cpp b/source/memory.cpp
similarity index 100%
rename from oswan/source/memory.cpp
rename to source/memory.cpp
diff --git a/oswan/source/memory.h b/source/memory.h
similarity index 100%
rename from oswan/source/memory.h
rename to source/memory.h
diff --git a/oswan/source/nec/nec.cpp b/source/nec/nec.cpp
similarity index 100%
rename from oswan/source/nec/nec.cpp
rename to source/nec/nec.cpp
diff --git a/oswan/source/nec/nec.h b/source/nec/nec.h
similarity index 100%
rename from oswan/source/nec/nec.h
rename to source/nec/nec.h
diff --git a/oswan/source/nec/necea.h b/source/nec/necea.h
similarity index 100%
rename from oswan/source/nec/necea.h
rename to source/nec/necea.h
diff --git a/oswan/source/nec/necinstr.h b/source/nec/necinstr.h
similarity index 100%
rename from oswan/source/nec/necinstr.h
rename to source/nec/necinstr.h
diff --git a/oswan/source/nec/necintrf.h b/source/nec/necintrf.h
similarity index 100%
rename from oswan/source/nec/necintrf.h
rename to source/nec/necintrf.h
diff --git a/oswan/source/nec/necmodrm.h b/source/nec/necmodrm.h
similarity index 100%
rename from oswan/source/nec/necmodrm.h
rename to source/nec/necmodrm.h
diff --git a/oswan/source/rom.cpp b/source/rom.cpp
similarity index 100%
rename from oswan/source/rom.cpp
rename to source/rom.cpp
diff --git a/oswan/source/rom.h b/source/rom.h
similarity index 100%
rename from oswan/source/rom.h
rename to source/rom.h
diff --git a/oswan/source/ws.cpp b/source/ws.cpp
similarity index 100%
rename from oswan/source/ws.cpp
rename to source/ws.cpp
diff --git a/oswan/source/ws.h b/source/ws.h
similarity index 100%
rename from oswan/source/ws.h
rename to source/ws.h
diff --git a/oswan/testserial.c b/testserial.c
similarity index 100%
rename from oswan/testserial.c
rename to testserial.c