diff --git a/.gitmodules b/.gitmodules
index 84f7c1e4..eadca1a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
-[submodule "capsimg"]
-	path = capsimg
+[submodule "external/libxml2"]
+	path = external/libxml2
+	url = https://android.googlesource.com/platform/external/libxml2
+[submodule "external/libmpeg2"]
+	path = external/libmpeg2
+	url = https://android.googlesource.com/platform/external/libmpeg2
+[submodule "external/capsimg"]
+	path = external/capsimg
 	url = https://github.com/FrodeSolheim/capsimg
diff --git a/Android.mk b/Android.mk
index 73aef8c2..f37ee9fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,26 +2,29 @@ AMIBERRY_LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
 
-include $(LOCAL_PATH)/guisan-dev/Android.mk
+include $(LOCAL_PATH)/external/libguisan/Android.mk
+LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
+include $(CLEAR_VARS)
+
+include $(LOCAL_PATH)/external/libxml2/Android.mk
 LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := amiberry
 
-SDL_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL
+SDL_PATH := D:/Github/amiberry-android/app/jni/SDL
 #LIBMPEG2_PATH := ../mpeg2
-LIBPNG_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
-LIBXML_PATH := /home/midwan/projects/amiberry-android/app/jni/xml2
+LIBPNG_PATH := D:/Github/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/osdep \
                     $(LOCAL_PATH)/src/threaddep \
                     $(LOCAL_PATH)/src/include \
                     $(LOCAL_PATH)/src/archivers \
-                    $(LOCAL_PATH)/guisan-dev/include \
+                    $(LOCAL_PATH)/external/libguisan/include \
+                    $(LOCAL_PATH)/external/libxml2/include \
                     $(SDL_PATH)/include \
                     $(LIBPNG_PATH) \
-                    $(LIBXML_PATH)/include
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
     LOCAL_ARM_NEON := true
@@ -208,7 +211,8 @@ LOCAL_SRC_FILES += src/newcpu.cpp \
                     src/jit/compemu_fpp.cpp \
                     src/jit/compemu_support.cpp
 
-LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer xml2 mpg123 guisan
+LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer mpg123 guisan
+LOCAL_STATIC_LIBRARIES := xml2
 
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -lz
 
diff --git a/Makefile b/Makefile
index ae74b790..3532f5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -174,8 +174,8 @@ all: guisan $(PROG)
 export SDL_CFLAGS := $(shell sdl2-config --cflags)
 export SDL_LDFLAGS := $(shell sdl2-config --libs)
 
-CPPFLAGS += $(SDL_CFLAGS) -Iguisan-dev/include
-LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lguisan-dev/lib
+CPPFLAGS += $(SDL_CFLAGS) -Iexterna/libguisan/include
+LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib
 
 #
 # Common options
@@ -437,6 +437,6 @@ bootrom:
 	touch src/filesys.cpp
 
 guisan:
-	$(MAKE) -C guisan-dev
+	$(MAKE) -C external/libguisan
 	
 -include $(DEPS)
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 81eb1943..5e6f6c2b 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -60,14 +60,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
       <AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
@@ -75,14 +75,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
       <AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;vchiq_arm;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
@@ -91,14 +91,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
       <AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
       <CustomPostLinkTool>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-strip</CustomPostLinkTool>
@@ -108,14 +108,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/usr/local/include/SDL2;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/usr/local/include/SDL2;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
       <AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;vchiq_arm;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
diff --git a/VisualGDB/guisan/guisan.vcxproj b/VisualGDB/guisan/guisan.vcxproj
index 46523ae7..be56a71a 100644
--- a/VisualGDB/guisan/guisan.vcxproj
+++ b/VisualGDB/guisan/guisan.vcxproj
@@ -30,20 +30,20 @@
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
-    <OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
+    <OutDir>$(SolutionDir)..\..\external\libguisan\lib\</OutDir>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
-    <OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
+    <OutDir>$(SolutionDir)..\..\external\libguisan\lib\</OutDir>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../external/libguisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -57,7 +57,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../external/libguisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -69,57 +69,57 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -129,74 +129,74 @@
     <None Include="guisan-Release.vgdbsettings" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualGDB/guisan/guisan.vcxproj.filters b/VisualGDB/guisan/guisan.vcxproj.filters
index c65b9cfa..a59c068f 100644
--- a/VisualGDB/guisan/guisan.vcxproj.filters
+++ b/VisualGDB/guisan/guisan.vcxproj.filters
@@ -46,366 +46,366 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp">
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp">
       <Filter>Header files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp">
       <Filter>Header files\guisan\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp">
       <Filter>Header files\guisan\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp">
       <Filter>Header files\guisan\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp">
       <Filter>Header files\guisan\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp">
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp">
       <Filter>Header files\guisan\widgets</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/capsimg b/capsimg
deleted file mode 160000
index 067db4cc..00000000
--- a/capsimg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 067db4cc6bfdcd1ab684b812da6fedbb8f96e04a
diff --git a/external/capsimg b/external/capsimg
new file mode 160000
index 00000000..1713452b
--- /dev/null
+++ b/external/capsimg
@@ -0,0 +1 @@
+Subproject commit 1713452be0c5adf94fcb22bcb083adc5dac45876
diff --git a/guisan-dev/Android.mk b/external/libguisan/Android.mk
similarity index 100%
rename from guisan-dev/Android.mk
rename to external/libguisan/Android.mk
diff --git a/guisan-dev/Makefile b/external/libguisan/Makefile
similarity index 100%
rename from guisan-dev/Makefile
rename to external/libguisan/Makefile
diff --git a/guisan-dev/include/guisan.hpp b/external/libguisan/include/guisan.hpp
similarity index 100%
rename from guisan-dev/include/guisan.hpp
rename to external/libguisan/include/guisan.hpp
diff --git a/guisan-dev/include/guisan/actionevent.hpp b/external/libguisan/include/guisan/actionevent.hpp
similarity index 100%
rename from guisan-dev/include/guisan/actionevent.hpp
rename to external/libguisan/include/guisan/actionevent.hpp
diff --git a/guisan-dev/include/guisan/actionlistener.hpp b/external/libguisan/include/guisan/actionlistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/actionlistener.hpp
rename to external/libguisan/include/guisan/actionlistener.hpp
diff --git a/guisan-dev/include/guisan/basiccontainer.hpp b/external/libguisan/include/guisan/basiccontainer.hpp
similarity index 100%
rename from guisan-dev/include/guisan/basiccontainer.hpp
rename to external/libguisan/include/guisan/basiccontainer.hpp
diff --git a/guisan-dev/include/guisan/cliprectangle.hpp b/external/libguisan/include/guisan/cliprectangle.hpp
similarity index 100%
rename from guisan-dev/include/guisan/cliprectangle.hpp
rename to external/libguisan/include/guisan/cliprectangle.hpp
diff --git a/guisan-dev/include/guisan/color.hpp b/external/libguisan/include/guisan/color.hpp
similarity index 100%
rename from guisan-dev/include/guisan/color.hpp
rename to external/libguisan/include/guisan/color.hpp
diff --git a/guisan-dev/include/guisan/deathlistener.hpp b/external/libguisan/include/guisan/deathlistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/deathlistener.hpp
rename to external/libguisan/include/guisan/deathlistener.hpp
diff --git a/guisan-dev/include/guisan/defaultfont.hpp b/external/libguisan/include/guisan/defaultfont.hpp
similarity index 100%
rename from guisan-dev/include/guisan/defaultfont.hpp
rename to external/libguisan/include/guisan/defaultfont.hpp
diff --git a/guisan-dev/include/guisan/event.hpp b/external/libguisan/include/guisan/event.hpp
similarity index 100%
rename from guisan-dev/include/guisan/event.hpp
rename to external/libguisan/include/guisan/event.hpp
diff --git a/guisan-dev/include/guisan/exception.hpp b/external/libguisan/include/guisan/exception.hpp
similarity index 100%
rename from guisan-dev/include/guisan/exception.hpp
rename to external/libguisan/include/guisan/exception.hpp
diff --git a/guisan-dev/include/guisan/focushandler.hpp b/external/libguisan/include/guisan/focushandler.hpp
similarity index 100%
rename from guisan-dev/include/guisan/focushandler.hpp
rename to external/libguisan/include/guisan/focushandler.hpp
diff --git a/guisan-dev/include/guisan/focuslistener.hpp b/external/libguisan/include/guisan/focuslistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/focuslistener.hpp
rename to external/libguisan/include/guisan/focuslistener.hpp
diff --git a/guisan-dev/include/guisan/font.hpp b/external/libguisan/include/guisan/font.hpp
similarity index 100%
rename from guisan-dev/include/guisan/font.hpp
rename to external/libguisan/include/guisan/font.hpp
diff --git a/guisan-dev/include/guisan/genericinput.hpp b/external/libguisan/include/guisan/genericinput.hpp
similarity index 100%
rename from guisan-dev/include/guisan/genericinput.hpp
rename to external/libguisan/include/guisan/genericinput.hpp
diff --git a/guisan-dev/include/guisan/glut.hpp b/external/libguisan/include/guisan/glut.hpp
similarity index 100%
rename from guisan-dev/include/guisan/glut.hpp
rename to external/libguisan/include/guisan/glut.hpp
diff --git a/guisan-dev/include/guisan/graphics.hpp b/external/libguisan/include/guisan/graphics.hpp
similarity index 100%
rename from guisan-dev/include/guisan/graphics.hpp
rename to external/libguisan/include/guisan/graphics.hpp
diff --git a/guisan-dev/include/guisan/gui.hpp b/external/libguisan/include/guisan/gui.hpp
similarity index 100%
rename from guisan-dev/include/guisan/gui.hpp
rename to external/libguisan/include/guisan/gui.hpp
diff --git a/guisan-dev/include/guisan/image.hpp b/external/libguisan/include/guisan/image.hpp
similarity index 100%
rename from guisan-dev/include/guisan/image.hpp
rename to external/libguisan/include/guisan/image.hpp
diff --git a/guisan-dev/include/guisan/imagefont.hpp b/external/libguisan/include/guisan/imagefont.hpp
similarity index 100%
rename from guisan-dev/include/guisan/imagefont.hpp
rename to external/libguisan/include/guisan/imagefont.hpp
diff --git a/guisan-dev/include/guisan/imageloader.hpp b/external/libguisan/include/guisan/imageloader.hpp
similarity index 100%
rename from guisan-dev/include/guisan/imageloader.hpp
rename to external/libguisan/include/guisan/imageloader.hpp
diff --git a/guisan-dev/include/guisan/input.hpp b/external/libguisan/include/guisan/input.hpp
similarity index 100%
rename from guisan-dev/include/guisan/input.hpp
rename to external/libguisan/include/guisan/input.hpp
diff --git a/guisan-dev/include/guisan/inputevent.hpp b/external/libguisan/include/guisan/inputevent.hpp
similarity index 100%
rename from guisan-dev/include/guisan/inputevent.hpp
rename to external/libguisan/include/guisan/inputevent.hpp
diff --git a/guisan-dev/include/guisan/key.hpp b/external/libguisan/include/guisan/key.hpp
similarity index 100%
rename from guisan-dev/include/guisan/key.hpp
rename to external/libguisan/include/guisan/key.hpp
diff --git a/guisan-dev/include/guisan/keyevent.hpp b/external/libguisan/include/guisan/keyevent.hpp
similarity index 100%
rename from guisan-dev/include/guisan/keyevent.hpp
rename to external/libguisan/include/guisan/keyevent.hpp
diff --git a/guisan-dev/include/guisan/keyinput.hpp b/external/libguisan/include/guisan/keyinput.hpp
similarity index 100%
rename from guisan-dev/include/guisan/keyinput.hpp
rename to external/libguisan/include/guisan/keyinput.hpp
diff --git a/guisan-dev/include/guisan/keylistener.hpp b/external/libguisan/include/guisan/keylistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/keylistener.hpp
rename to external/libguisan/include/guisan/keylistener.hpp
diff --git a/guisan-dev/include/guisan/listmodel.hpp b/external/libguisan/include/guisan/listmodel.hpp
similarity index 100%
rename from guisan-dev/include/guisan/listmodel.hpp
rename to external/libguisan/include/guisan/listmodel.hpp
diff --git a/guisan-dev/include/guisan/mouseevent.hpp b/external/libguisan/include/guisan/mouseevent.hpp
similarity index 100%
rename from guisan-dev/include/guisan/mouseevent.hpp
rename to external/libguisan/include/guisan/mouseevent.hpp
diff --git a/guisan-dev/include/guisan/mouseinput.hpp b/external/libguisan/include/guisan/mouseinput.hpp
similarity index 100%
rename from guisan-dev/include/guisan/mouseinput.hpp
rename to external/libguisan/include/guisan/mouseinput.hpp
diff --git a/guisan-dev/include/guisan/mouselistener.hpp b/external/libguisan/include/guisan/mouselistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/mouselistener.hpp
rename to external/libguisan/include/guisan/mouselistener.hpp
diff --git a/guisan-dev/include/guisan/opengl.hpp b/external/libguisan/include/guisan/opengl.hpp
similarity index 100%
rename from guisan-dev/include/guisan/opengl.hpp
rename to external/libguisan/include/guisan/opengl.hpp
diff --git a/guisan-dev/include/guisan/opengl/openglgraphics.hpp b/external/libguisan/include/guisan/opengl/openglgraphics.hpp
similarity index 100%
rename from guisan-dev/include/guisan/opengl/openglgraphics.hpp
rename to external/libguisan/include/guisan/opengl/openglgraphics.hpp
diff --git a/guisan-dev/include/guisan/opengl/openglimage.hpp b/external/libguisan/include/guisan/opengl/openglimage.hpp
similarity index 100%
rename from guisan-dev/include/guisan/opengl/openglimage.hpp
rename to external/libguisan/include/guisan/opengl/openglimage.hpp
diff --git a/guisan-dev/include/guisan/opengl/openglsdlimageloader.hpp b/external/libguisan/include/guisan/opengl/openglsdlimageloader.hpp
similarity index 100%
rename from guisan-dev/include/guisan/opengl/openglsdlimageloader.hpp
rename to external/libguisan/include/guisan/opengl/openglsdlimageloader.hpp
diff --git a/guisan-dev/include/guisan/platform.hpp b/external/libguisan/include/guisan/platform.hpp
similarity index 100%
rename from guisan-dev/include/guisan/platform.hpp
rename to external/libguisan/include/guisan/platform.hpp
diff --git a/guisan-dev/include/guisan/rectangle.hpp b/external/libguisan/include/guisan/rectangle.hpp
similarity index 100%
rename from guisan-dev/include/guisan/rectangle.hpp
rename to external/libguisan/include/guisan/rectangle.hpp
diff --git a/guisan-dev/include/guisan/sdl.hpp b/external/libguisan/include/guisan/sdl.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl.hpp
rename to external/libguisan/include/guisan/sdl.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdl2graphics.hpp b/external/libguisan/include/guisan/sdl/sdl2graphics.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdl2graphics.hpp
rename to external/libguisan/include/guisan/sdl/sdl2graphics.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdlgraphics.hpp b/external/libguisan/include/guisan/sdl/sdlgraphics.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdlgraphics.hpp
rename to external/libguisan/include/guisan/sdl/sdlgraphics.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdlimage.hpp b/external/libguisan/include/guisan/sdl/sdlimage.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdlimage.hpp
rename to external/libguisan/include/guisan/sdl/sdlimage.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdlimageloader.hpp b/external/libguisan/include/guisan/sdl/sdlimageloader.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdlimageloader.hpp
rename to external/libguisan/include/guisan/sdl/sdlimageloader.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdlinput.hpp b/external/libguisan/include/guisan/sdl/sdlinput.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdlinput.hpp
rename to external/libguisan/include/guisan/sdl/sdlinput.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdlpixel.hpp b/external/libguisan/include/guisan/sdl/sdlpixel.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdlpixel.hpp
rename to external/libguisan/include/guisan/sdl/sdlpixel.hpp
diff --git a/guisan-dev/include/guisan/sdl/sdltruetypefont.hpp b/external/libguisan/include/guisan/sdl/sdltruetypefont.hpp
similarity index 100%
rename from guisan-dev/include/guisan/sdl/sdltruetypefont.hpp
rename to external/libguisan/include/guisan/sdl/sdltruetypefont.hpp
diff --git a/guisan-dev/include/guisan/selectionevent.hpp b/external/libguisan/include/guisan/selectionevent.hpp
similarity index 100%
rename from guisan-dev/include/guisan/selectionevent.hpp
rename to external/libguisan/include/guisan/selectionevent.hpp
diff --git a/guisan-dev/include/guisan/selectionlistener.hpp b/external/libguisan/include/guisan/selectionlistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/selectionlistener.hpp
rename to external/libguisan/include/guisan/selectionlistener.hpp
diff --git a/guisan-dev/include/guisan/widget.hpp b/external/libguisan/include/guisan/widget.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widget.hpp
rename to external/libguisan/include/guisan/widget.hpp
diff --git a/guisan-dev/include/guisan/widgetlistener.hpp b/external/libguisan/include/guisan/widgetlistener.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgetlistener.hpp
rename to external/libguisan/include/guisan/widgetlistener.hpp
diff --git a/guisan-dev/include/guisan/widgets/button.hpp b/external/libguisan/include/guisan/widgets/button.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/button.hpp
rename to external/libguisan/include/guisan/widgets/button.hpp
diff --git a/guisan-dev/include/guisan/widgets/checkbox.hpp b/external/libguisan/include/guisan/widgets/checkbox.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/checkbox.hpp
rename to external/libguisan/include/guisan/widgets/checkbox.hpp
diff --git a/guisan-dev/include/guisan/widgets/container.hpp b/external/libguisan/include/guisan/widgets/container.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/container.hpp
rename to external/libguisan/include/guisan/widgets/container.hpp
diff --git a/guisan-dev/include/guisan/widgets/dropdown.hpp b/external/libguisan/include/guisan/widgets/dropdown.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/dropdown.hpp
rename to external/libguisan/include/guisan/widgets/dropdown.hpp
diff --git a/guisan-dev/include/guisan/widgets/icon.hpp b/external/libguisan/include/guisan/widgets/icon.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/icon.hpp
rename to external/libguisan/include/guisan/widgets/icon.hpp
diff --git a/guisan-dev/include/guisan/widgets/imagebutton.hpp b/external/libguisan/include/guisan/widgets/imagebutton.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/imagebutton.hpp
rename to external/libguisan/include/guisan/widgets/imagebutton.hpp
diff --git a/guisan-dev/include/guisan/widgets/imagetextbutton.hpp b/external/libguisan/include/guisan/widgets/imagetextbutton.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/imagetextbutton.hpp
rename to external/libguisan/include/guisan/widgets/imagetextbutton.hpp
diff --git a/guisan-dev/include/guisan/widgets/inputbox.hpp b/external/libguisan/include/guisan/widgets/inputbox.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/inputbox.hpp
rename to external/libguisan/include/guisan/widgets/inputbox.hpp
diff --git a/guisan-dev/include/guisan/widgets/label.hpp b/external/libguisan/include/guisan/widgets/label.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/label.hpp
rename to external/libguisan/include/guisan/widgets/label.hpp
diff --git a/guisan-dev/include/guisan/widgets/listbox.hpp b/external/libguisan/include/guisan/widgets/listbox.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/listbox.hpp
rename to external/libguisan/include/guisan/widgets/listbox.hpp
diff --git a/guisan-dev/include/guisan/widgets/messagebox.hpp b/external/libguisan/include/guisan/widgets/messagebox.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/messagebox.hpp
rename to external/libguisan/include/guisan/widgets/messagebox.hpp
diff --git a/guisan-dev/include/guisan/widgets/progressbar.hpp b/external/libguisan/include/guisan/widgets/progressbar.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/progressbar.hpp
rename to external/libguisan/include/guisan/widgets/progressbar.hpp
diff --git a/guisan-dev/include/guisan/widgets/radiobutton.hpp b/external/libguisan/include/guisan/widgets/radiobutton.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/radiobutton.hpp
rename to external/libguisan/include/guisan/widgets/radiobutton.hpp
diff --git a/guisan-dev/include/guisan/widgets/scrollarea.hpp b/external/libguisan/include/guisan/widgets/scrollarea.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/scrollarea.hpp
rename to external/libguisan/include/guisan/widgets/scrollarea.hpp
diff --git a/guisan-dev/include/guisan/widgets/slider.hpp b/external/libguisan/include/guisan/widgets/slider.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/slider.hpp
rename to external/libguisan/include/guisan/widgets/slider.hpp
diff --git a/guisan-dev/include/guisan/widgets/tab.hpp b/external/libguisan/include/guisan/widgets/tab.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/tab.hpp
rename to external/libguisan/include/guisan/widgets/tab.hpp
diff --git a/guisan-dev/include/guisan/widgets/tabbedarea.hpp b/external/libguisan/include/guisan/widgets/tabbedarea.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/tabbedarea.hpp
rename to external/libguisan/include/guisan/widgets/tabbedarea.hpp
diff --git a/guisan-dev/include/guisan/widgets/textbox.hpp b/external/libguisan/include/guisan/widgets/textbox.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/textbox.hpp
rename to external/libguisan/include/guisan/widgets/textbox.hpp
diff --git a/guisan-dev/include/guisan/widgets/textfield.hpp b/external/libguisan/include/guisan/widgets/textfield.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/textfield.hpp
rename to external/libguisan/include/guisan/widgets/textfield.hpp
diff --git a/guisan-dev/include/guisan/widgets/window.hpp b/external/libguisan/include/guisan/widgets/window.hpp
similarity index 100%
rename from guisan-dev/include/guisan/widgets/window.hpp
rename to external/libguisan/include/guisan/widgets/window.hpp
diff --git a/guisan-dev/include/guisan/x.hpp b/external/libguisan/include/guisan/x.hpp
similarity index 100%
rename from guisan-dev/include/guisan/x.hpp
rename to external/libguisan/include/guisan/x.hpp
diff --git a/guisan-dev/lib/.keep b/external/libguisan/lib/.keep
similarity index 100%
rename from guisan-dev/lib/.keep
rename to external/libguisan/lib/.keep
diff --git a/guisan-dev/src/actionevent.cpp b/external/libguisan/src/actionevent.cpp
similarity index 100%
rename from guisan-dev/src/actionevent.cpp
rename to external/libguisan/src/actionevent.cpp
diff --git a/guisan-dev/src/basiccontainer.cpp b/external/libguisan/src/basiccontainer.cpp
similarity index 100%
rename from guisan-dev/src/basiccontainer.cpp
rename to external/libguisan/src/basiccontainer.cpp
diff --git a/guisan-dev/src/cliprectangle.cpp b/external/libguisan/src/cliprectangle.cpp
similarity index 100%
rename from guisan-dev/src/cliprectangle.cpp
rename to external/libguisan/src/cliprectangle.cpp
diff --git a/guisan-dev/src/color.cpp b/external/libguisan/src/color.cpp
similarity index 100%
rename from guisan-dev/src/color.cpp
rename to external/libguisan/src/color.cpp
diff --git a/guisan-dev/src/defaultfont.cpp b/external/libguisan/src/defaultfont.cpp
similarity index 100%
rename from guisan-dev/src/defaultfont.cpp
rename to external/libguisan/src/defaultfont.cpp
diff --git a/guisan-dev/src/event.cpp b/external/libguisan/src/event.cpp
similarity index 100%
rename from guisan-dev/src/event.cpp
rename to external/libguisan/src/event.cpp
diff --git a/guisan-dev/src/exception.cpp b/external/libguisan/src/exception.cpp
similarity index 100%
rename from guisan-dev/src/exception.cpp
rename to external/libguisan/src/exception.cpp
diff --git a/guisan-dev/src/focushandler.cpp b/external/libguisan/src/focushandler.cpp
similarity index 100%
rename from guisan-dev/src/focushandler.cpp
rename to external/libguisan/src/focushandler.cpp
diff --git a/guisan-dev/src/font.cpp b/external/libguisan/src/font.cpp
similarity index 100%
rename from guisan-dev/src/font.cpp
rename to external/libguisan/src/font.cpp
diff --git a/guisan-dev/src/genericinput.cpp b/external/libguisan/src/genericinput.cpp
similarity index 100%
rename from guisan-dev/src/genericinput.cpp
rename to external/libguisan/src/genericinput.cpp
diff --git a/guisan-dev/src/graphics.cpp b/external/libguisan/src/graphics.cpp
similarity index 100%
rename from guisan-dev/src/graphics.cpp
rename to external/libguisan/src/graphics.cpp
diff --git a/guisan-dev/src/gui.cpp b/external/libguisan/src/gui.cpp
similarity index 100%
rename from guisan-dev/src/gui.cpp
rename to external/libguisan/src/gui.cpp
diff --git a/guisan-dev/src/guisan.cpp b/external/libguisan/src/guisan.cpp
similarity index 100%
rename from guisan-dev/src/guisan.cpp
rename to external/libguisan/src/guisan.cpp
diff --git a/guisan-dev/src/image.cpp b/external/libguisan/src/image.cpp
similarity index 100%
rename from guisan-dev/src/image.cpp
rename to external/libguisan/src/image.cpp
diff --git a/guisan-dev/src/imagefont.cpp b/external/libguisan/src/imagefont.cpp
similarity index 100%
rename from guisan-dev/src/imagefont.cpp
rename to external/libguisan/src/imagefont.cpp
diff --git a/guisan-dev/src/inputevent.cpp b/external/libguisan/src/inputevent.cpp
similarity index 100%
rename from guisan-dev/src/inputevent.cpp
rename to external/libguisan/src/inputevent.cpp
diff --git a/guisan-dev/src/key.cpp b/external/libguisan/src/key.cpp
similarity index 100%
rename from guisan-dev/src/key.cpp
rename to external/libguisan/src/key.cpp
diff --git a/guisan-dev/src/keyevent.cpp b/external/libguisan/src/keyevent.cpp
similarity index 100%
rename from guisan-dev/src/keyevent.cpp
rename to external/libguisan/src/keyevent.cpp
diff --git a/guisan-dev/src/keyinput.cpp b/external/libguisan/src/keyinput.cpp
similarity index 100%
rename from guisan-dev/src/keyinput.cpp
rename to external/libguisan/src/keyinput.cpp
diff --git a/guisan-dev/src/mouseevent.cpp b/external/libguisan/src/mouseevent.cpp
similarity index 100%
rename from guisan-dev/src/mouseevent.cpp
rename to external/libguisan/src/mouseevent.cpp
diff --git a/guisan-dev/src/mouseinput.cpp b/external/libguisan/src/mouseinput.cpp
similarity index 100%
rename from guisan-dev/src/mouseinput.cpp
rename to external/libguisan/src/mouseinput.cpp
diff --git a/guisan-dev/src/opengl/opengl.cpp b/external/libguisan/src/opengl/opengl.cpp
similarity index 100%
rename from guisan-dev/src/opengl/opengl.cpp
rename to external/libguisan/src/opengl/opengl.cpp
diff --git a/guisan-dev/src/opengl/openglgraphics.cpp b/external/libguisan/src/opengl/openglgraphics.cpp
similarity index 100%
rename from guisan-dev/src/opengl/openglgraphics.cpp
rename to external/libguisan/src/opengl/openglgraphics.cpp
diff --git a/guisan-dev/src/opengl/openglimage.cpp b/external/libguisan/src/opengl/openglimage.cpp
similarity index 100%
rename from guisan-dev/src/opengl/openglimage.cpp
rename to external/libguisan/src/opengl/openglimage.cpp
diff --git a/guisan-dev/src/rectangle.cpp b/external/libguisan/src/rectangle.cpp
similarity index 100%
rename from guisan-dev/src/rectangle.cpp
rename to external/libguisan/src/rectangle.cpp
diff --git a/guisan-dev/src/sdl/sdl.cpp b/external/libguisan/src/sdl/sdl.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdl.cpp
rename to external/libguisan/src/sdl/sdl.cpp
diff --git a/guisan-dev/src/sdl/sdl2graphics.cpp b/external/libguisan/src/sdl/sdl2graphics.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdl2graphics.cpp
rename to external/libguisan/src/sdl/sdl2graphics.cpp
diff --git a/guisan-dev/src/sdl/sdlgraphics.cpp b/external/libguisan/src/sdl/sdlgraphics.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdlgraphics.cpp
rename to external/libguisan/src/sdl/sdlgraphics.cpp
diff --git a/guisan-dev/src/sdl/sdlimage.cpp b/external/libguisan/src/sdl/sdlimage.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdlimage.cpp
rename to external/libguisan/src/sdl/sdlimage.cpp
diff --git a/guisan-dev/src/sdl/sdlimageloader.cpp b/external/libguisan/src/sdl/sdlimageloader.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdlimageloader.cpp
rename to external/libguisan/src/sdl/sdlimageloader.cpp
diff --git a/guisan-dev/src/sdl/sdlinput.cpp b/external/libguisan/src/sdl/sdlinput.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdlinput.cpp
rename to external/libguisan/src/sdl/sdlinput.cpp
diff --git a/guisan-dev/src/sdl/sdltruetypefont.cpp b/external/libguisan/src/sdl/sdltruetypefont.cpp
similarity index 100%
rename from guisan-dev/src/sdl/sdltruetypefont.cpp
rename to external/libguisan/src/sdl/sdltruetypefont.cpp
diff --git a/guisan-dev/src/selectionevent.cpp b/external/libguisan/src/selectionevent.cpp
similarity index 100%
rename from guisan-dev/src/selectionevent.cpp
rename to external/libguisan/src/selectionevent.cpp
diff --git a/guisan-dev/src/widget.cpp b/external/libguisan/src/widget.cpp
similarity index 100%
rename from guisan-dev/src/widget.cpp
rename to external/libguisan/src/widget.cpp
diff --git a/guisan-dev/src/widgets/button.cpp b/external/libguisan/src/widgets/button.cpp
similarity index 100%
rename from guisan-dev/src/widgets/button.cpp
rename to external/libguisan/src/widgets/button.cpp
diff --git a/guisan-dev/src/widgets/checkbox.cpp b/external/libguisan/src/widgets/checkbox.cpp
similarity index 100%
rename from guisan-dev/src/widgets/checkbox.cpp
rename to external/libguisan/src/widgets/checkbox.cpp
diff --git a/guisan-dev/src/widgets/container.cpp b/external/libguisan/src/widgets/container.cpp
similarity index 100%
rename from guisan-dev/src/widgets/container.cpp
rename to external/libguisan/src/widgets/container.cpp
diff --git a/guisan-dev/src/widgets/dropdown.cpp b/external/libguisan/src/widgets/dropdown.cpp
similarity index 100%
rename from guisan-dev/src/widgets/dropdown.cpp
rename to external/libguisan/src/widgets/dropdown.cpp
diff --git a/guisan-dev/src/widgets/icon.cpp b/external/libguisan/src/widgets/icon.cpp
similarity index 100%
rename from guisan-dev/src/widgets/icon.cpp
rename to external/libguisan/src/widgets/icon.cpp
diff --git a/guisan-dev/src/widgets/imagebutton.cpp b/external/libguisan/src/widgets/imagebutton.cpp
similarity index 100%
rename from guisan-dev/src/widgets/imagebutton.cpp
rename to external/libguisan/src/widgets/imagebutton.cpp
diff --git a/guisan-dev/src/widgets/imagetextbutton.cpp b/external/libguisan/src/widgets/imagetextbutton.cpp
similarity index 100%
rename from guisan-dev/src/widgets/imagetextbutton.cpp
rename to external/libguisan/src/widgets/imagetextbutton.cpp
diff --git a/guisan-dev/src/widgets/inputbox.cpp b/external/libguisan/src/widgets/inputbox.cpp
similarity index 100%
rename from guisan-dev/src/widgets/inputbox.cpp
rename to external/libguisan/src/widgets/inputbox.cpp
diff --git a/guisan-dev/src/widgets/label.cpp b/external/libguisan/src/widgets/label.cpp
similarity index 100%
rename from guisan-dev/src/widgets/label.cpp
rename to external/libguisan/src/widgets/label.cpp
diff --git a/guisan-dev/src/widgets/listbox.cpp b/external/libguisan/src/widgets/listbox.cpp
similarity index 100%
rename from guisan-dev/src/widgets/listbox.cpp
rename to external/libguisan/src/widgets/listbox.cpp
diff --git a/guisan-dev/src/widgets/messagebox.cpp b/external/libguisan/src/widgets/messagebox.cpp
similarity index 100%
rename from guisan-dev/src/widgets/messagebox.cpp
rename to external/libguisan/src/widgets/messagebox.cpp
diff --git a/guisan-dev/src/widgets/progressbar.cpp b/external/libguisan/src/widgets/progressbar.cpp
similarity index 100%
rename from guisan-dev/src/widgets/progressbar.cpp
rename to external/libguisan/src/widgets/progressbar.cpp
diff --git a/guisan-dev/src/widgets/radiobutton.cpp b/external/libguisan/src/widgets/radiobutton.cpp
similarity index 100%
rename from guisan-dev/src/widgets/radiobutton.cpp
rename to external/libguisan/src/widgets/radiobutton.cpp
diff --git a/guisan-dev/src/widgets/scrollarea.cpp b/external/libguisan/src/widgets/scrollarea.cpp
similarity index 100%
rename from guisan-dev/src/widgets/scrollarea.cpp
rename to external/libguisan/src/widgets/scrollarea.cpp
diff --git a/guisan-dev/src/widgets/slider.cpp b/external/libguisan/src/widgets/slider.cpp
similarity index 100%
rename from guisan-dev/src/widgets/slider.cpp
rename to external/libguisan/src/widgets/slider.cpp
diff --git a/guisan-dev/src/widgets/tab.cpp b/external/libguisan/src/widgets/tab.cpp
similarity index 100%
rename from guisan-dev/src/widgets/tab.cpp
rename to external/libguisan/src/widgets/tab.cpp
diff --git a/guisan-dev/src/widgets/tabbedarea.cpp b/external/libguisan/src/widgets/tabbedarea.cpp
similarity index 100%
rename from guisan-dev/src/widgets/tabbedarea.cpp
rename to external/libguisan/src/widgets/tabbedarea.cpp
diff --git a/guisan-dev/src/widgets/textbox.cpp b/external/libguisan/src/widgets/textbox.cpp
similarity index 100%
rename from guisan-dev/src/widgets/textbox.cpp
rename to external/libguisan/src/widgets/textbox.cpp
diff --git a/guisan-dev/src/widgets/textfield.cpp b/external/libguisan/src/widgets/textfield.cpp
similarity index 100%
rename from guisan-dev/src/widgets/textfield.cpp
rename to external/libguisan/src/widgets/textfield.cpp
diff --git a/guisan-dev/src/widgets/window.cpp b/external/libguisan/src/widgets/window.cpp
similarity index 100%
rename from guisan-dev/src/widgets/window.cpp
rename to external/libguisan/src/widgets/window.cpp
diff --git a/external/libmpeg2 b/external/libmpeg2
new file mode 160000
index 00000000..6891249c
--- /dev/null
+++ b/external/libmpeg2
@@ -0,0 +1 @@
+Subproject commit 6891249c9ca2237b08665380b169d78f96878a51
diff --git a/external/libxml2 b/external/libxml2
new file mode 160000
index 00000000..8728e957
--- /dev/null
+++ b/external/libxml2
@@ -0,0 +1 @@
+Subproject commit 8728e95771fcaacc67163c8aa1355d774d594fd6