diff --git a/Source/DFPSR/api/bufferAPI.cpp b/Source/DFPSR/api/bufferAPI.cpp
index 39db5de4..be9501a6 100644
--- a/Source/DFPSR/api/bufferAPI.cpp
+++ b/Source/DFPSR/api/bufferAPI.cpp
@@ -24,7 +24,7 @@
 #include <fstream>
 #include "bufferAPI.h"
 #include "stringAPI.h"
-#include "../math/scalar.h"
+#include "../implementation/math/scalar.h"
 #include "../base/SafePointer.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/api/drawAPI.cpp b/Source/DFPSR/api/drawAPI.cpp
index 1a3bf34c..4d29b0c1 100644
--- a/Source/DFPSR/api/drawAPI.cpp
+++ b/Source/DFPSR/api/drawAPI.cpp
@@ -23,8 +23,8 @@
 //    distribution.
 
 #include "imageAPI.h"
-#include "../math/scalar.h"
-#include "../image/PackOrder.h"
+#include "../implementation/math/scalar.h"
+#include "../implementation/image/PackOrder.h"
 #include <limits>
 
 namespace dsr {
diff --git a/Source/DFPSR/api/drawAPI.h b/Source/DFPSR/api/drawAPI.h
index 51d13ff0..9fe4f4f5 100644
--- a/Source/DFPSR/api/drawAPI.h
+++ b/Source/DFPSR/api/drawAPI.h
@@ -25,7 +25,7 @@
 #ifndef DFPSR_API_DRAW
 #define DFPSR_API_DRAW
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/api/filterAPI.cpp b/Source/DFPSR/api/filterAPI.cpp
index 61c931a0..a32d8330 100644
--- a/Source/DFPSR/api/filterAPI.cpp
+++ b/Source/DFPSR/api/filterAPI.cpp
@@ -29,7 +29,7 @@
 #include "filterAPI.h"
 #include "imageAPI.h"
 #include "drawAPI.h"
-#include "../image/PackOrder.h"
+#include "../implementation/image/PackOrder.h"
 #include "../base/simd.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/api/filterAPI.h b/Source/DFPSR/api/filterAPI.h
index e2fda509..651022ff 100644
--- a/Source/DFPSR/api/filterAPI.h
+++ b/Source/DFPSR/api/filterAPI.h
@@ -25,7 +25,7 @@
 #ifndef DFPSR_API_FILTER
 #define DFPSR_API_FILTER
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include <functional>
 
 namespace dsr {
diff --git a/Source/DFPSR/api/fontAPI.cpp b/Source/DFPSR/api/fontAPI.cpp
index 3187a33f..3583a346 100644
--- a/Source/DFPSR/api/fontAPI.cpp
+++ b/Source/DFPSR/api/fontAPI.cpp
@@ -23,8 +23,8 @@
 
 #include "fontAPI.h"
 #include "imageAPI.h"
-#include "../font/Font.h"
-#include "../font/defaultFont.h"
+#include "../implementation/font/Font.h"
+#include "../implementation/font/defaultFont.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/api/fontAPI.h b/Source/DFPSR/api/fontAPI.h
index b343038b..ec91e45b 100644
--- a/Source/DFPSR/api/fontAPI.h
+++ b/Source/DFPSR/api/fontAPI.h
@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_FONT
 #define DFPSR_API_FONT
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include "stringAPI.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/api/guiAPI.cpp b/Source/DFPSR/api/guiAPI.cpp
index 2b0d37dd..fc96894b 100644
--- a/Source/DFPSR/api/guiAPI.cpp
+++ b/Source/DFPSR/api/guiAPI.cpp
@@ -26,7 +26,7 @@
 
 #include "guiAPI.h"
 #include "timeAPI.h"
-#include "../gui/DsrWindow.h"
+#include "../implementation/gui/DsrWindow.h"
 #include "fileAPI.h"
 
 using namespace dsr;
diff --git a/Source/DFPSR/api/guiAPI.h b/Source/DFPSR/api/guiAPI.h
index 680125b4..4d4ad6e4 100644
--- a/Source/DFPSR/api/guiAPI.h
+++ b/Source/DFPSR/api/guiAPI.h
@@ -27,9 +27,9 @@
 
 #include "../base/Handle.h"
 #include "../api/stringAPI.h"
-#include "../image/Image.h"
-#include "../gui/InputEvent.h"
-#include "../gui/VisualTheme.h"
+#include "../implementation/image/Image.h"
+#include "../implementation/gui/InputEvent.h"
+#include "../implementation/gui/VisualTheme.h"
 
 // createBackendWindow should be implemented outside of the core framework
 //   Choose one of the window backends in SDK/native to compile and link with your application.
diff --git a/Source/DFPSR/api/imageAPI.cpp b/Source/DFPSR/api/imageAPI.cpp
index 9c1fe459..deb38d50 100644
--- a/Source/DFPSR/api/imageAPI.cpp
+++ b/Source/DFPSR/api/imageAPI.cpp
@@ -29,8 +29,8 @@
 #include "imageAPI.h"
 #include "drawAPI.h"
 #include "fileAPI.h"
-#include "../image/stbImage/stbImageWrapper.h"
-#include "../math/scalar.h"
+#include "../implementation/image/stbImage/stbImageWrapper.h"
+#include "../implementation/math/scalar.h"
 #include "../settings.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/api/imageAPI.h b/Source/DFPSR/api/imageAPI.h
index 6ca0dd88..4bce1e1d 100644
--- a/Source/DFPSR/api/imageAPI.h
+++ b/Source/DFPSR/api/imageAPI.h
@@ -28,10 +28,10 @@
 #ifndef DFPSR_API_IMAGE
 #define DFPSR_API_IMAGE
 
-#include "../image/Image.h"
-#include "../image/Color.h"
+#include "../implementation/image/Image.h"
+#include "../implementation/image/Color.h"
+#include "../implementation/math/scalar.h"
 #include "../base/heap.h"
-#include "../math/scalar.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/api/mediaMachineAPI.cpp b/Source/DFPSR/api/mediaMachineAPI.cpp
index f12a3b99..1ce6242d 100644
--- a/Source/DFPSR/api/mediaMachineAPI.cpp
+++ b/Source/DFPSR/api/mediaMachineAPI.cpp
@@ -24,8 +24,8 @@
 #define DSR_INTERNAL_ACCESS
 
 #include "mediaMachineAPI.h"
-#include "../machine/VirtualMachine.h"
-#include "../machine/mediaFilters.h"
+#include "../implementation/machine/VirtualMachine.h"
+#include "../implementation/machine/mediaFilters.h"
 #include "../api/imageAPI.h"
 #include "../api/drawAPI.h"
 #include "../api/filterAPI.h"
diff --git a/Source/DFPSR/api/mediaMachineAPI.h b/Source/DFPSR/api/mediaMachineAPI.h
index 335d9e93..cb8e0892 100644
--- a/Source/DFPSR/api/mediaMachineAPI.h
+++ b/Source/DFPSR/api/mediaMachineAPI.h
@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_MEDIA_MACHINE
 #define DFPSR_API_MEDIA_MACHINE
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include "../base/Handle.h"
 #include "../math/FixedPoint.h"
 
diff --git a/Source/DFPSR/api/modelAPI.cpp b/Source/DFPSR/api/modelAPI.cpp
index b8092944..b0a78cef 100644
--- a/Source/DFPSR/api/modelAPI.cpp
+++ b/Source/DFPSR/api/modelAPI.cpp
@@ -26,9 +26,9 @@
 #include "modelAPI.h"
 #include "imageAPI.h"
 #include "drawAPI.h"
-#include "../render/model/Model.h"
-#include <limits>
+#include "../implementation/render/model/Model.h"
 #include "../base/virtualStack.h"
+#include <limits>
 
 #define MUST_EXIST(OBJECT, METHOD) if (OBJECT.isNull()) { throwError("The " #OBJECT " handle was null in " #METHOD "\n"); }
 
diff --git a/Source/DFPSR/api/modelAPI.h b/Source/DFPSR/api/modelAPI.h
index 357a829b..10585d80 100644
--- a/Source/DFPSR/api/modelAPI.h
+++ b/Source/DFPSR/api/modelAPI.h
@@ -25,9 +25,9 @@
 #define DFPSR_API_MODEL
 
 #include "../math/FVector.h"
-#include "../image/Texture.h"
-#include "../render/Camera.h"
-#include "../render/ResourcePool.h"
+#include "../implementation/image/Texture.h"
+#include "../implementation/render/Camera.h"
+#include "../implementation/render/ResourcePool.h"
 
 // TODO: Create a folder with types.
 namespace dsr {
@@ -36,7 +36,7 @@ namespace dsr {
 	using Model = Handle<ModelImpl>;
 }
 
-#include "../render/model/format/dmf1.h"
+#include "../implementation/render/model/format/dmf1.h"
 
 namespace dsr {
 	// A handle to a multi-threaded rendering context.
diff --git a/Source/DFPSR/api/textureAPI.cpp b/Source/DFPSR/api/textureAPI.cpp
index 34b226d6..f2861308 100644
--- a/Source/DFPSR/api/textureAPI.cpp
+++ b/Source/DFPSR/api/textureAPI.cpp
@@ -25,7 +25,6 @@
 #include "textureAPI.h"
 #include "imageAPI.h"
 #include "filterAPI.h"
-			#include "drawAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/api/textureAPI.h b/Source/DFPSR/api/textureAPI.h
index 28900a8d..13ce0a2f 100644
--- a/Source/DFPSR/api/textureAPI.h
+++ b/Source/DFPSR/api/textureAPI.h
@@ -87,8 +87,8 @@
 #ifndef DFPSR_API_TEXTURE
 #define DFPSR_API_TEXTURE
 
-#include "../image/Texture.h"
-#include "../image/Image.h"
+#include "../implementation/image/Texture.h"
+#include "../implementation/image/Image.h"
 #ifndef NDEBUG
 	#include "../api/stringAPI.h"
 #endif
diff --git a/Source/DFPSR/base/simd3D.h b/Source/DFPSR/base/simd3D.h
index fb536460..c594866f 100644
--- a/Source/DFPSR/base/simd3D.h
+++ b/Source/DFPSR/base/simd3D.h
@@ -21,6 +21,8 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
+// TODO: Replace simd3D.h with templates in the math folder using noSimd.h.
+
 #include "simd.h"
 #include "../math/FVector.h"
 
diff --git a/Source/DFPSR/base/threading.cpp b/Source/DFPSR/base/threading.cpp
index bc9bfcb9..4586a30b 100644
--- a/Source/DFPSR/base/threading.cpp
+++ b/Source/DFPSR/base/threading.cpp
@@ -23,7 +23,7 @@
 
 #include "threading.h"
 #include "virtualStack.h"
-#include "../math/scalar.h"
+#include "../implementation/math/scalar.h"
 
 // Get settings from here.
 #include "../settings.h"
diff --git a/Source/DFPSR/implementation/README.md b/Source/DFPSR/implementation/README.md
new file mode 100644
index 00000000..c8b80b57
--- /dev/null
+++ b/Source/DFPSR/implementation/README.md
@@ -0,0 +1,3 @@
+# The implementation folder
+To clearly define what is a part of the external interface to the framework, the code that is mainly for internal use is placed within this implementation folder.
+While you can include headers directly from the implementation by controlling exactly which version of the library you use, it should be kept to a minimum because it may break backward compatibility without warning in new releases.
diff --git a/Source/DFPSR/font/Font.cpp b/Source/DFPSR/implementation/font/Font.cpp
similarity index 96%
rename from Source/DFPSR/font/Font.cpp
rename to Source/DFPSR/implementation/font/Font.cpp
index e4ed3c1e..4bd89d35 100644
--- a/Source/DFPSR/font/Font.cpp
+++ b/Source/DFPSR/implementation/font/Font.cpp
@@ -23,8 +23,8 @@
 
 #include <cstdint>
 #include "Font.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/font/Font.h b/Source/DFPSR/implementation/font/Font.h
similarity index 93%
rename from Source/DFPSR/font/Font.h
rename to Source/DFPSR/implementation/font/Font.h
index c77c4afe..200fd651 100644
--- a/Source/DFPSR/font/Font.h
+++ b/Source/DFPSR/implementation/font/Font.h
@@ -24,11 +24,11 @@
 #ifndef DFPSR_GUI_FONT
 #define DFPSR_GUI_FONT
 
-#include "../base/Handle.h"
-#include "../api/stringAPI.h"
-#include "../api/imageAPI.h"
-#include "../math/IRect.h"
-#include "../math/IVector.h"
+#include "../../base/Handle.h"
+#include "../../api/stringAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../math/IRect.h"
+#include "../../math/IVector.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/font/defaultFont.h b/Source/DFPSR/implementation/font/defaultFont.h
similarity index 100%
rename from Source/DFPSR/font/defaultFont.h
rename to Source/DFPSR/implementation/font/defaultFont.h
diff --git a/Source/DFPSR/gui/BackendWindow.cpp b/Source/DFPSR/implementation/gui/BackendWindow.cpp
similarity index 100%
rename from Source/DFPSR/gui/BackendWindow.cpp
rename to Source/DFPSR/implementation/gui/BackendWindow.cpp
diff --git a/Source/DFPSR/gui/BackendWindow.h b/Source/DFPSR/implementation/gui/BackendWindow.h
similarity index 95%
rename from Source/DFPSR/gui/BackendWindow.h
rename to Source/DFPSR/implementation/gui/BackendWindow.h
index 6fed58a9..e0d58eef 100644
--- a/Source/DFPSR/gui/BackendWindow.h
+++ b/Source/DFPSR/implementation/gui/BackendWindow.h
@@ -27,9 +27,9 @@
 #include <cstdint>
 #include <memory>
 #include "InputEvent.h"
-#include "../api/imageAPI.h"
-#include "../api/stringAPI.h"
-#include "../collection/List.h"
+#include "../../api/imageAPI.h"
+#include "../../api/stringAPI.h"
+#include "../../collection/List.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/DsrWindow.cpp b/Source/DFPSR/implementation/gui/DsrWindow.cpp
similarity index 96%
rename from Source/DFPSR/gui/DsrWindow.cpp
rename to Source/DFPSR/implementation/gui/DsrWindow.cpp
index dea95944..db5765d6 100644
--- a/Source/DFPSR/gui/DsrWindow.cpp
+++ b/Source/DFPSR/implementation/gui/DsrWindow.cpp
@@ -35,9 +35,9 @@
 // <<<< Include new components here
 
 #include "../math/scalar.h"
-#include "../math/IVector.h"
-#include "../api/imageAPI.h"
-#include "../api/filterAPI.h"
+#include "../../math/IVector.h"
+#include "../../api/imageAPI.h"
+#include "../../api/filterAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/gui/DsrWindow.h b/Source/DFPSR/implementation/gui/DsrWindow.h
similarity index 95%
rename from Source/DFPSR/gui/DsrWindow.h
rename to Source/DFPSR/implementation/gui/DsrWindow.h
index 66edaed0..572f5337 100644
--- a/Source/DFPSR/gui/DsrWindow.h
+++ b/Source/DFPSR/implementation/gui/DsrWindow.h
@@ -25,9 +25,9 @@
 #ifndef DFPSR_GUI_DSRWINDOW
 #define DFPSR_GUI_DSRWINDOW
 
-#include "../gui/VisualComponent.h"
-#include "../gui/BackendWindow.h"
-#include "../api/stringAPI.h"
+#include "VisualComponent.h"
+#include "BackendWindow.h"
+#include "../../api/stringAPI.h"
 
 // The DSR window is responsible for connecting visual interfaces with the backend window.
 //   An optional depth buffer is allocated on demand when requested, and kept until the window resizes.
diff --git a/Source/DFPSR/gui/FlexRegion.cpp b/Source/DFPSR/implementation/gui/FlexRegion.cpp
similarity index 100%
rename from Source/DFPSR/gui/FlexRegion.cpp
rename to Source/DFPSR/implementation/gui/FlexRegion.cpp
diff --git a/Source/DFPSR/gui/FlexRegion.h b/Source/DFPSR/implementation/gui/FlexRegion.h
similarity index 95%
rename from Source/DFPSR/gui/FlexRegion.h
rename to Source/DFPSR/implementation/gui/FlexRegion.h
index ed26bb02..233cef23 100644
--- a/Source/DFPSR/gui/FlexRegion.h
+++ b/Source/DFPSR/implementation/gui/FlexRegion.h
@@ -25,10 +25,10 @@
 #define DFPSR_GUI_FLEXREGION
 
 #include <cstdint>
-#include "../math/IVector.h"
-#include "../math/IRect.h"
+#include "../../math/IVector.h"
+#include "../../math/IRect.h"
 #include "../math/scalar.h"
-#include "../api/stringAPI.h"
+#include "../../api/stringAPI.h"
 #include "../persistent/ClassFactory.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/gui/InputEvent.cpp b/Source/DFPSR/implementation/gui/InputEvent.cpp
similarity index 100%
rename from Source/DFPSR/gui/InputEvent.cpp
rename to Source/DFPSR/implementation/gui/InputEvent.cpp
diff --git a/Source/DFPSR/gui/InputEvent.h b/Source/DFPSR/implementation/gui/InputEvent.h
similarity index 97%
rename from Source/DFPSR/gui/InputEvent.h
rename to Source/DFPSR/implementation/gui/InputEvent.h
index 71556416..8bfe8ffc 100644
--- a/Source/DFPSR/gui/InputEvent.h
+++ b/Source/DFPSR/implementation/gui/InputEvent.h
@@ -24,7 +24,7 @@
 #ifndef DFPSR_GUI_INPUT_EVENT
 #define DFPSR_GUI_INPUT_EVENT
 
-#include "../math/IVector.h"
+#include "../../math/IVector.h"
 #include <functional>
 
 namespace dsr {
diff --git a/Source/DFPSR/gui/VisualComponent.cpp b/Source/DFPSR/implementation/gui/VisualComponent.cpp
similarity index 100%
rename from Source/DFPSR/gui/VisualComponent.cpp
rename to Source/DFPSR/implementation/gui/VisualComponent.cpp
diff --git a/Source/DFPSR/gui/VisualComponent.h b/Source/DFPSR/implementation/gui/VisualComponent.h
similarity index 97%
rename from Source/DFPSR/gui/VisualComponent.h
rename to Source/DFPSR/implementation/gui/VisualComponent.h
index b3aead5d..b501988f 100644
--- a/Source/DFPSR/gui/VisualComponent.h
+++ b/Source/DFPSR/implementation/gui/VisualComponent.h
@@ -30,8 +30,8 @@
 #include "InputEvent.h"
 #include "componentStates.h"
 #include "VisualTheme.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/VisualTheme.cpp b/Source/DFPSR/implementation/gui/VisualTheme.cpp
similarity index 96%
rename from Source/DFPSR/gui/VisualTheme.cpp
rename to Source/DFPSR/implementation/gui/VisualTheme.cpp
index 619d14e9..a5f68d50 100644
--- a/Source/DFPSR/gui/VisualTheme.cpp
+++ b/Source/DFPSR/implementation/gui/VisualTheme.cpp
@@ -23,11 +23,11 @@
 
 #include <cstdint>
 #include "VisualTheme.h"
-#include "../api/fileAPI.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
-#include "../api/mediaMachineAPI.h"
-#include "../api/configAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
+#include "../../api/mediaMachineAPI.h"
+#include "../../api/configAPI.h"
 #include "../persistent/atomic/PersistentImage.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/gui/VisualTheme.h b/Source/DFPSR/implementation/gui/VisualTheme.h
similarity index 98%
rename from Source/DFPSR/gui/VisualTheme.h
rename to Source/DFPSR/implementation/gui/VisualTheme.h
index 3bae68a4..b09c5c61 100644
--- a/Source/DFPSR/gui/VisualTheme.h
+++ b/Source/DFPSR/implementation/gui/VisualTheme.h
@@ -24,7 +24,7 @@
 #ifndef DFPSR_GUI_VISUALTHEME
 #define DFPSR_GUI_VISUALTHEME
 
-#include "../api/mediaMachineAPI.h"
+#include "../../api/mediaMachineAPI.h"
 #include "componentStates.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/gui/componentStates.h b/Source/DFPSR/implementation/gui/componentStates.h
similarity index 100%
rename from Source/DFPSR/gui/componentStates.h
rename to Source/DFPSR/implementation/gui/componentStates.h
diff --git a/Source/DFPSR/gui/components/Button.cpp b/Source/DFPSR/implementation/gui/components/Button.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/Button.cpp
rename to Source/DFPSR/implementation/gui/components/Button.cpp
diff --git a/Source/DFPSR/gui/components/Button.h b/Source/DFPSR/implementation/gui/components/Button.h
similarity index 96%
rename from Source/DFPSR/gui/components/Button.h
rename to Source/DFPSR/implementation/gui/components/Button.h
index 70f6df7f..683ecead 100644
--- a/Source/DFPSR/gui/components/Button.h
+++ b/Source/DFPSR/implementation/gui/components/Button.h
@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_BUTTON
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/components/Label.cpp b/Source/DFPSR/implementation/gui/components/Label.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/Label.cpp
rename to Source/DFPSR/implementation/gui/components/Label.cpp
diff --git a/Source/DFPSR/gui/components/Label.h b/Source/DFPSR/implementation/gui/components/Label.h
similarity index 95%
rename from Source/DFPSR/gui/components/Label.h
rename to Source/DFPSR/implementation/gui/components/Label.h
index 91e5c46a..4b832529 100644
--- a/Source/DFPSR/gui/components/Label.h
+++ b/Source/DFPSR/implementation/gui/components/Label.h
@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_LABEL
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/components/ListBox.cpp b/Source/DFPSR/implementation/gui/components/ListBox.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/ListBox.cpp
rename to Source/DFPSR/implementation/gui/components/ListBox.cpp
diff --git a/Source/DFPSR/gui/components/ListBox.h b/Source/DFPSR/implementation/gui/components/ListBox.h
similarity index 96%
rename from Source/DFPSR/gui/components/ListBox.h
rename to Source/DFPSR/implementation/gui/components/ListBox.h
index 5aae4125..db5d5ba7 100644
--- a/Source/DFPSR/gui/components/ListBox.h
+++ b/Source/DFPSR/implementation/gui/components/ListBox.h
@@ -26,7 +26,7 @@
 
 #include "../VisualComponent.h"
 #include "helpers/ScrollBarImpl.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/components/Menu.cpp b/Source/DFPSR/implementation/gui/components/Menu.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/Menu.cpp
rename to Source/DFPSR/implementation/gui/components/Menu.cpp
diff --git a/Source/DFPSR/gui/components/Menu.h b/Source/DFPSR/implementation/gui/components/Menu.h
similarity index 97%
rename from Source/DFPSR/gui/components/Menu.h
rename to Source/DFPSR/implementation/gui/components/Menu.h
index 0aa71b40..dae708ba 100644
--- a/Source/DFPSR/gui/components/Menu.h
+++ b/Source/DFPSR/implementation/gui/components/Menu.h
@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_MENU
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/components/Panel.cpp b/Source/DFPSR/implementation/gui/components/Panel.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/Panel.cpp
rename to Source/DFPSR/implementation/gui/components/Panel.cpp
diff --git a/Source/DFPSR/gui/components/Panel.h b/Source/DFPSR/implementation/gui/components/Panel.h
similarity index 100%
rename from Source/DFPSR/gui/components/Panel.h
rename to Source/DFPSR/implementation/gui/components/Panel.h
diff --git a/Source/DFPSR/gui/components/Picture.cpp b/Source/DFPSR/implementation/gui/components/Picture.cpp
similarity index 96%
rename from Source/DFPSR/gui/components/Picture.cpp
rename to Source/DFPSR/implementation/gui/components/Picture.cpp
index 993eabd5..26ed4f4a 100644
--- a/Source/DFPSR/gui/components/Picture.cpp
+++ b/Source/DFPSR/implementation/gui/components/Picture.cpp
@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "Picture.h"
-#include "../../api/filterAPI.h"
+#include "../../../api/filterAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/gui/components/Picture.h b/Source/DFPSR/implementation/gui/components/Picture.h
similarity index 100%
rename from Source/DFPSR/gui/components/Picture.h
rename to Source/DFPSR/implementation/gui/components/Picture.h
diff --git a/Source/DFPSR/gui/components/TextBox.cpp b/Source/DFPSR/implementation/gui/components/TextBox.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/TextBox.cpp
rename to Source/DFPSR/implementation/gui/components/TextBox.cpp
diff --git a/Source/DFPSR/gui/components/TextBox.h b/Source/DFPSR/implementation/gui/components/TextBox.h
similarity index 96%
rename from Source/DFPSR/gui/components/TextBox.h
rename to Source/DFPSR/implementation/gui/components/TextBox.h
index a25c068a..a898653c 100644
--- a/Source/DFPSR/gui/components/TextBox.h
+++ b/Source/DFPSR/implementation/gui/components/TextBox.h
@@ -26,8 +26,8 @@
 
 #include "../VisualComponent.h"
 #include "helpers/ScrollBarImpl.h"
-#include "../../api/fontAPI.h"
-#include "../../math/LVector.h"
+#include "../../../api/fontAPI.h"
+#include "../../../math/LVector.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/gui/components/Toolbar.cpp b/Source/DFPSR/implementation/gui/components/Toolbar.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/Toolbar.cpp
rename to Source/DFPSR/implementation/gui/components/Toolbar.cpp
diff --git a/Source/DFPSR/gui/components/Toolbar.h b/Source/DFPSR/implementation/gui/components/Toolbar.h
similarity index 100%
rename from Source/DFPSR/gui/components/Toolbar.h
rename to Source/DFPSR/implementation/gui/components/Toolbar.h
diff --git a/Source/DFPSR/gui/components/helpers/ScrollBarImpl.cpp b/Source/DFPSR/implementation/gui/components/helpers/ScrollBarImpl.cpp
similarity index 100%
rename from Source/DFPSR/gui/components/helpers/ScrollBarImpl.cpp
rename to Source/DFPSR/implementation/gui/components/helpers/ScrollBarImpl.cpp
diff --git a/Source/DFPSR/gui/components/helpers/ScrollBarImpl.h b/Source/DFPSR/implementation/gui/components/helpers/ScrollBarImpl.h
similarity index 100%
rename from Source/DFPSR/gui/components/helpers/ScrollBarImpl.h
rename to Source/DFPSR/implementation/gui/components/helpers/ScrollBarImpl.h
diff --git a/Source/DFPSR/image/Color.h b/Source/DFPSR/implementation/image/Color.h
similarity index 97%
rename from Source/DFPSR/image/Color.h
rename to Source/DFPSR/implementation/image/Color.h
index 30219e60..f03ac289 100644
--- a/Source/DFPSR/image/Color.h
+++ b/Source/DFPSR/implementation/image/Color.h
@@ -25,7 +25,7 @@
 #define DFPSR_IMAGE_COLOR
 
 #include <cstdint>
-#include "../api/stringAPI.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/image/Image.h b/Source/DFPSR/implementation/image/Image.h
similarity index 97%
rename from Source/DFPSR/image/Image.h
rename to Source/DFPSR/implementation/image/Image.h
index 4cde822d..081dad16 100644
--- a/Source/DFPSR/image/Image.h
+++ b/Source/DFPSR/implementation/image/Image.h
@@ -26,8 +26,8 @@
 #define DFPSR_IMAGE_TYPES
 
 #include "PackOrder.h"
-#include "../math/IRect.h"
-#include "../api/bufferAPI.h"
+#include "../../math/IRect.h"
+#include "../../api/bufferAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/image/ImageLoader.h b/Source/DFPSR/implementation/image/ImageLoader.h
similarity index 95%
rename from Source/DFPSR/image/ImageLoader.h
rename to Source/DFPSR/implementation/image/ImageLoader.h
index 74fe197b..bb486696 100644
--- a/Source/DFPSR/image/ImageLoader.h
+++ b/Source/DFPSR/implementation/image/ImageLoader.h
@@ -25,7 +25,7 @@
 #define DFPSR_IMAGE_LOADER
 
 #include "Image.h"
-#include "../base/text.h"
+#include "../../api/stringAPI.h"
 #include <cstdio>
 
 namespace dsr {
diff --git a/Source/DFPSR/image/PackOrder.h b/Source/DFPSR/implementation/image/PackOrder.h
similarity index 96%
rename from Source/DFPSR/image/PackOrder.h
rename to Source/DFPSR/implementation/image/PackOrder.h
index 7f64c3dd..68df854d 100644
--- a/Source/DFPSR/image/PackOrder.h
+++ b/Source/DFPSR/implementation/image/PackOrder.h
@@ -26,9 +26,9 @@
 
 #include <cstdint>
 #include "Color.h"
-#include "../base/endian.h"
-#include "../base/noSimd.h"
-#include "../api/stringAPI.h"
+#include "../../base/endian.h"
+#include "../../base/noSimd.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/image/Texture.h b/Source/DFPSR/implementation/image/Texture.h
similarity index 93%
rename from Source/DFPSR/image/Texture.h
rename to Source/DFPSR/implementation/image/Texture.h
index 2d398f90..cd8f7647 100644
--- a/Source/DFPSR/image/Texture.h
+++ b/Source/DFPSR/implementation/image/Texture.h
@@ -26,8 +26,8 @@
 #define DFPSR_TEXTURE_TYPES
 
 #include "Image.h"
-#include "../base/noSimd.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
-#include "../base/DsrTraits.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
+#include "../../base/noSimd.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
+#include "../../base/DsrTraits.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
 #include "../math/scalar.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/image/stbImage/stbImageWrapper.cpp b/Source/DFPSR/implementation/image/stbImage/stbImageWrapper.cpp
similarity index 96%
rename from Source/DFPSR/image/stbImage/stbImageWrapper.cpp
rename to Source/DFPSR/implementation/image/stbImage/stbImageWrapper.cpp
index 9ea0d913..eef5d0cf 100644
--- a/Source/DFPSR/image/stbImage/stbImageWrapper.cpp
+++ b/Source/DFPSR/implementation/image/stbImage/stbImageWrapper.cpp
@@ -7,7 +7,7 @@
 
 #include "stbImageWrapper.h"
 
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/image/stbImage/stbImageWrapper.h b/Source/DFPSR/implementation/image/stbImage/stbImageWrapper.h
similarity index 85%
rename from Source/DFPSR/image/stbImage/stbImageWrapper.h
rename to Source/DFPSR/implementation/image/stbImage/stbImageWrapper.h
index f4a0209a..b3c4c232 100644
--- a/Source/DFPSR/image/stbImage/stbImageWrapper.h
+++ b/Source/DFPSR/implementation/image/stbImage/stbImageWrapper.h
@@ -2,8 +2,8 @@
 #ifndef DFPSR_API_IMAGE_STB_WRAPPER
 #define DFPSR_API_IMAGE_STB_WRAPPER
 
-#include "../../image/Image.h"
-#include "../../api/stringAPI.h"
+#include "../Image.h"
+#include "../../../api/stringAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/image/stbImage/stb_image.h b/Source/DFPSR/implementation/image/stbImage/stb_image.h
similarity index 100%
rename from Source/DFPSR/image/stbImage/stb_image.h
rename to Source/DFPSR/implementation/image/stbImage/stb_image.h
diff --git a/Source/DFPSR/image/stbImage/stb_image_write.h b/Source/DFPSR/implementation/image/stbImage/stb_image_write.h
similarity index 100%
rename from Source/DFPSR/image/stbImage/stb_image_write.h
rename to Source/DFPSR/implementation/image/stbImage/stb_image_write.h
diff --git a/Source/DFPSR/machine/VirtualMachine.cpp b/Source/DFPSR/implementation/machine/VirtualMachine.cpp
similarity index 97%
rename from Source/DFPSR/machine/VirtualMachine.cpp
rename to Source/DFPSR/implementation/machine/VirtualMachine.cpp
index 181cc911..0cb4f591 100644
--- a/Source/DFPSR/machine/VirtualMachine.cpp
+++ b/Source/DFPSR/implementation/machine/VirtualMachine.cpp
@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "VirtualMachine.h"
-#include "../api/timeAPI.h"
+#include "../../api/timeAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/machine/VirtualMachine.h b/Source/DFPSR/implementation/machine/VirtualMachine.h
similarity index 97%
rename from Source/DFPSR/machine/VirtualMachine.h
rename to Source/DFPSR/implementation/machine/VirtualMachine.h
index 2e1b84d3..0f8e2c24 100644
--- a/Source/DFPSR/machine/VirtualMachine.h
+++ b/Source/DFPSR/implementation/machine/VirtualMachine.h
@@ -25,9 +25,9 @@
 #define DFPSR_VIRTUAL_MACHINE
 
 #include <cstdint>
-#include "../math/FixedPoint.h"
-#include "../collection/Array.h"
-#include "../collection/List.h"
+#include "../../math/FixedPoint.h"
+#include "../../collection/Array.h"
+#include "../../collection/List.h"
 
 // Flags
 //#define VIRTUAL_MACHINE_PROFILE // Enable profiling
diff --git a/Source/DFPSR/machine/mediaFilters.cpp b/Source/DFPSR/implementation/machine/mediaFilters.cpp
similarity index 97%
rename from Source/DFPSR/machine/mediaFilters.cpp
rename to Source/DFPSR/implementation/machine/mediaFilters.cpp
index 397ae922..226a5b14 100644
--- a/Source/DFPSR/machine/mediaFilters.cpp
+++ b/Source/DFPSR/implementation/machine/mediaFilters.cpp
@@ -22,8 +22,8 @@
 //    distribution.
 
 #include "mediaFilters.h"
-#include "../base/simd.h"
-#include "../api/drawAPI.h"
+#include "../../base/simd.h"
+#include "../../api/drawAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/machine/mediaFilters.h b/Source/DFPSR/implementation/machine/mediaFilters.h
similarity index 96%
rename from Source/DFPSR/machine/mediaFilters.h
rename to Source/DFPSR/implementation/machine/mediaFilters.h
index 89479418..b721cac8 100644
--- a/Source/DFPSR/machine/mediaFilters.h
+++ b/Source/DFPSR/implementation/machine/mediaFilters.h
@@ -24,8 +24,8 @@
 #ifndef DFPSR_MEDIA_FILTERS
 #define DFPSR_MEDIA_FILTERS
 
-#include "../api/imageAPI.h"
-#include "../math/FixedPoint.h"
+#include "../../api/imageAPI.h"
+#include "../../math/FixedPoint.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/math/scalar.h b/Source/DFPSR/implementation/math/scalar.h
similarity index 95%
rename from Source/DFPSR/math/scalar.h
rename to Source/DFPSR/implementation/math/scalar.h
index 5979f559..699955e9 100644
--- a/Source/DFPSR/math/scalar.h
+++ b/Source/DFPSR/implementation/math/scalar.h
@@ -24,7 +24,7 @@
 #ifndef DFPSR_MATH_SCALAR
 #define DFPSR_MATH_SCALAR
 
-#include "../base/noSimd.h"
+#include "../../base/noSimd.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/persistent/ClassFactory.cpp b/Source/DFPSR/implementation/persistent/ClassFactory.cpp
similarity index 100%
rename from Source/DFPSR/persistent/ClassFactory.cpp
rename to Source/DFPSR/implementation/persistent/ClassFactory.cpp
diff --git a/Source/DFPSR/persistent/ClassFactory.h b/Source/DFPSR/implementation/persistent/ClassFactory.h
similarity index 95%
rename from Source/DFPSR/persistent/ClassFactory.h
rename to Source/DFPSR/implementation/persistent/ClassFactory.h
index 9cbd5f04..4fe8ae5f 100644
--- a/Source/DFPSR/persistent/ClassFactory.h
+++ b/Source/DFPSR/implementation/persistent/ClassFactory.h
@@ -24,9 +24,9 @@
 #ifndef DFPSR_PERSISTENT_CLASSFACTORY
 #define DFPSR_PERSISTENT_CLASSFACTORY
 
-#include "../api/stringAPI.h"
-#include "../api/fileAPI.h"
-#include "../collection/List.h"
+#include "../../api/stringAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../collection/List.h"
 #include <memory>
 
 namespace dsr {
diff --git a/Source/DFPSR/persistent/atomic/PersistentBoolean.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentBoolean.cpp
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentBoolean.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentBoolean.cpp
diff --git a/Source/DFPSR/persistent/atomic/PersistentBoolean.h b/Source/DFPSR/implementation/persistent/atomic/PersistentBoolean.h
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentBoolean.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentBoolean.h
diff --git a/Source/DFPSR/persistent/atomic/PersistentColor.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentColor.cpp
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentColor.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentColor.cpp
diff --git a/Source/DFPSR/persistent/atomic/PersistentColor.h b/Source/DFPSR/implementation/persistent/atomic/PersistentColor.h
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentColor.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentColor.h
diff --git a/Source/DFPSR/persistent/atomic/PersistentImage.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentImage.cpp
similarity index 96%
rename from Source/DFPSR/persistent/atomic/PersistentImage.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentImage.cpp
index 077174a4..dffea2a8 100644
--- a/Source/DFPSR/persistent/atomic/PersistentImage.cpp
+++ b/Source/DFPSR/implementation/persistent/atomic/PersistentImage.cpp
@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "PersistentImage.h"
-#include "../../api/fileAPI.h"
+#include "../../../api/fileAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/persistent/atomic/PersistentImage.h b/Source/DFPSR/implementation/persistent/atomic/PersistentImage.h
similarity index 95%
rename from Source/DFPSR/persistent/atomic/PersistentImage.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentImage.h
index eda61c4f..bf3fd0ee 100644
--- a/Source/DFPSR/persistent/atomic/PersistentImage.h
+++ b/Source/DFPSR/implementation/persistent/atomic/PersistentImage.h
@@ -25,7 +25,7 @@
 #define DFPSR_GUI_PERSISTENTIMAGE
 
 #include "../ClassFactory.h"
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/persistent/atomic/PersistentInteger.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentInteger.cpp
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentInteger.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentInteger.cpp
diff --git a/Source/DFPSR/persistent/atomic/PersistentInteger.h b/Source/DFPSR/implementation/persistent/atomic/PersistentInteger.h
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentInteger.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentInteger.h
diff --git a/Source/DFPSR/persistent/atomic/PersistentString.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentString.cpp
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentString.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentString.cpp
diff --git a/Source/DFPSR/persistent/atomic/PersistentString.h b/Source/DFPSR/implementation/persistent/atomic/PersistentString.h
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentString.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentString.h
diff --git a/Source/DFPSR/persistent/atomic/PersistentStringList.cpp b/Source/DFPSR/implementation/persistent/atomic/PersistentStringList.cpp
similarity index 95%
rename from Source/DFPSR/persistent/atomic/PersistentStringList.cpp
rename to Source/DFPSR/implementation/persistent/atomic/PersistentStringList.cpp
index 278af213..e6f4d0d2 100644
--- a/Source/DFPSR/persistent/atomic/PersistentStringList.cpp
+++ b/Source/DFPSR/implementation/persistent/atomic/PersistentStringList.cpp
@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "PersistentStringList.h"
-#include "../../collection/List.h"
+#include "../../../collection/List.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/persistent/atomic/PersistentStringList.h b/Source/DFPSR/implementation/persistent/atomic/PersistentStringList.h
similarity index 100%
rename from Source/DFPSR/persistent/atomic/PersistentStringList.h
rename to Source/DFPSR/implementation/persistent/atomic/PersistentStringList.h
diff --git a/Source/DFPSR/persistent/includePersistent.h b/Source/DFPSR/implementation/persistent/includePersistent.h
similarity index 100%
rename from Source/DFPSR/persistent/includePersistent.h
rename to Source/DFPSR/implementation/persistent/includePersistent.h
diff --git a/Source/DFPSR/render/Camera.h b/Source/DFPSR/implementation/render/Camera.h
similarity index 96%
rename from Source/DFPSR/render/Camera.h
rename to Source/DFPSR/implementation/render/Camera.h
index 7bae7bab..7d535b7c 100644
--- a/Source/DFPSR/render/Camera.h
+++ b/Source/DFPSR/implementation/render/Camera.h
@@ -26,10 +26,10 @@
 
 #include <cstdint>
 #include <cassert>
-#include "../math/FVector.h"
-#include "../math/LVector.h"
-#include "../math/FPlane3D.h"
-#include "../math/Transform3D.h"
+#include "../../math/FVector.h"
+#include "../../math/LVector.h"
+#include "../../math/FPlane3D.h"
+#include "../../math/Transform3D.h"
 #include "../math/scalar.h"
 #include "constants.h"
 #include "ProjectedPoint.h"
diff --git a/Source/DFPSR/render/ITriangle2D.cpp b/Source/DFPSR/implementation/render/ITriangle2D.cpp
similarity index 97%
rename from Source/DFPSR/render/ITriangle2D.cpp
rename to Source/DFPSR/implementation/render/ITriangle2D.cpp
index 001f6782..990f2e47 100644
--- a/Source/DFPSR/render/ITriangle2D.cpp
+++ b/Source/DFPSR/implementation/render/ITriangle2D.cpp
@@ -23,7 +23,7 @@
 
 #include "ITriangle2D.h"
 #include "../math/scalar.h"
-#include "../math/FMatrix2x2.h"
+#include "../../math/FMatrix2x2.h"
 #include <algorithm>
 
 using namespace dsr;
diff --git a/Source/DFPSR/render/ITriangle2D.h b/Source/DFPSR/implementation/render/ITriangle2D.h
similarity index 96%
rename from Source/DFPSR/render/ITriangle2D.h
rename to Source/DFPSR/implementation/render/ITriangle2D.h
index 290f5426..cf5cc92f 100644
--- a/Source/DFPSR/render/ITriangle2D.h
+++ b/Source/DFPSR/implementation/render/ITriangle2D.h
@@ -27,9 +27,9 @@
 #include <cstdint>
 #include <cassert>
 #include "ProjectedPoint.h"
-#include "../math/FVector.h"
-#include "../math/IVector.h"
-#include "../math/IRect.h"
+#include "../../math/FVector.h"
+#include "../../math/IVector.h"
+#include "../../math/IRect.h"
 #include "constants.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/render/ProjectedPoint.h b/Source/DFPSR/implementation/render/ProjectedPoint.h
similarity index 94%
rename from Source/DFPSR/render/ProjectedPoint.h
rename to Source/DFPSR/implementation/render/ProjectedPoint.h
index 44e2c846..55862237 100644
--- a/Source/DFPSR/render/ProjectedPoint.h
+++ b/Source/DFPSR/implementation/render/ProjectedPoint.h
@@ -25,8 +25,8 @@
 #define DFPSR_RENDER_PROJECTEDPOINT
 
 #include <cstdint>
-#include "../math/FVector.h"
-#include "../math/LVector.h"
+#include "../../math/FVector.h"
+#include "../../math/LVector.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/render/ResourcePool.cpp b/Source/DFPSR/implementation/render/ResourcePool.cpp
similarity index 95%
rename from Source/DFPSR/render/ResourcePool.cpp
rename to Source/DFPSR/implementation/render/ResourcePool.cpp
index c918df0a..9272e5d2 100644
--- a/Source/DFPSR/render/ResourcePool.cpp
+++ b/Source/DFPSR/implementation/render/ResourcePool.cpp
@@ -23,9 +23,9 @@
 
 #include "ResourcePool.h"
 #include "../image/stbImage/stbImageWrapper.h"
-#include "../api/fileAPI.h"
-#include "../api/imageAPI.h"
-#include "../api/textureAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/textureAPI.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/render/ResourcePool.h b/Source/DFPSR/implementation/render/ResourcePool.h
similarity index 94%
rename from Source/DFPSR/render/ResourcePool.h
rename to Source/DFPSR/implementation/render/ResourcePool.h
index 02086b3f..6c51eef2 100644
--- a/Source/DFPSR/render/ResourcePool.h
+++ b/Source/DFPSR/implementation/render/ResourcePool.h
@@ -25,8 +25,8 @@
 #define DFPSR_RENDER_RESOURCE_POOL
 
 #include "../image/Texture.h"
-#include "../collection/List.h"
-#include "../api/stringAPI.h"
+#include "../../collection/List.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/render/constants.h b/Source/DFPSR/implementation/render/constants.h
similarity index 100%
rename from Source/DFPSR/render/constants.h
rename to Source/DFPSR/implementation/render/constants.h
diff --git a/Source/DFPSR/render/model/Model.cpp b/Source/DFPSR/implementation/render/model/Model.cpp
similarity index 97%
rename from Source/DFPSR/render/model/Model.cpp
rename to Source/DFPSR/implementation/render/model/Model.cpp
index 4b5f5582..2ea7d016 100644
--- a/Source/DFPSR/render/model/Model.cpp
+++ b/Source/DFPSR/implementation/render/model/Model.cpp
@@ -25,9 +25,9 @@
 
 #include "Model.h"
 #include "../constants.h"
-#include "../../api/imageAPI.h"
-#include "../../api/textureAPI.h"
-#include "../../base/virtualStack.h"
+#include "../../../api/imageAPI.h"
+#include "../../../api/textureAPI.h"
+#include "../../../base/virtualStack.h"
 
 using namespace dsr;
 
diff --git a/Source/DFPSR/render/model/Model.h b/Source/DFPSR/implementation/render/model/Model.h
similarity index 96%
rename from Source/DFPSR/render/model/Model.h
rename to Source/DFPSR/implementation/render/model/Model.h
index 04f7d32a..29a591f3 100644
--- a/Source/DFPSR/render/model/Model.h
+++ b/Source/DFPSR/implementation/render/model/Model.h
@@ -25,13 +25,13 @@
 #define DFPSR_RENDER_MODEL_POLYGONMODEL
 
 #include <cstdint>
-#include "../../api/stringAPI.h"
+#include "../../../api/stringAPI.h"
 #include "../../image/Texture.h"
 #include "../shader/Shader.h"
 #include "../Camera.h"
 #include "../ResourcePool.h"
 #include "../renderCore.h"
-#include "../../math/FVector.h"
+#include "../../../math/FVector.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/render/model/format/dmf1.cpp b/Source/DFPSR/implementation/render/model/format/dmf1.cpp
similarity index 97%
rename from Source/DFPSR/render/model/format/dmf1.cpp
rename to Source/DFPSR/implementation/render/model/format/dmf1.cpp
index ec974882..d50cfa53 100644
--- a/Source/DFPSR/render/model/format/dmf1.cpp
+++ b/Source/DFPSR/implementation/render/model/format/dmf1.cpp
@@ -21,7 +21,7 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
-#include "../../../api/modelAPI.h"
+#include "../../../../api/modelAPI.h"
 #include "../Model.h" // TODO: Only use the public API
 
 using namespace dsr;
diff --git a/Source/DFPSR/render/model/format/dmf1.h b/Source/DFPSR/implementation/render/model/format/dmf1.h
similarity index 96%
rename from Source/DFPSR/render/model/format/dmf1.h
rename to Source/DFPSR/implementation/render/model/format/dmf1.h
index 2abc56b0..d2185b5d 100644
--- a/Source/DFPSR/render/model/format/dmf1.h
+++ b/Source/DFPSR/implementation/render/model/format/dmf1.h
@@ -25,7 +25,7 @@
 #define DFPSR_RENDER_MODEL_IMPORT_DMF1
 
 #include "../../ResourcePool.h"
-#include "../../../api/stringAPI.h"
+#include "../../../../api/stringAPI.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/render/model/includeModel.h b/Source/DFPSR/implementation/render/model/includeModel.h
similarity index 100%
rename from Source/DFPSR/render/model/includeModel.h
rename to Source/DFPSR/implementation/render/model/includeModel.h
diff --git a/Source/DFPSR/render/renderCore.cpp b/Source/DFPSR/implementation/render/renderCore.cpp
similarity index 97%
rename from Source/DFPSR/render/renderCore.cpp
rename to Source/DFPSR/implementation/render/renderCore.cpp
index e5dcfca4..61ed783c 100644
--- a/Source/DFPSR/render/renderCore.cpp
+++ b/Source/DFPSR/implementation/render/renderCore.cpp
@@ -23,7 +23,7 @@
 
 #include <cassert>
 #include "renderCore.h"
-#include "../base/virtualStack.h"
+#include "../../base/virtualStack.h"
 #include "shader/RgbaMultiply.h"
 #include "constants.h"
 
diff --git a/Source/DFPSR/render/renderCore.h b/Source/DFPSR/implementation/render/renderCore.h
similarity index 96%
rename from Source/DFPSR/render/renderCore.h
rename to Source/DFPSR/implementation/render/renderCore.h
index 0199e56e..5809d84a 100644
--- a/Source/DFPSR/render/renderCore.h
+++ b/Source/DFPSR/implementation/render/renderCore.h
@@ -27,8 +27,8 @@
 #include <cstdint>
 #include "Camera.h"
 #include "shader/Shader.h"
-#include "../base/threading.h"
-#include "../collection/List.h"
+#include "../../base/threading.h"
+#include "../../collection/List.h"
 
 namespace dsr {
 
diff --git a/Source/DFPSR/render/shader/RgbaMultiply.h b/Source/DFPSR/implementation/render/shader/RgbaMultiply.h
similarity index 100%
rename from Source/DFPSR/render/shader/RgbaMultiply.h
rename to Source/DFPSR/implementation/render/shader/RgbaMultiply.h
diff --git a/Source/DFPSR/render/shader/Shader.h b/Source/DFPSR/implementation/render/shader/Shader.h
similarity index 100%
rename from Source/DFPSR/render/shader/Shader.h
rename to Source/DFPSR/implementation/render/shader/Shader.h
diff --git a/Source/DFPSR/render/shader/fillerTemplates.h b/Source/DFPSR/implementation/render/shader/fillerTemplates.h
similarity index 99%
rename from Source/DFPSR/render/shader/fillerTemplates.h
rename to Source/DFPSR/implementation/render/shader/fillerTemplates.h
index 5d1bd9a8..232fdde8 100644
--- a/Source/DFPSR/render/shader/fillerTemplates.h
+++ b/Source/DFPSR/implementation/render/shader/fillerTemplates.h
@@ -25,7 +25,7 @@
 #define DFPSR_RENDER_FILLER_TEMPLATES
 
 #include <cstdint>
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 #include "../ITriangle2D.h"
 #include "shaderTypes.h"
 
diff --git a/Source/DFPSR/render/shader/includeShader.h b/Source/DFPSR/implementation/render/shader/includeShader.h
similarity index 100%
rename from Source/DFPSR/render/shader/includeShader.h
rename to Source/DFPSR/implementation/render/shader/includeShader.h
diff --git a/Source/DFPSR/render/shader/shaderMethods.h b/Source/DFPSR/implementation/render/shader/shaderMethods.h
similarity index 95%
rename from Source/DFPSR/render/shader/shaderMethods.h
rename to Source/DFPSR/implementation/render/shader/shaderMethods.h
index a39fcb2c..a368f4ae 100755
--- a/Source/DFPSR/render/shader/shaderMethods.h
+++ b/Source/DFPSR/implementation/render/shader/shaderMethods.h
@@ -25,10 +25,10 @@
 #define DFPSR_RENDER_SHADER_METHODS
 
 #include <cstdint>
-#include "../../math/FVector.h"
+#include "../../../math/FVector.h"
 #include "../../math/scalar.h"
-#include "../../base/simd3D.h"
-#include "../../api/textureAPI.h"
+#include "../../../base/simd3D.h"
+#include "../../../api/textureAPI.h"
 #include "shaderTypes.h"
 #include "../constants.h"
 
diff --git a/Source/DFPSR/render/shader/shaderTypes.h b/Source/DFPSR/implementation/render/shader/shaderTypes.h
similarity index 96%
rename from Source/DFPSR/render/shader/shaderTypes.h
rename to Source/DFPSR/implementation/render/shader/shaderTypes.h
index 4bec475b..7a5cdfad 100755
--- a/Source/DFPSR/render/shader/shaderTypes.h
+++ b/Source/DFPSR/implementation/render/shader/shaderTypes.h
@@ -25,7 +25,7 @@
 #define DFPSR_RENDER_SHADER_TYPES
 
 #include <cstdint>
-#include "../../base/simd.h"
+#include "../../../base/simd.h"
 #include "../../image/PackOrder.h"
 
 namespace dsr {
diff --git a/Source/DFPSR/includeFramework.h b/Source/DFPSR/includeFramework.h
index 415b049e..b7a7e35b 100644
--- a/Source/DFPSR/includeFramework.h
+++ b/Source/DFPSR/includeFramework.h
@@ -25,8 +25,5 @@
 	#include "api/algorithmAPI.h" // Functions for performing operations on whole collections
 	#include "api/timeAPI.h" // Methods for time and delays
 	#include "api/configAPI.h" // Making it easy to load your application's settings from configuration files
-
-	// TODO: Create more APIs
-	#include "gui/VisualTheme.h" // An unfinished system for changing how the GUI looks
-
+	#include "api/randomAPI.h" // Deterministic random number generation
 #endif
diff --git a/Source/DFPSR/math/includeMath.h b/Source/DFPSR/math/includeMath.h
index 09b4b662..bd675f8d 100644
--- a/Source/DFPSR/math/includeMath.h
+++ b/Source/DFPSR/math/includeMath.h
@@ -10,6 +10,4 @@
 #include "FMatrix3x3.h"
 #include "Transform3D.h"
 #include "FPlane3D.h"
-#include "scalar.h"
 #include "FixedPoint.h"
-
diff --git a/Source/SDK/SpriteEngine/spriteAPI.cpp b/Source/SDK/SpriteEngine/spriteAPI.cpp
index ef94be41..8b7af184 100644
--- a/Source/SDK/SpriteEngine/spriteAPI.cpp
+++ b/Source/SDK/SpriteEngine/spriteAPI.cpp
@@ -1,11 +1,14 @@
 
+// Use headers in the DFPSR/implementation folder at your own risk.
+//   They are not a part of the public interface and may change without warning.
+
 #include "spriteAPI.h"
 #include "Octree.h"
 #include "DirtyRectangles.h"
 #include "importer.h"
-#include "../../DFPSR/render/ITriangle2D.h"
+#include "../../DFPSR/implementation/render/ITriangle2D.h"
 #include "../../DFPSR/base/endian.h"
-#include "../../DFPSR/math/scalar.h"
+#include "../../DFPSR/implementation/math/scalar.h"
 #include "../../DFPSR/api/fileAPI.h"
 
 // Comment out a flag to disable an optimization when debugging
diff --git a/Source/soundManagers/WinMMSound.cpp b/Source/soundManagers/WinMMSound.cpp
index fc3c0463..c7a4c651 100644
--- a/Source/soundManagers/WinMMSound.cpp
+++ b/Source/soundManagers/WinMMSound.cpp
@@ -4,7 +4,7 @@
 #include "soundManagers.h"
 #include <windows.h>
 #include <mmsystem.h>
-#include "../DFPSR/math/scalar.h"
+#include "../DFPSR/implementation/math/scalar.h"
 #include "../DFPSR/base/simd.h"
 
 using namespace dsr;
diff --git a/Source/test/tests/FlexTest.cpp b/Source/test/tests/FlexTest.cpp
index ab3fb5c0..e274d134 100644
--- a/Source/test/tests/FlexTest.cpp
+++ b/Source/test/tests/FlexTest.cpp
@@ -1,6 +1,6 @@
 
 #include "../testTools.h"
-#include "../../DFPSR/gui/FlexRegion.h"
+#include "../../DFPSR/implementation/gui/FlexRegion.h"
 
 START_TEST(Flex)
 	// Comparisons
diff --git a/Source/test/tests/PersistentTest.cpp b/Source/test/tests/PersistentTest.cpp
index 7f676f2f..fd1d941c 100644
--- a/Source/test/tests/PersistentTest.cpp
+++ b/Source/test/tests/PersistentTest.cpp
@@ -1,6 +1,6 @@
 
 #include "../testTools.h"
-#include "../../DFPSR/persistent/includePersistent.h"
+#include "../../DFPSR/implementation/persistent/includePersistent.h"
 
 // -------- Test example below --------
 
diff --git a/Source/windowManagers/NoWindow.cpp b/Source/windowManagers/NoWindow.cpp
index 41b4b2f8..a2dc05da 100644
--- a/Source/windowManagers/NoWindow.cpp
+++ b/Source/windowManagers/NoWindow.cpp
@@ -1,6 +1,6 @@
 
 #include "../DFPSR/base/Handle.h"
-#include "../DFPSR/gui/BackendWindow.h"
+#include "../DFPSR/implementation/gui/BackendWindow.h"
 #include "../DFPSR/api/stringAPI.h"
 
 dsr::Handle<dsr::BackendWindow> createBackendWindow(const dsr::String& title, int width, int height) {
diff --git a/Source/windowManagers/Win32Window.cpp b/Source/windowManagers/Win32Window.cpp
index 3f0b7b0e..c13c392f 100644
--- a/Source/windowManagers/Win32Window.cpp
+++ b/Source/windowManagers/Win32Window.cpp
@@ -15,7 +15,7 @@ Link to these dependencies for MS Windows:
 #include "../DFPSR/api/drawAPI.h"
 #include "../DFPSR/api/bufferAPI.h"
 #include "../DFPSR/api/timeAPI.h"
-#include "../DFPSR/gui/BackendWindow.h"
+#include "../DFPSR/implementation/gui/BackendWindow.h"
 
 #include "../DFPSR/settings.h"
 
diff --git a/Source/windowManagers/X11Window.cpp b/Source/windowManagers/X11Window.cpp
index ee572134..8f173826 100644
--- a/Source/windowManagers/X11Window.cpp
+++ b/Source/windowManagers/X11Window.cpp
@@ -8,7 +8,7 @@
 #include "../DFPSR/api/imageAPI.h"
 #include "../DFPSR/api/drawAPI.h"
 #include "../DFPSR/api/timeAPI.h"
-#include "../DFPSR/gui/BackendWindow.h"
+#include "../DFPSR/implementation/gui/BackendWindow.h"
 #include "../DFPSR/base/heap.h"
 #include <climits>