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/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/cheatmgr.cpp b/source/cheatmgr.cpp
similarity index 100%
rename from source/ngc/cheatmgr.cpp
rename to source/cheatmgr.cpp
diff --git a/source/ngc/cheatmgr.h b/source/cheatmgr.h
similarity index 100%
rename from source/ngc/cheatmgr.h
rename to source/cheatmgr.h
diff --git a/source/ngc/fceugx.cpp b/source/fceugx.cpp
similarity index 100%
rename from source/ngc/fceugx.cpp
rename to source/fceugx.cpp
diff --git a/source/ngc/fceugx.h b/source/fceugx.h
similarity index 100%
rename from source/ngc/fceugx.h
rename to source/fceugx.h
diff --git a/source/ngc/fceuload.cpp b/source/fceuload.cpp
similarity index 100%
rename from source/ngc/fceuload.cpp
rename to source/fceuload.cpp
diff --git a/source/ngc/fceuload.h b/source/fceuload.h
similarity index 100%
rename from source/ngc/fceuload.h
rename to source/fceuload.h
diff --git a/source/ngc/fceuram.cpp b/source/fceuram.cpp
similarity index 100%
rename from source/ngc/fceuram.cpp
rename to source/fceuram.cpp
diff --git a/source/ngc/fceuram.h b/source/fceuram.h
similarity index 100%
rename from source/ngc/fceuram.h
rename to source/fceuram.h
diff --git a/source/ngc/fceustate.cpp b/source/fceustate.cpp
similarity index 100%
rename from source/ngc/fceustate.cpp
rename to source/fceustate.cpp
diff --git a/source/ngc/fceustate.h b/source/fceustate.h
similarity index 100%
rename from source/ngc/fceustate.h
rename to source/fceustate.h
diff --git a/source/ngc/fceusupport.cpp b/source/fceusupport.cpp
similarity index 100%
rename from source/ngc/fceusupport.cpp
rename to source/fceusupport.cpp
diff --git a/source/ngc/fceusupport.h b/source/fceusupport.h
similarity index 100%
rename from source/ngc/fceusupport.h
rename to source/fceusupport.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/gcaudio.cpp b/source/gcaudio.cpp
similarity index 100%
rename from source/ngc/gcaudio.cpp
rename to source/gcaudio.cpp
diff --git a/source/ngc/gcaudio.h b/source/gcaudio.h
similarity index 100%
rename from source/ngc/gcaudio.h
rename to source/gcaudio.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/gcvideo.cpp b/source/gcvideo.cpp
similarity index 100%
rename from source/ngc/gcvideo.cpp
rename to source/gcvideo.cpp
diff --git a/source/ngc/gcvideo.h b/source/gcvideo.h
similarity index 100%
rename from source/ngc/gcvideo.h
rename to source/gcvideo.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/memfile.cpp b/source/memfile.cpp
similarity index 100%
rename from source/ngc/memfile.cpp
rename to source/memfile.cpp
diff --git a/source/ngc/memfile.h b/source/memfile.h
similarity index 100%
rename from source/ngc/memfile.h
rename to source/memfile.h
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/pad.cpp b/source/pad.cpp
similarity index 100%
rename from source/ngc/pad.cpp
rename to source/pad.cpp
diff --git a/source/ngc/pad.h b/source/pad.h
similarity index 100%
rename from source/ngc/pad.h
rename to source/pad.h
diff --git a/source/ngc/patch.cpp b/source/patch.cpp
similarity index 100%
rename from source/ngc/patch.cpp
rename to source/patch.cpp
diff --git a/source/ngc/patch.h b/source/patch.h
similarity index 100%
rename from source/ngc/patch.h
rename to source/patch.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/videofilter.cpp b/source/videofilter.cpp
similarity index 100%
rename from source/ngc/videofilter.cpp
rename to source/videofilter.cpp
diff --git a/source/ngc/videofilter.h b/source/videofilter.h
similarity index 100%
rename from source/ngc/videofilter.h
rename to source/videofilter.h