diff --git a/.gitattributes b/.gitattributes
index 81fe4e2..183c31c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -131,34 +131,6 @@ freeglut/freeglut/progs/demos/subwin/subwin.c -text
 freeglut/freeglut/progs/demos/subwin/subwin.dsp -text
 freeglut/freeglut/progs/demos/subwin/subwinStatic.dsp -text
 freeglut/freeglut/progs/demos/timer/timer.c -text
-freeglut/freeglut/src/Common/freeglut_callbacks.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_cursor.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_display.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_ext.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_font.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_font_data.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_gamemode.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_geometry.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_init.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_input_devices.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_internal.h svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_joystick.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_main.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_menu.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_misc.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_overlay.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_spaceball.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_state.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_stroke_mono_roman.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_stroke_roman.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_structure.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_teapot.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_teapot_data.h svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_videoresize.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_window.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglutdll.def svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/xparsegeometry_repl.c -text
-freeglut/freeglut/src/Common/xparsegeometry_repl.h -text
 freeglut/freeglut/src/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/android/freeglut_gamemode_android.c -text
 freeglut/freeglut/src/android/freeglut_input_devices_android.c -text
@@ -178,6 +150,32 @@ freeglut/freeglut/src/egl/freeglut_init_egl.c -text
 freeglut/freeglut/src/egl/freeglut_internal_egl.h -text
 freeglut/freeglut/src/egl/freeglut_structure_egl.c -text
 freeglut/freeglut/src/egl/freeglut_window_egl.c -text
+freeglut/freeglut/src/fg_callbacks.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_cursor.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_display.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_ext.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_font.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_font_data.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_gamemode.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_geometry.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_init.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_input_devices.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_internal.h svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_joystick.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_main.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_menu.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_misc.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_overlay.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_spaceball.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_state.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_stroke_mono_roman.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_stroke_roman.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_structure.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_teapot.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_teapot_data.h svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_videoresize.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_window.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/freeglutdll.def svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_display_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_ext_mswin.c svn_keywords=Author+Date+Id+Revision
@@ -194,6 +192,8 @@ freeglut/freeglut/src/mswin/freeglut_structure_mswin.c svn_keywords=Author+Date+
 freeglut/freeglut/src/mswin/freeglut_window_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/templates/cpp_template svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/templates/header_template svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/util/xparsegeometry_repl.c -text
+freeglut/freeglut/src/util/xparsegeometry_repl.h -text
 freeglut/freeglut/src/x11 svnc_svn_005fkeywords=Author+Date+Id+Revision
 freeglut/freeglut/src/x11/freeglut_cursor_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
 freeglut/freeglut/src/x11/freeglut_display_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
diff --git a/freeglut/freeglut/src/Common/freeglut_callbacks.c b/freeglut/freeglut/src/fg_callbacks.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_callbacks.c
rename to freeglut/freeglut/src/fg_callbacks.c
index a40f7da..7e399a9 100644
--- a/freeglut/freeglut/src/Common/freeglut_callbacks.c
+++ b/freeglut/freeglut/src/fg_callbacks.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_cursor.c b/freeglut/freeglut/src/fg_cursor.c
similarity index 98%
rename from freeglut/freeglut/src/Common/freeglut_cursor.c
rename to freeglut/freeglut/src/fg_cursor.c
index b9254c1..007898f 100644
--- a/freeglut/freeglut/src/Common/freeglut_cursor.c
+++ b/freeglut/freeglut/src/fg_cursor.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_display.c b/freeglut/freeglut/src/fg_display.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_display.c
rename to freeglut/freeglut/src/fg_display.c
index 6421be4..9b8bd42 100644
--- a/freeglut/freeglut/src/Common/freeglut_display.c
+++ b/freeglut/freeglut/src/fg_display.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 
 /* Function prototypes */
diff --git a/freeglut/freeglut/src/Common/freeglut_ext.c b/freeglut/freeglut/src/fg_ext.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_ext.c
rename to freeglut/freeglut/src/fg_ext.c
index f7b4f2e..a9a8a11 100644
--- a/freeglut/freeglut/src/Common/freeglut_ext.c
+++ b/freeglut/freeglut/src/fg_ext.c
@@ -27,7 +27,7 @@
 
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
 extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );
diff --git a/freeglut/freeglut/src/Common/freeglut_font.c b/freeglut/freeglut/src/fg_font.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_font.c
rename to freeglut/freeglut/src/fg_font.c
index e956d5b..507397e 100644
--- a/freeglut/freeglut/src/Common/freeglut_font.c
+++ b/freeglut/freeglut/src/fg_font.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_font_data.c b/freeglut/freeglut/src/fg_font_data.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_font_data.c
rename to freeglut/freeglut/src/fg_font_data.c
index 35dfc79..d4e16db 100644
--- a/freeglut/freeglut/src/Common/freeglut_font_data.c
+++ b/freeglut/freeglut/src/fg_font_data.c
@@ -51,7 +51,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * The following bitmapped fonts are defined in this file:
diff --git a/freeglut/freeglut/src/Common/freeglut_gamemode.c b/freeglut/freeglut/src/fg_gamemode.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_gamemode.c
rename to freeglut/freeglut/src/fg_gamemode.c
index d9b71f8..eb29131 100644
--- a/freeglut/freeglut/src/Common/freeglut_gamemode.c
+++ b/freeglut/freeglut/src/fg_gamemode.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_geometry.c b/freeglut/freeglut/src/fg_geometry.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_geometry.c
rename to freeglut/freeglut/src/fg_geometry.c
index 0f9f5c5..de1cbad 100644
--- a/freeglut/freeglut/src/Common/freeglut_geometry.c
+++ b/freeglut/freeglut/src/fg_geometry.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_init.c b/freeglut/freeglut/src/fg_init.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_init.c
rename to freeglut/freeglut/src/fg_init.c
index bb0c097..816fc66 100644
--- a/freeglut/freeglut/src/Common/freeglut_init.c
+++ b/freeglut/freeglut/src/fg_init.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -316,7 +316,7 @@ void fgDeinitialize( void )
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 #if !TARGET_HOST_POSIX_X11
-#   include "../Common/xparsegeometry_repl.h"
+#   include "util/xparsegeometry_repl.h"
 #endif
 
 /*
diff --git a/freeglut/freeglut/src/Common/freeglut_input_devices.c b/freeglut/freeglut/src/fg_input_devices.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_input_devices.c
rename to freeglut/freeglut/src/fg_input_devices.c
index 1dab040..8cac504 100644
--- a/freeglut/freeglut/src/Common/freeglut_input_devices.c
+++ b/freeglut/freeglut/src/fg_input_devices.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 typedef struct _serialport SERIALPORT;
 
diff --git a/freeglut/freeglut/src/Common/freeglut_internal.h b/freeglut/freeglut/src/fg_internal.h
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_internal.h
rename to freeglut/freeglut/src/fg_internal.h
index 9a3ef7b..34fdc8e 100644
--- a/freeglut/freeglut/src/Common/freeglut_internal.h
+++ b/freeglut/freeglut/src/fg_internal.h
@@ -1,5 +1,5 @@
 /*
- * freeglut_internal.h
+ * fg_internal.h
  *
  * The freeglut library private include file.
  *
@@ -173,13 +173,13 @@
 
 /* Platform-specific includes */
 #if TARGET_HOST_POSIX_X11
-#include "../x11/freeglut_internal_x11.h"
+#include "x11/fg_internal_x11.h"
 #endif
 #if TARGET_HOST_MS_WINDOWS
-#include "../mswin/freeglut_internal_mswin.h"
+#include "mswin/fg_internal_mswin.h"
 #endif
 #if TARGET_HOST_ANDROID
-#include "../android/freeglut_internal_android.h"
+#include "android/fg_internal_android.h"
 #endif
 
 
diff --git a/freeglut/freeglut/src/Common/freeglut_joystick.c b/freeglut/freeglut/src/fg_joystick.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_joystick.c
rename to freeglut/freeglut/src/fg_joystick.c
index d4e7446..ab6f401 100644
--- a/freeglut/freeglut/src/Common/freeglut_joystick.c
+++ b/freeglut/freeglut/src/fg_joystick.c
@@ -32,7 +32,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif
diff --git a/freeglut/freeglut/src/Common/freeglut_main.c b/freeglut/freeglut/src/fg_main.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_main.c
rename to freeglut/freeglut/src/fg_main.c
index 8aa02b2..24de119 100644
--- a/freeglut/freeglut/src/Common/freeglut_main.c
+++ b/freeglut/freeglut/src/fg_main.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 #ifdef HAVE_ERRNO_H
 #    include <errno.h>
 #endif
diff --git a/freeglut/freeglut/src/Common/freeglut_menu.c b/freeglut/freeglut/src/fg_menu.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_menu.c
rename to freeglut/freeglut/src/fg_menu.c
index d844f96..0e219b8 100644
--- a/freeglut/freeglut/src/Common/freeglut_menu.c
+++ b/freeglut/freeglut/src/fg_menu.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- DEFINITIONS ---------------------------------------------------------- */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_misc.c b/freeglut/freeglut/src/fg_misc.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_misc.c
rename to freeglut/freeglut/src/fg_misc.c
index b0beb39..5d192bf 100644
--- a/freeglut/freeglut/src/Common/freeglut_misc.c
+++ b/freeglut/freeglut/src/fg_misc.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_overlay.c b/freeglut/freeglut/src/fg_overlay.c
similarity index 98%
rename from freeglut/freeglut/src/Common/freeglut_overlay.c
rename to freeglut/freeglut/src/fg_overlay.c
index 2a1314a..4a59bfe 100644
--- a/freeglut/freeglut/src/Common/freeglut_overlay.c
+++ b/freeglut/freeglut/src/fg_overlay.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * NOTE: functions declared in this file probably will not be implemented.
diff --git a/freeglut/freeglut/src/Common/freeglut_spaceball.c b/freeglut/freeglut/src/fg_spaceball.c
similarity index 98%
rename from freeglut/freeglut/src/Common/freeglut_spaceball.c
rename to freeglut/freeglut/src/fg_spaceball.c
index 231531d..b1b321c 100644
--- a/freeglut/freeglut/src/Common/freeglut_spaceball.c
+++ b/freeglut/freeglut/src/fg_spaceball.c
@@ -8,7 +8,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_state.c b/freeglut/freeglut/src/fg_state.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_state.c
rename to freeglut/freeglut/src/fg_state.c
index d310b70..208b5e2 100644
--- a/freeglut/freeglut/src/Common/freeglut_state.c
+++ b/freeglut/freeglut/src/fg_state.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglut_stroke_mono_roman.c b/freeglut/freeglut/src/fg_stroke_mono_roman.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_stroke_mono_roman.c
rename to freeglut/freeglut/src/fg_stroke_mono_roman.c
index ec86d56..615526d 100644
--- a/freeglut/freeglut/src/Common/freeglut_stroke_mono_roman.c
+++ b/freeglut/freeglut/src/fg_stroke_mono_roman.c
@@ -29,7 +29,7 @@
 /* This file has been automatically generated by the genstroke utility. */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* char: 0x20 */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_stroke_roman.c b/freeglut/freeglut/src/fg_stroke_roman.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_stroke_roman.c
rename to freeglut/freeglut/src/fg_stroke_roman.c
index da4e030..8972d8a 100644
--- a/freeglut/freeglut/src/Common/freeglut_stroke_roman.c
+++ b/freeglut/freeglut/src/fg_stroke_roman.c
@@ -29,7 +29,7 @@
 /* This file has been automatically generated by the genstroke utility. */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* char: 0x20 */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_structure.c b/freeglut/freeglut/src/fg_structure.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_structure.c
rename to freeglut/freeglut/src/fg_structure.c
index 6a18b58..1e05653 100644
--- a/freeglut/freeglut/src/Common/freeglut_structure.c
+++ b/freeglut/freeglut/src/fg_structure.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- GLOBAL EXPORTS ------------------------------------------------------- */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_teapot.c b/freeglut/freeglut/src/fg_teapot.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_teapot.c
rename to freeglut/freeglut/src/fg_teapot.c
index 722bca6..41d0fee 100644
--- a/freeglut/freeglut/src/Common/freeglut_teapot.c
+++ b/freeglut/freeglut/src/fg_teapot.c
@@ -73,8 +73,8 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
-#include "freeglut_teapot_data.h"
+#include "fg_internal.h"
+#include "fg_teapot_data.h"
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
diff --git a/freeglut/freeglut/src/Common/freeglut_teapot_data.h b/freeglut/freeglut/src/fg_teapot_data.h
similarity index 100%
rename from freeglut/freeglut/src/Common/freeglut_teapot_data.h
rename to freeglut/freeglut/src/fg_teapot_data.h
diff --git a/freeglut/freeglut/src/Common/freeglut_videoresize.c b/freeglut/freeglut/src/fg_videoresize.c
similarity index 98%
rename from freeglut/freeglut/src/Common/freeglut_videoresize.c
rename to freeglut/freeglut/src/fg_videoresize.c
index c367d92..6f8d1d1 100644
--- a/freeglut/freeglut/src/Common/freeglut_videoresize.c
+++ b/freeglut/freeglut/src/fg_videoresize.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * NOTE: functions declared in this file probably will not be implemented.
diff --git a/freeglut/freeglut/src/Common/freeglut_window.c b/freeglut/freeglut/src/fg_window.c
similarity index 99%
rename from freeglut/freeglut/src/Common/freeglut_window.c
rename to freeglut/freeglut/src/fg_window.c
index bcbe44d..e7f9275 100644
--- a/freeglut/freeglut/src/Common/freeglut_window.c
+++ b/freeglut/freeglut/src/fg_window.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/Common/freeglutdll.def b/freeglut/freeglut/src/freeglutdll.def
similarity index 100%
rename from freeglut/freeglut/src/Common/freeglutdll.def
rename to freeglut/freeglut/src/freeglutdll.def
diff --git a/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c b/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
index e2c0523..b0eda70 100644
--- a/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 
diff --git a/freeglut/freeglut/src/mswin/freeglut_display_mswin.c b/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
index 5becaa4..6a58412 100644
--- a/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 
diff --git a/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c b/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
index 3b4fc10..efc2fa9 100644
--- a/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
diff --git a/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c b/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
index e0a7c22..3e5228d 100644
--- a/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  * Remembers the current visual settings, so that
diff --git a/freeglut/freeglut/src/mswin/freeglut_init_mswin.c b/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
index 4e1451d..f80fe78 100644
--- a/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 
diff --git a/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c b/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
index fb70d33..ba230d4 100644
--- a/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #include <sys/types.h>
 #include <winbase.h>
diff --git a/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c b/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
index 104afbe..aefa192 100644
--- a/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 #if !defined(_WIN32_WCE)
diff --git a/freeglut/freeglut/src/mswin/freeglut_main_mswin.c b/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
index 8a13a84..a1c5c8c 100644
--- a/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 extern void fghRedrawWindow ( SFG_Window *window );
diff --git a/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c b/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
index b9c7797..d198cca 100644
--- a/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
diff --git a/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c b/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c
index f2b41b3..3a7af46 100644
--- a/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c
@@ -30,7 +30,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 void fgPlatformInitializeSpaceball(void)
 {
diff --git a/freeglut/freeglut/src/mswin/freeglut_state_mswin.c b/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
index 4daec41..07ffdb1 100644
--- a/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
diff --git a/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c b/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c
index e64def7..8ccb33d 100644
--- a/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 void fgPlatformCreateWindow ( SFG_Window *window )
diff --git a/freeglut/freeglut/src/mswin/freeglut_window_mswin.c b/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
index 783c53d..6515063 100644
--- a/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
+++ b/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 /* The following include file is available from SGI but is not standard:
diff --git a/freeglut/freeglut/src/Common/xparsegeometry_repl.c b/freeglut/freeglut/src/util/xparsegeometry_repl.c
similarity index 99%
rename from freeglut/freeglut/src/Common/xparsegeometry_repl.c
rename to freeglut/freeglut/src/util/xparsegeometry_repl.c
index daacf44..a059369 100644
--- a/freeglut/freeglut/src/Common/xparsegeometry_repl.c
+++ b/freeglut/freeglut/src/util/xparsegeometry_repl.c
@@ -32,7 +32,7 @@ from The Open Group.
 
 */
 
-#include "../Common/xparsegeometry_repl.h"
+#include "xparsegeometry_repl.h"
 
 /*
  *   XParseGeometry parses strings of the form
diff --git a/freeglut/freeglut/src/Common/xparsegeometry_repl.h b/freeglut/freeglut/src/util/xparsegeometry_repl.h
similarity index 100%
rename from freeglut/freeglut/src/Common/xparsegeometry_repl.h
rename to freeglut/freeglut/src/util/xparsegeometry_repl.h
diff --git a/freeglut/freeglut/src/x11/freeglut_cursor_x11.c b/freeglut/freeglut/src/x11/freeglut_cursor_x11.c
index 5c2dd90..3098e53 100644
--- a/freeglut/freeglut/src/x11/freeglut_cursor_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_cursor_x11.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* This code is for Posix/X11, Solaris, and OSX */
 #include <X11/cursorfont.h>
diff --git a/freeglut/freeglut/src/x11/freeglut_display_x11.c b/freeglut/freeglut/src/x11/freeglut_display_x11.c
index d19e9d9..bbf9061 100644
--- a/freeglut/freeglut/src/x11/freeglut_display_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_display_x11.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
 {
diff --git a/freeglut/freeglut/src/x11/freeglut_ext_x11.c b/freeglut/freeglut/src/x11/freeglut_ext_x11.c
index eb4b5d3..d243cfd 100644
--- a/freeglut/freeglut/src/x11/freeglut_ext_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_ext_x11.c
@@ -28,7 +28,7 @@
 
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
diff --git a/freeglut/freeglut/src/x11/freeglut_gamemode_x11.c b/freeglut/freeglut/src/x11/freeglut_gamemode_x11.c
index 7dd4245..6130aeb 100644
--- a/freeglut/freeglut/src/x11/freeglut_gamemode_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_gamemode_x11.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
 {
diff --git a/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c b/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c
index e4a29a6..f2519c5 100644
--- a/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c
@@ -71,7 +71,7 @@
 #undef glutBitmapHelvetica12
 #undef glutBitmapHelvetica18
 
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 struct freeglutStrokeFont
 {
diff --git a/freeglut/freeglut/src/x11/freeglut_init_x11.c b/freeglut/freeglut/src/x11/freeglut_init_x11.c
index 7c8ba93..83fe287 100644
--- a/freeglut/freeglut/src/x11/freeglut_init_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_init_x11.c
@@ -29,7 +29,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <limits.h>  /* LONG_MAX */
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* Return the atom associated with "name". */
 static Atom fghGetAtom(const char * name)
@@ -270,4 +270,4 @@ void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextT
 {
     /* Note that the MVisualInfo is not owned by the MenuContext! */
     glXDestroyContext( pDisplay.Display, MContext );
-}
\ No newline at end of file
+}
diff --git a/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c b/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c
index e45e02e..a94e52a 100644
--- a/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c
@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/freeglut/freeglut/src/x11/freeglut_joystick_x11.c b/freeglut/freeglut/src/x11/freeglut_joystick_x11.c
index 962e362..5d686b5 100644
--- a/freeglut/freeglut/src/x11/freeglut_joystick_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_joystick_x11.c
@@ -34,7 +34,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif
diff --git a/freeglut/freeglut/src/x11/freeglut_main_x11.c b/freeglut/freeglut/src/x11/freeglut_main_x11.c
index 710535a..e72db37 100644
--- a/freeglut/freeglut/src/x11/freeglut_main_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_main_x11.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 #ifdef HAVE_ERRNO_H
 #    include <errno.h>
 #endif
diff --git a/freeglut/freeglut/src/x11/freeglut_menu_x11.c b/freeglut/freeglut/src/x11/freeglut_menu_x11.c
index 36e87ad..0443dcd 100644
--- a/freeglut/freeglut/src/x11/freeglut_menu_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_menu_x11.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  *  * Private function to get the virtual maximum screen extent
diff --git a/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c b/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c
index e0d22d6..582a926 100644
--- a/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c
@@ -10,7 +10,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #include <X11/Xlib.h>
 
diff --git a/freeglut/freeglut/src/x11/freeglut_state_x11.c b/freeglut/freeglut/src/x11/freeglut_state_x11.c
index 9a5fd71..3523477 100644
--- a/freeglut/freeglut/src/x11/freeglut_state_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_state_x11.c
@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
diff --git a/freeglut/freeglut/src/x11/freeglut_structure_x11.c b/freeglut/freeglut/src/x11/freeglut_structure_x11.c
index df62a58..cbc9129 100644
--- a/freeglut/freeglut/src/x11/freeglut_structure_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_structure_x11.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 extern SFG_Structure fgStructure;
 
diff --git a/freeglut/freeglut/src/x11/freeglut_window_x11.c b/freeglut/freeglut/src/x11/freeglut_window_x11.c
index 0fa4105..44c9952 100644
--- a/freeglut/freeglut/src/x11/freeglut_window_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_window_x11.c
@@ -30,7 +30,7 @@
 #include <GL/freeglut.h>
 #include <limits.h>  /* LONG_MAX */
 #include <unistd.h>  /* usleep */
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* pushing attribute/value pairs into an array */
 #define ATTRIB(a) attributes[where++]=(a)
diff --git a/freeglut/freeglut/src/x11/freeglut_xinput_x11.c b/freeglut/freeglut/src/x11/freeglut_xinput_x11.c
index a682029..fac1bf7 100644
--- a/freeglut/freeglut/src/x11/freeglut_xinput_x11.c
+++ b/freeglut/freeglut/src/x11/freeglut_xinput_x11.c
@@ -3,7 +3,7 @@
 
 #include <GL/freeglut.h>
 
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #if HAVE_X11_EXTENSIONS_XINPUT2_H