diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..e8685bb9
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,41 @@
+cmake_minimum_required(VERSION 3.0.2)
+project(SqMod)
+
+# Several plugin options
+option(BUILTIN_RUNTIMES "Include the MinGW runtime into the binary itself." ON)
+option(FORCE_32BIT_BIN "Create a 32-bit executable binary if the compiler defaults to 64-bit." OFF)
+
+# Default to c++14 standard
+if(CMAKE_VERSION VERSION_LESS "3.1")
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+	endif()
+else()
+	# Apparently the above does not work with cmake from on debian 8
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	# Try the standard method as well
+	set(CMAKE_CXX_STANDARD 14)
+	set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
+# Default to release mode
+set(CMAKE_BUILD_TYPE "Release")
+
+# Include mingw runntime into the binary
+if (GCC OR MINGW)
+	if(BUILTIN_RUNTIMES)
+		set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+	endif()
+endif()
+
+# Enable position independent code
+if (UNIX)
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+# Include Squirrel library
+add_subdirectory(squirrel)
+# Include Squat library
+add_subdirectory(sqrat)
+# Global include directories
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/external/B64/CMakeLists.txt b/external/B64/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/Common/CMakeLists.txt b/external/Common/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/Hash/CMakeLists.txt b/external/Hash/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/Jansson/CMakeLists.txt b/external/Jansson/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/LibIRC/CMakeLists.txt b/external/LibIRC/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/MaxmindDB/CMakeLists.txt b/external/MaxmindDB/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/PUGIXML/CMakeLists.txt b/external/PUGIXML/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/SQLite/CMakeLists.txt b/external/SQLite/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/external/SimpleINI/CMakeLists.txt b/external/SimpleINI/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
new file mode 100644
index 00000000..e2d8e9d5
--- /dev/null
+++ b/source/CMakeLists.txt
@@ -0,0 +1,95 @@
+# 
+add_library(SquirrelModule MODULE
+	SqBase.hpp
+	Main.cpp
+	Register.cpp
+	Core.cpp Core.hpp
+	Logger.cpp Logger.hpp
+	Base/AABB.cpp Base/AABB.hpp
+	Base/Algo.cpp Base/Algo.hpp
+	Base/Circle.cpp Base/Circle.hpp
+	Base/Color3.cpp Base/Color3.hpp
+	Base/Color4.cpp Base/Color4.hpp
+	Base/Quaternion.cpp Base/Quaternion.hpp
+	Base/ScriptSrc.cpp Base/ScriptSrc.hpp
+	Base/Shared.cpp Base/Shared.hpp
+	Base/Sphere.cpp Base/Sphere.hpp
+	Base/Vector2.cpp Base/Vector2.hpp
+	Base/Vector2i.cpp Base/Vector2i.hpp
+	Base/Vector3.cpp Base/Vector3.hpp
+	Base/Vector4.cpp Base/Vector4.hpp
+	Entity/Blip.cpp Entity/Blip.hpp
+	Entity/Checkpoint.cpp Entity/Checkpoint.hpp
+	Entity/Keybind.cpp Entity/Keybind.hpp
+	Entity/Object.cpp Entity/Object.hpp
+	Entity/Pickup.cpp Entity/Pickup.hpp
+	Entity/Player.cpp Entity/Player.hpp
+	Entity/Vehicle.cpp Entity/Vehicle.hpp
+	Library/Chrono.cpp Library/Chrono.hpp
+	Library/Chrono/Date.cpp Library/Chrono/Date.hpp
+	Library/Chrono/Datetime.cpp Library/Chrono/Datetime.hpp
+	Library/Chrono/Time.cpp Library/Chrono/Time.hpp
+	Library/Chrono/Timer.cpp Library/Chrono/Timer.hpp
+	Library/Chrono/Timestamp.cpp Library/Chrono/Timestamp.hpp
+	Library/Crypt.cpp Library/Crypt.hpp
+	Library/Crypt/AES.cpp Library/Crypt/AES.hpp
+	Library/Crypt/Hash.cpp Library/Crypt/Hash.hpp
+	Library/IO.cpp Library/IO.hpp
+	Library/IO/File.cpp Library/IO/File.hpp
+	Library/IO/INI.cpp Library/IO/INI.hpp
+	Library/Numeric.cpp Library/Numeric.hpp
+	Library/Numeric/LongInt.cpp Library/Numeric/LongInt.hpp
+	Library/Numeric/Math.cpp Library/Numeric/Math.hpp
+	Library/Numeric/Random.cpp Library/Numeric/Random.hpp
+	Library/String.cpp Library/String.hpp
+	Library/System.cpp Library/System.hpp
+	Library/System/Dir.cpp Library/System/Dir.hpp
+	Library/System/Environment.cpp Library/System/Environment.hpp
+	Library/System/Path.cpp Library/System/Path.hpp
+	Library/Utils.cpp Library/Utils.hpp
+	Library/Utils/Buffer.cpp Library/Utils/Buffer.hpp
+	Misc/Broadcast.cpp
+	Misc/Constants.cpp
+	Misc/Exports.cpp
+	Misc/Register.cpp
+	Misc/Areas.cpp Misc/Areas.hpp
+	Misc/Command.cpp Misc/Command.hpp
+	Misc/Functions.cpp Misc/Functions.hpp
+	Misc/Model.cpp Misc/Model.hpp
+	Misc/Player.cpp Misc/Player.hpp
+	Misc/Routine.cpp Misc/Routine.hpp
+	Misc/Signal.cpp Misc/Signal.hpp
+	Misc/Tasks.cpp Misc/Tasks.hpp
+	Misc/Vehicle.cpp Misc/Vehicle.hpp
+	Misc/Weapon.cpp Misc/Weapon.hpp
+)
+#
+if(FORCE_32BIT_BIN)
+	set_target_properties(SquirrelModule PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	target_compile_definitions(SquirrelModule PRIVATE _SQ64)
+endif()
+
+set_target_properties(SquirrelModule PROPERTIES PREFIX "")
+
+if(WIN32)
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT FORCE_32BIT_BIN)
+		set_target_properties(SquirrelModule PROPERTIES OUTPUT_NAME "mod_squirrel_64")
+	else()
+		set_target_properties(SquirrelModule PROPERTIES OUTPUT_NAME "mod_squirrel_32")
+	endif()
+else()
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT FORCE_32BIT_BIN)
+		set_target_properties(SquirrelModule PROPERTIES OUTPUT_NAME "mod_squirrel_64")
+	else()
+		set_target_properties(SquirrelModule PROPERTIES OUTPUT_NAME "mod_squirrel_32")
+	endif()
+endif(32)
+
+target_include_directories(SquirrelModule PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+
+if(WIN32)
+  target_link_libraries(SquirrelModule wsock32 ws2_32)
+endif()
diff --git a/sqrat/CMakeLists.txt b/sqrat/CMakeLists.txt
new file mode 100644
index 00000000..9a143728
--- /dev/null
+++ b/sqrat/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Create the Sqrat library
+add_library(Sqrat INTERFACE)
+# Set library compiler options
+target_compile_definitions(Sqrat INTERFACE SCRAT_USE_EXCEPTIONS=1 SCRAT_USE_CXX11_OPTIMIZATIONS=1)
+# Set specific compiler options
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	#target_compile_options(Sqrat PRIVATE -w
+	#)
+endif()
+# Configure macro options
+target_compile_definitions(Sqrat INTERFACE GARBAGE_COLLECTOR=1)
+# Library includes
+target_include_directories(Sqrat INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(Sqrat INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
+# Link to required libraries
+target_link_libraries(Sqrat INTERFACE Squirrel)
+# Add it's sources
+target_sources(Sqrat INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/sqrat.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratAllocator.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratArray.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratClass.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratConst.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratFunction.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratGlobalMethods.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratMemberMethods.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratObject.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratOverloadMethods.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratScript.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratTable.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratTypes.h
+	${CMAKE_CURRENT_SOURCE_DIR}/sqrat/sqratUtil.h
+)
diff --git a/external/Sqrat/License.txt b/sqrat/License.txt
similarity index 100%
rename from external/Sqrat/License.txt
rename to sqrat/License.txt
diff --git a/include/sqrat.h b/sqrat/sqrat.h
similarity index 100%
rename from include/sqrat.h
rename to sqrat/sqrat.h
diff --git a/include/sqrat/sqratAllocator.h b/sqrat/sqrat/sqratAllocator.h
similarity index 100%
rename from include/sqrat/sqratAllocator.h
rename to sqrat/sqrat/sqratAllocator.h
diff --git a/include/sqrat/sqratArray.h b/sqrat/sqrat/sqratArray.h
similarity index 100%
rename from include/sqrat/sqratArray.h
rename to sqrat/sqrat/sqratArray.h
diff --git a/include/sqrat/sqratClass.h b/sqrat/sqrat/sqratClass.h
similarity index 100%
rename from include/sqrat/sqratClass.h
rename to sqrat/sqrat/sqratClass.h
diff --git a/include/sqrat/sqratClassType.h b/sqrat/sqrat/sqratClassType.h
similarity index 100%
rename from include/sqrat/sqratClassType.h
rename to sqrat/sqrat/sqratClassType.h
diff --git a/include/sqrat/sqratConst.h b/sqrat/sqrat/sqratConst.h
similarity index 100%
rename from include/sqrat/sqratConst.h
rename to sqrat/sqrat/sqratConst.h
diff --git a/include/sqrat/sqratFunction.h b/sqrat/sqrat/sqratFunction.h
similarity index 100%
rename from include/sqrat/sqratFunction.h
rename to sqrat/sqrat/sqratFunction.h
diff --git a/include/sqrat/sqratGlobalMethods.h b/sqrat/sqrat/sqratGlobalMethods.h
similarity index 100%
rename from include/sqrat/sqratGlobalMethods.h
rename to sqrat/sqrat/sqratGlobalMethods.h
diff --git a/include/sqrat/sqratMemberMethods.h b/sqrat/sqrat/sqratMemberMethods.h
similarity index 100%
rename from include/sqrat/sqratMemberMethods.h
rename to sqrat/sqrat/sqratMemberMethods.h
diff --git a/include/sqrat/sqratObject.h b/sqrat/sqrat/sqratObject.h
similarity index 100%
rename from include/sqrat/sqratObject.h
rename to sqrat/sqrat/sqratObject.h
diff --git a/include/sqrat/sqratOverloadMethods.h b/sqrat/sqrat/sqratOverloadMethods.h
similarity index 100%
rename from include/sqrat/sqratOverloadMethods.h
rename to sqrat/sqrat/sqratOverloadMethods.h
diff --git a/include/sqrat/sqratScript.h b/sqrat/sqrat/sqratScript.h
similarity index 100%
rename from include/sqrat/sqratScript.h
rename to sqrat/sqrat/sqratScript.h
diff --git a/include/sqrat/sqratTable.h b/sqrat/sqrat/sqratTable.h
similarity index 100%
rename from include/sqrat/sqratTable.h
rename to sqrat/sqrat/sqratTable.h
diff --git a/include/sqrat/sqratTypes.h b/sqrat/sqrat/sqratTypes.h
similarity index 100%
rename from include/sqrat/sqratTypes.h
rename to sqrat/sqrat/sqratTypes.h
diff --git a/include/sqrat/sqratUtil.h b/sqrat/sqrat/sqratUtil.h
similarity index 100%
rename from include/sqrat/sqratUtil.h
rename to sqrat/sqrat/sqratUtil.h
diff --git a/squirrel/CMakeLists.txt b/squirrel/CMakeLists.txt
new file mode 100644
index 00000000..3a438ec7
--- /dev/null
+++ b/squirrel/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Create the Squirrel library
+add_library(Squirrel STATIC
+	include/sqconfig.h
+	include/sqstdaux.h
+	include/sqstdblob.h
+	include/sqstdmath.h
+	include/sqstdstring.h
+	include/sqstdsystem.h
+	include/squirrel.h
+	include/squirrelex.h
+	sqapi.cpp
+	sqapiex.cpp
+	sqarray.h
+	sqbaselib.cpp
+	sqclass.cpp sqclass.h
+	sqclosure.h
+	sqcompiler.cpp sqcompiler.h
+	sqdebug.cpp
+	sqfuncproto.h
+	sqfuncstate.cpp sqfuncstate.h
+	sqlexer.cpp sqlexer.h
+	sqmem.cpp
+	sqobject.cpp sqobject.h
+	sqopcodes.h
+	sqpcheader.h
+	sqstate.cpp sqstate.h
+	sqstring.h
+	sqtable.cpp sqtable.h
+	squserdata.h
+	squtils.h
+	sqvm.cpp sqvm.h
+	stdlib/sqstdaux.cpp
+	stdlib/sqstdblob.cpp
+	stdlib/sqstdblobimpl.h
+	stdlib/sqstdio.cpp
+	stdlib/sqstdmath.cpp
+	stdlib/sqstdrex.cpp
+	stdlib/sqstdstream.cpp
+	stdlib/sqstdstream.h
+	stdlib/sqstdstring.cpp
+	stdlib/sqstdsystem.cpp
+)
+# Make sure Squirrel knows this is 64 bit
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    target_compile_definitions(Squirrel PUBLIC _SQ64)
+endif()
+# Set speciffic compiler options
+if (GCC OR MINGW)
+	target_compile_options(Squirrel PRIVATE -w
+		-fno-exceptions
+		-fno-rtti
+		-fno-strict-aliasing
+		-Wno-format
+		-Wno-unused-variable
+		-Wno-unused-but-set-variable
+	)
+endif()
+# Configure macro options
+target_compile_definitions(Squirrel PRIVATE GARBAGE_COLLECTOR=1)
+# Library includes
+target_include_directories(Squirrel PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(Squirrel PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(Squirrel PRIVATE ${CMAKE_CURRENT_LIST_DIR}/stdlib)
diff --git a/external/Squirrel/COPYRIGHT b/squirrel/COPYRIGHT
similarity index 100%
rename from external/Squirrel/COPYRIGHT
rename to squirrel/COPYRIGHT
diff --git a/config/common/sqconfig.h b/squirrel/include/sqconfig.h
similarity index 100%
rename from config/common/sqconfig.h
rename to squirrel/include/sqconfig.h
diff --git a/include/sqstdaux.h b/squirrel/include/sqstdaux.h
similarity index 100%
rename from include/sqstdaux.h
rename to squirrel/include/sqstdaux.h
diff --git a/include/sqstdblob.h b/squirrel/include/sqstdblob.h
similarity index 100%
rename from include/sqstdblob.h
rename to squirrel/include/sqstdblob.h
diff --git a/include/sqstdio.h b/squirrel/include/sqstdio.h
similarity index 100%
rename from include/sqstdio.h
rename to squirrel/include/sqstdio.h
diff --git a/include/sqstdmath.h b/squirrel/include/sqstdmath.h
similarity index 100%
rename from include/sqstdmath.h
rename to squirrel/include/sqstdmath.h
diff --git a/include/sqstdstring.h b/squirrel/include/sqstdstring.h
similarity index 100%
rename from include/sqstdstring.h
rename to squirrel/include/sqstdstring.h
diff --git a/include/sqstdsystem.h b/squirrel/include/sqstdsystem.h
similarity index 100%
rename from include/sqstdsystem.h
rename to squirrel/include/sqstdsystem.h
diff --git a/include/squirrel.h b/squirrel/include/squirrel.h
similarity index 100%
rename from include/squirrel.h
rename to squirrel/include/squirrel.h
diff --git a/include/squirrelex.h b/squirrel/include/squirrelex.h
similarity index 100%
rename from include/squirrelex.h
rename to squirrel/include/squirrelex.h
diff --git a/external/Squirrel/sqapi.cpp b/squirrel/sqapi.cpp
similarity index 100%
rename from external/Squirrel/sqapi.cpp
rename to squirrel/sqapi.cpp
diff --git a/external/Squirrel/sqapiex.cpp b/squirrel/sqapiex.cpp
similarity index 100%
rename from external/Squirrel/sqapiex.cpp
rename to squirrel/sqapiex.cpp
diff --git a/external/Squirrel/sqarray.h b/squirrel/sqarray.h
similarity index 100%
rename from external/Squirrel/sqarray.h
rename to squirrel/sqarray.h
diff --git a/external/Squirrel/sqbaselib.cpp b/squirrel/sqbaselib.cpp
similarity index 100%
rename from external/Squirrel/sqbaselib.cpp
rename to squirrel/sqbaselib.cpp
diff --git a/external/Squirrel/sqclass.cpp b/squirrel/sqclass.cpp
similarity index 100%
rename from external/Squirrel/sqclass.cpp
rename to squirrel/sqclass.cpp
diff --git a/external/Squirrel/sqclass.h b/squirrel/sqclass.h
similarity index 100%
rename from external/Squirrel/sqclass.h
rename to squirrel/sqclass.h
diff --git a/external/Squirrel/sqclosure.h b/squirrel/sqclosure.h
similarity index 100%
rename from external/Squirrel/sqclosure.h
rename to squirrel/sqclosure.h
diff --git a/external/Squirrel/sqcompiler.cpp b/squirrel/sqcompiler.cpp
similarity index 100%
rename from external/Squirrel/sqcompiler.cpp
rename to squirrel/sqcompiler.cpp
diff --git a/external/Squirrel/sqcompiler.h b/squirrel/sqcompiler.h
similarity index 100%
rename from external/Squirrel/sqcompiler.h
rename to squirrel/sqcompiler.h
diff --git a/external/Squirrel/sqdebug.cpp b/squirrel/sqdebug.cpp
similarity index 100%
rename from external/Squirrel/sqdebug.cpp
rename to squirrel/sqdebug.cpp
diff --git a/external/Squirrel/sqfuncproto.h b/squirrel/sqfuncproto.h
similarity index 100%
rename from external/Squirrel/sqfuncproto.h
rename to squirrel/sqfuncproto.h
diff --git a/external/Squirrel/sqfuncstate.cpp b/squirrel/sqfuncstate.cpp
similarity index 100%
rename from external/Squirrel/sqfuncstate.cpp
rename to squirrel/sqfuncstate.cpp
diff --git a/external/Squirrel/sqfuncstate.h b/squirrel/sqfuncstate.h
similarity index 100%
rename from external/Squirrel/sqfuncstate.h
rename to squirrel/sqfuncstate.h
diff --git a/external/Squirrel/sqlexer.cpp b/squirrel/sqlexer.cpp
similarity index 100%
rename from external/Squirrel/sqlexer.cpp
rename to squirrel/sqlexer.cpp
diff --git a/external/Squirrel/sqlexer.h b/squirrel/sqlexer.h
similarity index 100%
rename from external/Squirrel/sqlexer.h
rename to squirrel/sqlexer.h
diff --git a/external/Squirrel/sqmem.cpp b/squirrel/sqmem.cpp
similarity index 100%
rename from external/Squirrel/sqmem.cpp
rename to squirrel/sqmem.cpp
diff --git a/external/Squirrel/sqobject.cpp b/squirrel/sqobject.cpp
similarity index 100%
rename from external/Squirrel/sqobject.cpp
rename to squirrel/sqobject.cpp
diff --git a/external/Squirrel/sqobject.h b/squirrel/sqobject.h
similarity index 100%
rename from external/Squirrel/sqobject.h
rename to squirrel/sqobject.h
diff --git a/external/Squirrel/sqopcodes.h b/squirrel/sqopcodes.h
similarity index 100%
rename from external/Squirrel/sqopcodes.h
rename to squirrel/sqopcodes.h
diff --git a/external/Squirrel/sqpcheader.h b/squirrel/sqpcheader.h
similarity index 100%
rename from external/Squirrel/sqpcheader.h
rename to squirrel/sqpcheader.h
diff --git a/external/Squirrel/sqstate.cpp b/squirrel/sqstate.cpp
similarity index 100%
rename from external/Squirrel/sqstate.cpp
rename to squirrel/sqstate.cpp
diff --git a/external/Squirrel/sqstate.h b/squirrel/sqstate.h
similarity index 100%
rename from external/Squirrel/sqstate.h
rename to squirrel/sqstate.h
diff --git a/external/Squirrel/sqstring.h b/squirrel/sqstring.h
similarity index 100%
rename from external/Squirrel/sqstring.h
rename to squirrel/sqstring.h
diff --git a/external/Squirrel/sqtable.cpp b/squirrel/sqtable.cpp
similarity index 100%
rename from external/Squirrel/sqtable.cpp
rename to squirrel/sqtable.cpp
diff --git a/external/Squirrel/sqtable.h b/squirrel/sqtable.h
similarity index 100%
rename from external/Squirrel/sqtable.h
rename to squirrel/sqtable.h
diff --git a/external/Squirrel/squserdata.h b/squirrel/squserdata.h
similarity index 100%
rename from external/Squirrel/squserdata.h
rename to squirrel/squserdata.h
diff --git a/external/Squirrel/squtils.h b/squirrel/squtils.h
similarity index 100%
rename from external/Squirrel/squtils.h
rename to squirrel/squtils.h
diff --git a/external/Squirrel/sqvm.cpp b/squirrel/sqvm.cpp
similarity index 100%
rename from external/Squirrel/sqvm.cpp
rename to squirrel/sqvm.cpp
diff --git a/external/Squirrel/sqvm.h b/squirrel/sqvm.h
similarity index 100%
rename from external/Squirrel/sqvm.h
rename to squirrel/sqvm.h
diff --git a/external/Squirrel/Lib/sqstdaux.cpp b/squirrel/stdlib/sqstdaux.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdaux.cpp
rename to squirrel/stdlib/sqstdaux.cpp
diff --git a/external/Squirrel/Lib/sqstdblob.cpp b/squirrel/stdlib/sqstdblob.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdblob.cpp
rename to squirrel/stdlib/sqstdblob.cpp
diff --git a/external/Squirrel/Lib/sqstdblobimpl.h b/squirrel/stdlib/sqstdblobimpl.h
similarity index 100%
rename from external/Squirrel/Lib/sqstdblobimpl.h
rename to squirrel/stdlib/sqstdblobimpl.h
diff --git a/external/Squirrel/Lib/sqstdio.cpp b/squirrel/stdlib/sqstdio.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdio.cpp
rename to squirrel/stdlib/sqstdio.cpp
diff --git a/external/Squirrel/Lib/sqstdmath.cpp b/squirrel/stdlib/sqstdmath.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdmath.cpp
rename to squirrel/stdlib/sqstdmath.cpp
diff --git a/external/Squirrel/Lib/sqstdrex.cpp b/squirrel/stdlib/sqstdrex.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdrex.cpp
rename to squirrel/stdlib/sqstdrex.cpp
diff --git a/external/Squirrel/Lib/sqstdstream.cpp b/squirrel/stdlib/sqstdstream.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdstream.cpp
rename to squirrel/stdlib/sqstdstream.cpp
diff --git a/external/Squirrel/Lib/sqstdstream.h b/squirrel/stdlib/sqstdstream.h
similarity index 100%
rename from external/Squirrel/Lib/sqstdstream.h
rename to squirrel/stdlib/sqstdstream.h
diff --git a/external/Squirrel/Lib/sqstdstring.cpp b/squirrel/stdlib/sqstdstring.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdstring.cpp
rename to squirrel/stdlib/sqstdstring.cpp
diff --git a/external/Squirrel/Lib/sqstdsystem.cpp b/squirrel/stdlib/sqstdsystem.cpp
similarity index 100%
rename from external/Squirrel/Lib/sqstdsystem.cpp
rename to squirrel/stdlib/sqstdsystem.cpp