diff --git a/source/ngc/FreeTypeGX.cpp b/source/FreeTypeGX.cpp
similarity index 100%
rename from source/ngc/FreeTypeGX.cpp
rename to source/FreeTypeGX.cpp
diff --git a/source/ngc/FreeTypeGX.h b/source/FreeTypeGX.h
similarity index 100%
rename from source/ngc/FreeTypeGX.h
rename to source/FreeTypeGX.h
diff --git a/source/ngc/Metaphrasis.cpp b/source/Metaphrasis.cpp
similarity index 100%
rename from source/ngc/Metaphrasis.cpp
rename to source/Metaphrasis.cpp
diff --git a/source/ngc/Metaphrasis.h b/source/Metaphrasis.h
similarity index 100%
rename from source/ngc/Metaphrasis.h
rename to source/Metaphrasis.h
diff --git a/source/ngc/audio.cpp b/source/audio.cpp
similarity index 100%
rename from source/ngc/audio.cpp
rename to source/audio.cpp
diff --git a/source/ngc/audio.h b/source/audio.h
similarity index 100%
rename from source/ngc/audio.h
rename to source/audio.h
diff --git a/source/ngc/button_mapping.c b/source/button_mapping.c
similarity index 100%
rename from source/ngc/button_mapping.c
rename to source/button_mapping.c
diff --git a/source/ngc/button_mapping.h b/source/button_mapping.h
similarity index 100%
rename from source/ngc/button_mapping.h
rename to source/button_mapping.h
diff --git a/source/ngc/fastmath.h b/source/fastmath.h
similarity index 100%
rename from source/ngc/fastmath.h
rename to source/fastmath.h
diff --git a/source/ngc/filebrowser.cpp b/source/filebrowser.cpp
similarity index 100%
rename from source/ngc/filebrowser.cpp
rename to source/filebrowser.cpp
diff --git a/source/ngc/filebrowser.h b/source/filebrowser.h
similarity index 100%
rename from source/ngc/filebrowser.h
rename to source/filebrowser.h
diff --git a/source/ngc/filelist.h b/source/filelist.h
similarity index 100%
rename from source/ngc/filelist.h
rename to source/filelist.h
diff --git a/source/ngc/fileop.cpp b/source/fileop.cpp
similarity index 100%
rename from source/ngc/fileop.cpp
rename to source/fileop.cpp
diff --git a/source/ngc/fileop.h b/source/fileop.h
similarity index 100%
rename from source/ngc/fileop.h
rename to source/fileop.h
diff --git a/source/ngc/gameinput.cpp b/source/gameinput.cpp
similarity index 100%
rename from source/ngc/gameinput.cpp
rename to source/gameinput.cpp
diff --git a/source/ngc/gameinput.h b/source/gameinput.h
similarity index 100%
rename from source/ngc/gameinput.h
rename to source/gameinput.h
diff --git a/source/ngc/gamesettings.cpp b/source/gamesettings.cpp
similarity index 100%
rename from source/ngc/gamesettings.cpp
rename to source/gamesettings.cpp
diff --git a/source/ngc/gamesettings.h b/source/gamesettings.h
similarity index 100%
rename from source/ngc/gamesettings.h
rename to source/gamesettings.h
diff --git a/source/ngc/gcunzip.cpp b/source/gcunzip.cpp
similarity index 100%
rename from source/ngc/gcunzip.cpp
rename to source/gcunzip.cpp
diff --git a/source/ngc/gcunzip.h b/source/gcunzip.h
similarity index 100%
rename from source/ngc/gcunzip.h
rename to source/gcunzip.h
diff --git a/source/ngc/gettext.cpp b/source/gettext.cpp
similarity index 100%
rename from source/ngc/gettext.cpp
rename to source/gettext.cpp
diff --git a/source/ngc/gettext.h b/source/gettext.h
similarity index 100%
rename from source/ngc/gettext.h
rename to source/gettext.h
diff --git a/source/ngc/http.cpp b/source/http.cpp
similarity index 100%
rename from source/ngc/http.cpp
rename to source/http.cpp
diff --git a/source/ngc/http.h b/source/http.h
similarity index 100%
rename from source/ngc/http.h
rename to source/http.h
diff --git a/source/ngc/input.cpp b/source/input.cpp
similarity index 100%
rename from source/ngc/input.cpp
rename to source/input.cpp
diff --git a/source/ngc/input.h b/source/input.h
similarity index 100%
rename from source/ngc/input.h
rename to source/input.h
diff --git a/source/ngc/inputmario.cpp b/source/inputmario.cpp
similarity index 100%
rename from source/ngc/inputmario.cpp
rename to source/inputmario.cpp
diff --git a/source/ngc/inputmetroid.cpp b/source/inputmetroid.cpp
similarity index 100%
rename from source/ngc/inputmetroid.cpp
rename to source/inputmetroid.cpp
diff --git a/source/ngc/inputmortalkombat.cpp b/source/inputmortalkombat.cpp
similarity index 100%
rename from source/ngc/inputmortalkombat.cpp
rename to source/inputmortalkombat.cpp
diff --git a/source/ngc/inputstarwars.cpp b/source/inputstarwars.cpp
similarity index 100%
rename from source/ngc/inputstarwars.cpp
rename to source/inputstarwars.cpp
diff --git a/source/ngc/inputzelda.cpp b/source/inputzelda.cpp
similarity index 100%
rename from source/ngc/inputzelda.cpp
rename to source/inputzelda.cpp
diff --git a/source/ngc/menu.cpp b/source/menu.cpp
similarity index 100%
rename from source/ngc/menu.cpp
rename to source/menu.cpp
diff --git a/source/ngc/menu.h b/source/menu.h
similarity index 100%
rename from source/ngc/menu.h
rename to source/menu.h
diff --git a/source/ngc/networkop.cpp b/source/networkop.cpp
similarity index 100%
rename from source/ngc/networkop.cpp
rename to source/networkop.cpp
diff --git a/source/ngc/networkop.h b/source/networkop.h
similarity index 100%
rename from source/ngc/networkop.h
rename to source/networkop.h
diff --git a/source/ngc/oggplayer.c b/source/oggplayer.c
similarity index 100%
rename from source/ngc/oggplayer.c
rename to source/oggplayer.c
diff --git a/source/ngc/oggplayer.h b/source/oggplayer.h
similarity index 100%
rename from source/ngc/oggplayer.h
rename to source/oggplayer.h
diff --git a/source/ngc/pngu.c b/source/pngu.c
similarity index 100%
rename from source/ngc/pngu.c
rename to source/pngu.c
diff --git a/source/ngc/pngu.h b/source/pngu.h
similarity index 100%
rename from source/ngc/pngu.h
rename to source/pngu.h
diff --git a/source/ngc/preferences.cpp b/source/preferences.cpp
similarity index 100%
rename from source/ngc/preferences.cpp
rename to source/preferences.cpp
diff --git a/source/ngc/preferences.h b/source/preferences.h
similarity index 100%
rename from source/ngc/preferences.h
rename to source/preferences.h
diff --git a/source/ngc/vba.cpp b/source/vba.cpp
similarity index 100%
rename from source/ngc/vba.cpp
rename to source/vba.cpp
diff --git a/source/ngc/vba.h b/source/vba.h
similarity index 100%
rename from source/ngc/vba.h
rename to source/vba.h
diff --git a/source/ngc/vbasupport.cpp b/source/vbasupport.cpp
similarity index 100%
rename from source/ngc/vbasupport.cpp
rename to source/vbasupport.cpp
diff --git a/source/ngc/vbasupport.h b/source/vbasupport.h
similarity index 100%
rename from source/ngc/vbasupport.h
rename to source/vbasupport.h
diff --git a/source/ngc/video.cpp b/source/video.cpp
similarity index 100%
rename from source/ngc/video.cpp
rename to source/video.cpp
diff --git a/source/ngc/video.h b/source/video.h
similarity index 100%
rename from source/ngc/video.h
rename to source/video.h
diff --git a/source/ngc/vmmem.cpp b/source/vmmem.cpp
similarity index 100%
rename from source/ngc/vmmem.cpp
rename to source/vmmem.cpp
diff --git a/source/ngc/vmmem.h b/source/vmmem.h
similarity index 100%
rename from source/ngc/vmmem.h
rename to source/vmmem.h