Index: /trunk/src/Makefile.in
===================================================================
--- /trunk/src/Makefile.in	(revision 5347)
+++ /trunk/src/Makefile.in	(revision 5348)
@@ -432,7 +432,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/Makefile.in
===================================================================
--- /trunk/src/lib/Makefile.in	(revision 5347)
+++ /trunk/src/lib/Makefile.in	(revision 5348)
@@ -186,7 +186,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/collision_detection/Makefile.in
===================================================================
--- /trunk/src/lib/collision_detection/Makefile.in	(revision 5347)
+++ /trunk/src/lib/collision_detection/Makefile.in	(revision 5348)
@@ -224,7 +224,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/event/Makefile.in
===================================================================
--- /trunk/src/lib/event/Makefile.in	(revision 5347)
+++ /trunk/src/lib/event/Makefile.in	(revision 5348)
@@ -212,7 +212,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/event/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/event/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/graphics/Makefile.in
===================================================================
--- /trunk/src/lib/graphics/Makefile.in	(revision 5347)
+++ /trunk/src/lib/graphics/Makefile.in	(revision 5348)
@@ -230,7 +230,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/graphics/importer/Makefile.in
===================================================================
--- /trunk/src/lib/graphics/importer/Makefile.in	(revision 5347)
+++ /trunk/src/lib/graphics/importer/Makefile.in	(revision 5348)
@@ -217,7 +217,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/graphics/spatial_separation/Makefile.in
===================================================================
--- /trunk/src/lib/graphics/spatial_separation/Makefile.in	(revision 5347)
+++ /trunk/src/lib/graphics/spatial_separation/Makefile.in	(revision 5348)
@@ -205,7 +205,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/gui/Makefile.in
===================================================================
--- /trunk/src/lib/gui/Makefile.in	(revision 5347)
+++ /trunk/src/lib/gui/Makefile.in	(revision 5348)
@@ -179,7 +179,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/gui/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/gui/gl_gui/Makefile.in
===================================================================
--- /trunk/src/lib/gui/gl_gui/Makefile.in	(revision 5347)
+++ /trunk/src/lib/gui/gl_gui/Makefile.in	(revision 5348)
@@ -200,7 +200,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/gui/gtk_gui/Makefile.in
===================================================================
--- /trunk/src/lib/gui/gtk_gui/Makefile.in	(revision 5347)
+++ /trunk/src/lib/gui/gtk_gui/Makefile.in	(revision 5348)
@@ -241,7 +241,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/particles/Makefile.in
===================================================================
--- /trunk/src/lib/particles/Makefile.in	(revision 5347)
+++ /trunk/src/lib/particles/Makefile.in	(revision 5348)
@@ -209,7 +209,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/particles/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/particles/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/physics/Makefile.in
===================================================================
--- /trunk/src/lib/physics/Makefile.in	(revision 5347)
+++ /trunk/src/lib/physics/Makefile.in	(revision 5348)
@@ -218,7 +218,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/physics/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/physics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/shell/Makefile.in
===================================================================
--- /trunk/src/lib/shell/Makefile.in	(revision 5347)
+++ /trunk/src/lib/shell/Makefile.in	(revision 5348)
@@ -212,7 +212,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/shell/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/shell/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/shell/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/shell/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/sound/Makefile.in
===================================================================
--- /trunk/src/lib/sound/Makefile.in	(revision 5347)
+++ /trunk/src/lib/sound/Makefile.in	(revision 5348)
@@ -201,7 +201,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/sound/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/sound/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/sound/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/sound/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/lib/tinyxml/Makefile.in
===================================================================
--- /trunk/src/lib/tinyxml/Makefile.in	(revision 5347)
+++ /trunk/src/lib/tinyxml/Makefile.in	(revision 5348)
@@ -204,7 +204,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
+	  $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/subprojects/Makefile.in
===================================================================
--- /trunk/src/subprojects/Makefile.in	(revision 5347)
+++ /trunk/src/subprojects/Makefile.in	(revision 5348)
@@ -186,7 +186,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/subprojects/Makefile
+	  $(AUTOMAKE) --foreign  src/subprojects/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: /trunk/src/subprojects/collision_detection/Makefile.am
===================================================================
--- /trunk/src/subprojects/collision_detection/Makefile.am	(revision 5347)
+++ /trunk/src/subprojects/collision_detection/Makefile.am	(revision 5348)
@@ -8,4 +8,6 @@
                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
@@ -22,12 +24,8 @@
                    collision_detection.cc \
                    $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
                    $(MAINSRCDIR)/lib/util/substring.cc \
                    $(MAINSRCDIR)/lib/util/ini_parser.cc \
                    $(MAINSRCDIR)/world_entities/camera.cc \
-                   $(MAINSRCDIR)/lib/graphics/light.cc \
-                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
@@ -38,5 +36,5 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
                    $(MAINSRCDIR)/world_entities/test_entity.cc \
                    $(MAINSRCDIR)/world_entities/environment.cc \
Index: /trunk/src/subprojects/collision_detection/Makefile.in
===================================================================
--- /trunk/src/subprojects/collision_detection/Makefile.in	(revision 5347)
+++ /trunk/src/subprojects/collision_detection/Makefile.in	(revision 5348)
@@ -53,12 +53,11 @@
 am_collision_OBJECTS = collision-framework.$(OBJEXT) \
 	collision-collision_detection.$(OBJEXT) \
-	collision-load_param.$(OBJEXT) collision-substring.$(OBJEXT) \
-	collision-ini_parser.$(OBJEXT) collision-camera.$(OBJEXT) \
-	collision-light.$(OBJEXT) collision-text_engine.$(OBJEXT) \
-	collision-graphics_engine.$(OBJEXT) \
-	collision-render_2d.$(OBJEXT) collision-element_2d.$(OBJEXT) \
-	collision-state.$(OBJEXT) collision-base_object.$(OBJEXT) \
-	collision-class_list.$(OBJEXT) collision-vector.$(OBJEXT) \
-	collision-color.$(OBJEXT) collision-resource_manager.$(OBJEXT) \
+	collision-load_param.$(OBJEXT) \
+	collision-helper_functions.$(OBJEXT) \
+	collision-substring.$(OBJEXT) collision-ini_parser.$(OBJEXT) \
+	collision-camera.$(OBJEXT) collision-state.$(OBJEXT) \
+	collision-base_object.$(OBJEXT) collision-class_list.$(OBJEXT) \
+	collision-vector.$(OBJEXT) collision-color.$(OBJEXT) \
+	collision-resource_manager.$(OBJEXT) \
 	collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
 	collision-gui_gtk.$(OBJEXT) collision-test_entity.$(OBJEXT) \
@@ -72,4 +71,6 @@
 	$(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
 	$(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+	$(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+	$(MAINSRCDIR)/lib/shell/libORXshell.a \
 	$(MAINSRCDIR)/lib/event/libORXevent.a \
 	$(MAINSRCDIR)/lib/sound/libORXsound.a \
@@ -88,16 +89,13 @@
 @AMDEP_TRUE@	./$(DEPDIR)/collision-collision_detection.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-color.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/collision-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-environment.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-factory.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-framework.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/collision-graphics_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-gui_gtk.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/collision-helper_functions.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-ini_parser.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/collision-light.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-load_param.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-null_parent.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-p_node.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/collision-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-state.Po \
@@ -105,5 +103,4 @@
 @AMDEP_TRUE@	./$(DEPDIR)/collision-terrain.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-test_entity.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/collision-text_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-vector.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-world_entity.Po
@@ -230,4 +227,6 @@
                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
@@ -242,12 +241,8 @@
                    collision_detection.cc \
                    $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
                    $(MAINSRCDIR)/lib/util/substring.cc \
                    $(MAINSRCDIR)/lib/util/ini_parser.cc \
                    $(MAINSRCDIR)/world_entities/camera.cc \
-                   $(MAINSRCDIR)/lib/graphics/light.cc \
-                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
@@ -258,5 +253,5 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
                    $(MAINSRCDIR)/world_entities/test_entity.cc \
                    $(MAINSRCDIR)/world_entities/environment.cc \
@@ -281,7 +276,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile
+	  $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -342,16 +337,13 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-framework.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-gui_gtk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-helper_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-ini_parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-light.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-p_node.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-state.Po@am__quote@
@@ -359,5 +351,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-terrain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-test_entity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-text_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-world_entity.Po@am__quote@
@@ -427,4 +418,20 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
 
+collision-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-helper_functions.o -MD -MP -MF "$(DEPDIR)/collision-helper_functions.Tpo" -c -o collision-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-helper_functions.Tpo" "$(DEPDIR)/collision-helper_functions.Po"; else rm -f "$(DEPDIR)/collision-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='collision-helper_functions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-helper_functions.Po' tmpdepfile='$(DEPDIR)/collision-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
+
+collision-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-helper_functions.obj -MD -MP -MF "$(DEPDIR)/collision-helper_functions.Tpo" -c -o collision-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-helper_functions.Tpo" "$(DEPDIR)/collision-helper_functions.Po"; else rm -f "$(DEPDIR)/collision-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='collision-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-helper_functions.Po' tmpdepfile='$(DEPDIR)/collision-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
+
 collision-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-substring.o -MD -MP -MF "$(DEPDIR)/collision-substring.Tpo" -c -o collision-substring.o `test -f '$(MAINSRCDIR)/lib/util/substring.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/substring.cc; \
@@ -475,84 +482,4 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-camera.obj `if test -f '$(MAINSRCDIR)/world_entities/camera.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/camera.cc'; fi`
 
-collision-light.o: $(MAINSRCDIR)/lib/graphics/light.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-light.o -MD -MP -MF "$(DEPDIR)/collision-light.Tpo" -c -o collision-light.o `test -f '$(MAINSRCDIR)/lib/graphics/light.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/light.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-light.Tpo" "$(DEPDIR)/collision-light.Po"; else rm -f "$(DEPDIR)/collision-light.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/light.cc' object='collision-light.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-light.Po' tmpdepfile='$(DEPDIR)/collision-light.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-light.o `test -f '$(MAINSRCDIR)/lib/graphics/light.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/light.cc
-
-collision-light.obj: $(MAINSRCDIR)/lib/graphics/light.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-light.obj -MD -MP -MF "$(DEPDIR)/collision-light.Tpo" -c -o collision-light.obj `if test -f '$(MAINSRCDIR)/lib/graphics/light.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/light.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-light.Tpo" "$(DEPDIR)/collision-light.Po"; else rm -f "$(DEPDIR)/collision-light.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/light.cc' object='collision-light.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-light.Po' tmpdepfile='$(DEPDIR)/collision-light.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-light.obj `if test -f '$(MAINSRCDIR)/lib/graphics/light.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/light.cc'; fi`
-
-collision-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-text_engine.o -MD -MP -MF "$(DEPDIR)/collision-text_engine.Tpo" -c -o collision-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-text_engine.Tpo" "$(DEPDIR)/collision-text_engine.Po"; else rm -f "$(DEPDIR)/collision-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='collision-text_engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-text_engine.Po' tmpdepfile='$(DEPDIR)/collision-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
-
-collision-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-text_engine.obj -MD -MP -MF "$(DEPDIR)/collision-text_engine.Tpo" -c -o collision-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-text_engine.Tpo" "$(DEPDIR)/collision-text_engine.Po"; else rm -f "$(DEPDIR)/collision-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='collision-text_engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-text_engine.Po' tmpdepfile='$(DEPDIR)/collision-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
-
-collision-graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-graphics_engine.o -MD -MP -MF "$(DEPDIR)/collision-graphics_engine.Tpo" -c -o collision-graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-graphics_engine.Tpo" "$(DEPDIR)/collision-graphics_engine.Po"; else rm -f "$(DEPDIR)/collision-graphics_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='collision-graphics_engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-graphics_engine.Po' tmpdepfile='$(DEPDIR)/collision-graphics_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
-
-collision-graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-graphics_engine.obj -MD -MP -MF "$(DEPDIR)/collision-graphics_engine.Tpo" -c -o collision-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-graphics_engine.Tpo" "$(DEPDIR)/collision-graphics_engine.Po"; else rm -f "$(DEPDIR)/collision-graphics_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='collision-graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-graphics_engine.Po' tmpdepfile='$(DEPDIR)/collision-graphics_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
-
-collision-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.o -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-
-collision-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.obj -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
-
-collision-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.o -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-
-collision-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.obj -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
-
 collision-state.o: $(MAINSRCDIR)/util/state.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-state.o -MD -MP -MF "$(DEPDIR)/collision-state.Tpo" -c -o collision-state.o `test -f '$(MAINSRCDIR)/util/state.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/state.cc; \
@@ -683,19 +610,19 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
 
-collision-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.o -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc; \
+collision-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.o -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-gui_gtk.Tpo" "$(DEPDIR)/collision-gui_gtk.Po"; else rm -f "$(DEPDIR)/collision-gui_gtk.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='collision-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='collision-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-gui_gtk.Po' tmpdepfile='$(DEPDIR)/collision-gui_gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc
-
-collision-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`; \
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+
+collision-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-gui_gtk.Tpo" "$(DEPDIR)/collision-gui_gtk.Po"; else rm -f "$(DEPDIR)/collision-gui_gtk.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='collision-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='collision-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-gui_gtk.Po' tmpdepfile='$(DEPDIR)/collision-gui_gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`
 
 collision-test_entity.o: $(MAINSRCDIR)/world_entities/test_entity.cc
Index: /trunk/src/subprojects/importer/Makefile.am
===================================================================
--- /trunk/src/subprojects/importer/Makefile.am	(revision 5347)
+++ /trunk/src/subprojects/importer/Makefile.am	(revision 5348)
@@ -10,4 +10,6 @@
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
@@ -15,8 +17,6 @@
 importer_SOURCES= ../framework.cc \
                   importer.cc \
-                  $(MAINSRCDIR)/lib/graphics/light.cc \
                   $(MAINSRCDIR)/util/state.cc \
                   $(MAINSRCDIR)/world_entities/camera.cc \
-                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
                   $(MAINSRCDIR)/lib/lang/base_object.cc \
                   $(MAINSRCDIR)/lib/lang/class_list.cc \
@@ -24,10 +24,8 @@
                   $(MAINSRCDIR)/util/resource_manager.cc \
                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
-                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
                   $(MAINSRCDIR)/lib/util/substring.cc \
                   $(MAINSRCDIR)/lib/util/color.cc \
Index: /trunk/src/subprojects/importer/Makefile.in
===================================================================
--- /trunk/src/subprojects/importer/Makefile.in	(revision 5347)
+++ /trunk/src/subprojects/importer/Makefile.in	(revision 5348)
@@ -57,12 +57,14 @@
 	importer-base_object.$(OBJEXT) importer-class_list.$(OBJEXT) \
 	importer-vector.$(OBJEXT) importer-resource_manager.$(OBJEXT) \
-	importer-ini_parser.$(OBJEXT) importer-text_engine.$(OBJEXT) \
-	importer-render_2d.$(OBJEXT) importer-element_2d.$(OBJEXT) \
-	importer-p_node.$(OBJEXT) importer-null_parent.$(OBJEXT) \
-	importer-load_param.$(OBJEXT) importer-substring.$(OBJEXT) \
-	importer-color.$(OBJEXT) importer-factory.$(OBJEXT)
+	importer-ini_parser.$(OBJEXT) importer-p_node.$(OBJEXT) \
+	importer-null_parent.$(OBJEXT) importer-load_param.$(OBJEXT) \
+	importer-helper_functions.$(OBJEXT) \
+	importer-substring.$(OBJEXT) importer-color.$(OBJEXT) \
+	importer-factory.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \
 	$(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+	$(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+	$(MAINSRCDIR)/lib/shell/libORXshell.a \
 	$(MAINSRCDIR)/lib/sound/libORXsound.a \
 	$(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
@@ -74,8 +76,8 @@
 @AMDEP_TRUE@	./$(DEPDIR)/importer-class_list.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-color.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/importer-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-factory.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-framework.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-graphics_engine.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/importer-helper_functions.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-importer.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-ini_parser.Po \
@@ -84,9 +86,7 @@
 @AMDEP_TRUE@	./$(DEPDIR)/importer-null_parent.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-p_node.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/importer-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-state.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-substring.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/importer-text_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-vector.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -213,4 +213,6 @@
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
@@ -227,10 +229,8 @@
                   $(MAINSRCDIR)/util/resource_manager.cc \
                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
-                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
                   $(MAINSRCDIR)/lib/util/substring.cc \
                   $(MAINSRCDIR)/lib/util/color.cc \
@@ -250,7 +250,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
+	  $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -307,8 +307,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-class_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-framework.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-graphics_engine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-helper_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-importer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-ini_parser.Po@am__quote@
@@ -317,9 +317,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-p_node.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-state.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-substring.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-text_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-vector.Po@am__quote@
 
@@ -516,52 +514,4 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
 
-importer-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-text_engine.o -MD -MP -MF "$(DEPDIR)/importer-text_engine.Tpo" -c -o importer-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-text_engine.Tpo" "$(DEPDIR)/importer-text_engine.Po"; else rm -f "$(DEPDIR)/importer-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='importer-text_engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-text_engine.Po' tmpdepfile='$(DEPDIR)/importer-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
-
-importer-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-text_engine.obj -MD -MP -MF "$(DEPDIR)/importer-text_engine.Tpo" -c -o importer-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-text_engine.Tpo" "$(DEPDIR)/importer-text_engine.Po"; else rm -f "$(DEPDIR)/importer-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='importer-text_engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-text_engine.Po' tmpdepfile='$(DEPDIR)/importer-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
-
-importer-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.o -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-
-importer-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.obj -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
-
-importer-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.o -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-
-importer-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.obj -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
-
 importer-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-p_node.o -MD -MP -MF "$(DEPDIR)/importer-p_node.Tpo" -c -o importer-p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc; \
@@ -611,4 +561,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
+
+importer-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-helper_functions.o -MD -MP -MF "$(DEPDIR)/importer-helper_functions.Tpo" -c -o importer-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-helper_functions.Tpo" "$(DEPDIR)/importer-helper_functions.Po"; else rm -f "$(DEPDIR)/importer-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='importer-helper_functions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-helper_functions.Po' tmpdepfile='$(DEPDIR)/importer-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
+
+importer-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-helper_functions.obj -MD -MP -MF "$(DEPDIR)/importer-helper_functions.Tpo" -c -o importer-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-helper_functions.Tpo" "$(DEPDIR)/importer-helper_functions.Po"; else rm -f "$(DEPDIR)/importer-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='importer-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-helper_functions.Po' tmpdepfile='$(DEPDIR)/importer-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
 
 importer-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
Index: /trunk/src/subprojects/particles/Makefile.am
===================================================================
--- /trunk/src/subprojects/particles/Makefile.am	(revision 5347)
+++ /trunk/src/subprojects/particles/Makefile.am	(revision 5348)
@@ -8,5 +8,7 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -28,12 +30,10 @@
                    $(MAINSRCDIR)/lib/math/vector.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \
-                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
                    $(MAINSRCDIR)/lib/util/substring.cc \
                    $(MAINSRCDIR)/util/loading/load_param.cc \
+		   $(MAINSRCDIR)/lib/util/helper_functions.cc \
                    $(MAINSRCDIR)/util/loading/factory.cc \
                    $(MAINSRCDIR)/lib/util/color.cc \
Index: /trunk/src/subprojects/particles/Makefile.in
===================================================================
--- /trunk/src/subprojects/particles/Makefile.in	(revision 5347)
+++ /trunk/src/subprojects/particles/Makefile.in	(revision 5348)
@@ -59,8 +59,8 @@
 	particles-vector.$(OBJEXT) \
 	particles-resource_manager.$(OBJEXT) \
-	particles-text_engine.$(OBJEXT) particles-render_2d.$(OBJEXT) \
-	particles-element_2d.$(OBJEXT) particles-p_node.$(OBJEXT) \
-	particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
-	particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
+	particles-p_node.$(OBJEXT) particles-null_parent.$(OBJEXT) \
+	particles-gui_gtk.$(OBJEXT) particles-substring.$(OBJEXT) \
+	particles-load_param.$(OBJEXT) \
+	particles-helper_functions.$(OBJEXT) \
 	particles-factory.$(OBJEXT) particles-color.$(OBJEXT) \
 	particles-ini_parser.$(OBJEXT)
@@ -70,5 +70,7 @@
 	$(MAINSRCDIR)/lib/event/libORXevent.a \
 	$(MAINSRCDIR)/lib/particles/libORXparticles.a \
+	$(MAINSRCDIR)/lib/shell/libORXshell.a \
 	$(MAINSRCDIR)/lib/sound/libORXsound.a \
+	$(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
 	$(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
 	$(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -82,9 +84,9 @@
 @AMDEP_TRUE@	./$(DEPDIR)/particles-class_list.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-color.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-factory.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-framework.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-graphics_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-gui_gtk.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-helper_functions.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-ini_parser.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-light.Po \
@@ -93,9 +95,7 @@
 @AMDEP_TRUE@	./$(DEPDIR)/particles-p_node.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-particle_fun.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-state.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-substring.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-text_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-vector.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-world_entity.Po
@@ -222,5 +222,7 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -242,12 +244,10 @@
                    $(MAINSRCDIR)/lib/math/vector.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \
-                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
-                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
                    $(MAINSRCDIR)/lib/util/substring.cc \
                    $(MAINSRCDIR)/util/loading/load_param.cc \
+		   $(MAINSRCDIR)/lib/util/helper_functions.cc \
                    $(MAINSRCDIR)/util/loading/factory.cc \
                    $(MAINSRCDIR)/lib/util/color.cc \
@@ -267,7 +267,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
+	  $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -324,9 +324,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-class_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-framework.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-gui_gtk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-helper_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-light.Po@am__quote@
@@ -335,9 +335,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-state.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-substring.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-text_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-world_entity.Po@am__quote@
@@ -535,52 +533,4 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
 
-particles-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-text_engine.o -MD -MP -MF "$(DEPDIR)/particles-text_engine.Tpo" -c -o particles-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-text_engine.Tpo" "$(DEPDIR)/particles-text_engine.Po"; else rm -f "$(DEPDIR)/particles-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='particles-text_engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-text_engine.Po' tmpdepfile='$(DEPDIR)/particles-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
-
-particles-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-text_engine.obj -MD -MP -MF "$(DEPDIR)/particles-text_engine.Tpo" -c -o particles-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-text_engine.Tpo" "$(DEPDIR)/particles-text_engine.Po"; else rm -f "$(DEPDIR)/particles-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='particles-text_engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-text_engine.Po' tmpdepfile='$(DEPDIR)/particles-text_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
-
-particles-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.o -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-
-particles-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.obj -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
-
-particles-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.o -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-
-particles-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.obj -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
-
 particles-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-p_node.o -MD -MP -MF "$(DEPDIR)/particles-p_node.Tpo" -c -o particles-p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc; \
@@ -615,19 +565,19 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
 
-particles-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.o -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc; \
+particles-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.o -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-gui_gtk.Tpo" "$(DEPDIR)/particles-gui_gtk.Po"; else rm -f "$(DEPDIR)/particles-gui_gtk.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='particles-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='particles-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-gui_gtk.Po' tmpdepfile='$(DEPDIR)/particles-gui_gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc
-
-particles-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`; \
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+
+particles-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-gui_gtk.Tpo" "$(DEPDIR)/particles-gui_gtk.Po"; else rm -f "$(DEPDIR)/particles-gui_gtk.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='particles-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='particles-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-gui_gtk.Po' tmpdepfile='$(DEPDIR)/particles-gui_gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`
 
 particles-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
@@ -662,4 +612,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
+
+particles-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-helper_functions.o -MD -MP -MF "$(DEPDIR)/particles-helper_functions.Tpo" -c -o particles-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-helper_functions.Tpo" "$(DEPDIR)/particles-helper_functions.Po"; else rm -f "$(DEPDIR)/particles-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='particles-helper_functions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-helper_functions.Po' tmpdepfile='$(DEPDIR)/particles-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
+
+particles-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-helper_functions.obj -MD -MP -MF "$(DEPDIR)/particles-helper_functions.Tpo" -c -o particles-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-helper_functions.Tpo" "$(DEPDIR)/particles-helper_functions.Po"; else rm -f "$(DEPDIR)/particles-helper_functions.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='particles-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-helper_functions.Po' tmpdepfile='$(DEPDIR)/particles-helper_functions.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
 
 particles-factory.o: $(MAINSRCDIR)/util/loading/factory.cc
Index: /trunk/src/subprojects/particles/particle_fun.cc
===================================================================
--- /trunk/src/subprojects/particles/particle_fun.cc	(revision 5347)
+++ /trunk/src/subprojects/particles/particle_fun.cc	(revision 5348)
@@ -24,4 +24,5 @@
 #include "graphics_engine.h"
 #include "light.h"
+#include "resource_manager.h"
 
 #include <dirent.h>
Index: /trunk/src/subprojects/testmain/Makefile.in
===================================================================
--- /trunk/src/subprojects/testmain/Makefile.in	(revision 5347)
+++ /trunk/src/subprojects/testmain/Makefile.in	(revision 5348)
@@ -196,7 +196,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
+	  $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
