diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ee65a1..b3de4b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,9 +55,9 @@ include_directories (${OPENSSL_INCLUDE_DIR})
 
 if (USE_INTERNAL_TINYXML)
   message("-- Using local TinyXML2 copy")
-  add_subdirectory(tinyxml2-3.0.0)
-  include_directories(${CMAKE_SOURCE_DIR}/tinyxml2-3.0.0)
-  link_directories(${CMAKE_BINARY_DIR}/tinyxml2-3.0.0)
+  add_subdirectory(internal/tinyxml2-3.0.0)
+  include_directories(${CMAKE_SOURCE_DIR}/internal/tinyxml2-3.0.0)
+  link_directories(${CMAKE_BINARY_DIR}/internal/tinyxml2-3.0.0)
   set(TINYXML_LIBRARIES tinyxml2)
 else ()
   find_package (TinyXML REQUIRED)
diff --git a/tinyxml2-3.0.0/.gitignore b/internal/tinyxml2-3.0.0/.gitignore
similarity index 100%
rename from tinyxml2-3.0.0/.gitignore
rename to internal/tinyxml2-3.0.0/.gitignore
diff --git a/tinyxml2-3.0.0/CMakeLists.txt b/internal/tinyxml2-3.0.0/CMakeLists.txt
similarity index 100%
rename from tinyxml2-3.0.0/CMakeLists.txt
rename to internal/tinyxml2-3.0.0/CMakeLists.txt
diff --git a/tinyxml2-3.0.0/Makefile b/internal/tinyxml2-3.0.0/Makefile
similarity index 100%
rename from tinyxml2-3.0.0/Makefile
rename to internal/tinyxml2-3.0.0/Makefile
diff --git a/tinyxml2-3.0.0/contrib/html5-printer.cpp b/internal/tinyxml2-3.0.0/contrib/html5-printer.cpp
similarity index 100%
rename from tinyxml2-3.0.0/contrib/html5-printer.cpp
rename to internal/tinyxml2-3.0.0/contrib/html5-printer.cpp
diff --git a/tinyxml2-3.0.0/readme.md b/internal/tinyxml2-3.0.0/readme.md
similarity index 100%
rename from tinyxml2-3.0.0/readme.md
rename to internal/tinyxml2-3.0.0/readme.md
diff --git a/tinyxml2-3.0.0/resources/dream.xml b/internal/tinyxml2-3.0.0/resources/dream.xml
similarity index 100%
rename from tinyxml2-3.0.0/resources/dream.xml
rename to internal/tinyxml2-3.0.0/resources/dream.xml
diff --git a/tinyxml2-3.0.0/resources/empty.xml b/internal/tinyxml2-3.0.0/resources/empty.xml
similarity index 100%
rename from tinyxml2-3.0.0/resources/empty.xml
rename to internal/tinyxml2-3.0.0/resources/empty.xml
diff --git a/tinyxml2-3.0.0/resources/utf8test.xml b/internal/tinyxml2-3.0.0/resources/utf8test.xml
similarity index 100%
rename from tinyxml2-3.0.0/resources/utf8test.xml
rename to internal/tinyxml2-3.0.0/resources/utf8test.xml
diff --git a/tinyxml2-3.0.0/resources/utf8testverify.xml b/internal/tinyxml2-3.0.0/resources/utf8testverify.xml
similarity index 100%
rename from tinyxml2-3.0.0/resources/utf8testverify.xml
rename to internal/tinyxml2-3.0.0/resources/utf8testverify.xml
diff --git a/tinyxml2-3.0.0/setversion.py b/internal/tinyxml2-3.0.0/setversion.py
similarity index 100%
rename from tinyxml2-3.0.0/setversion.py
rename to internal/tinyxml2-3.0.0/setversion.py
diff --git a/tinyxml2-3.0.0/tinyxml2.cpp b/internal/tinyxml2-3.0.0/tinyxml2.cpp
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2.cpp
rename to internal/tinyxml2-3.0.0/tinyxml2.cpp
diff --git a/tinyxml2-3.0.0/tinyxml2.h b/internal/tinyxml2-3.0.0/tinyxml2.h
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2.h
rename to internal/tinyxml2-3.0.0/tinyxml2.h
diff --git a/tinyxml2-3.0.0/tinyxml2.pc.in b/internal/tinyxml2-3.0.0/tinyxml2.pc.in
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2.pc.in
rename to internal/tinyxml2-3.0.0/tinyxml2.pc.in
diff --git a/tinyxml2-3.0.0/tinyxml2/test.vcxproj b/internal/tinyxml2-3.0.0/tinyxml2/test.vcxproj
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/test.vcxproj
rename to internal/tinyxml2-3.0.0/tinyxml2/test.vcxproj
diff --git a/tinyxml2-3.0.0/tinyxml2/test.vcxproj.filters b/internal/tinyxml2-3.0.0/tinyxml2/test.vcxproj.filters
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/test.vcxproj.filters
rename to internal/tinyxml2-3.0.0/tinyxml2/test.vcxproj.filters
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/README b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/README
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/README
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/README
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/tinyxml2-cbp.cbp b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/tinyxml2-cbp.cbp
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/tinyxml2-cbp.cbp
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2-cbp/tinyxml2-cbp.cbp
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2.sln b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.sln
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2.sln
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.sln
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj.filters b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj.filters
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj.filters
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.vcxproj.filters
diff --git a/tinyxml2-3.0.0/tinyxml2/tinyxml2.xcodeproj/project.pbxproj b/internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.xcodeproj/project.pbxproj
similarity index 100%
rename from tinyxml2-3.0.0/tinyxml2/tinyxml2.xcodeproj/project.pbxproj
rename to internal/tinyxml2-3.0.0/tinyxml2/tinyxml2.xcodeproj/project.pbxproj
diff --git a/tinyxml2-3.0.0/xmltest.cpp b/internal/tinyxml2-3.0.0/xmltest.cpp
similarity index 100%
rename from tinyxml2-3.0.0/xmltest.cpp
rename to internal/tinyxml2-3.0.0/xmltest.cpp