diff --git a/doc/tutorial/12_voronoi.cpp b/doc/tutorial/12_voronoi.cpp
index 9fa13916..3e1c710c 100644
--- a/doc/tutorial/12_voronoi.cpp
+++ b/doc/tutorial/12_voronoi.cpp
@@ -67,7 +67,6 @@ public:
         m_timer = -1.0f;
         mode = 0;
         m_controller = new Controller("Default");
-        m_controller->SetInputCount(KEY_MAX, 0);
         m_controller->GetKey(KEY_ESC).Bind("Keyboard", "Escape");
         m_controller->GetKey(KEY_PUSH).Bind("Keyboard", "p");
         m_controller->GetKey(KEY_POP).Bind("Keyboard", "o");
diff --git a/src/Makefile.am b/src/Makefile.am
index dad8ea6a..b4229e31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,8 +141,8 @@ liblol_core_sources = \
 
 if LOL_USE_SDL
 sdl_sources = \
-    platform/sdl/sdlapp.cpp platform/sdl/sdlapp.h \
-    platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h
+    application/sdl-app.cpp application/sdl-app.h \
+    input/sdl-input.cpp input/sdl-input.h
 endif
 
 d3d9_sources = \
diff --git a/src/application/application.cpp b/src/application/application.cpp
index e59165c4..da8a66e8 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -21,8 +21,7 @@
 #if __ANDROID__
 #   include "platform/android/androidapp.h"
 #elif LOL_USE_SDL
-#   include "platform/sdl/sdlapp.h"
-#   include "platform/sdl/sdlinput.h"
+#   include "application/sdl-app.h"
 #elif HAVE_GLES_2X
 #   include "eglapp.h"
 #endif
diff --git a/src/platform/sdl/sdlapp.cpp b/src/application/sdl-app.cpp
similarity index 98%
rename from src/platform/sdl/sdlapp.cpp
rename to src/application/sdl-app.cpp
index 204dbb2a..d7857b33 100644
--- a/src/platform/sdl/sdlapp.cpp
+++ b/src/application/sdl-app.cpp
@@ -21,8 +21,8 @@
 #endif
 
 #include "lolgl.h"
-#include "platform/sdl/sdlapp.h"
-#include "platform/sdl/sdlinput.h"
+#include "application/sdl-app.h"
+#include "input/sdl-input.h"
 #if LOL_USE_XINPUT
 #   include "platform/d3d9/d3d9input.h"
 #endif
diff --git a/src/platform/sdl/sdlapp.h b/src/application/sdl-app.h
similarity index 100%
rename from src/platform/sdl/sdlapp.h
rename to src/application/sdl-app.h
diff --git a/src/eglapp.cpp b/src/eglapp.cpp
index edff7f1f..357988ec 100644
--- a/src/eglapp.cpp
+++ b/src/eglapp.cpp
@@ -27,18 +27,11 @@
 #endif
 
 #if LOL_USE_SDL
-#   if HAVE_SDL2_SDL_H
-#      include <SDL2/SDL.h>
-#   elif HAVE_SDL_H
-#      include <SDL.h>
-#   endif
+#   include "input/sdl-input.h"
 #endif
 
 #include "lolgl.h"
 #include "eglapp.h"
-#if LOL_USE_SDL
-#   include "platform/sdl/sdlinput.h"
-#endif
 
 namespace lol
 {
diff --git a/src/platform/sdl/sdlinput.cpp b/src/input/sdl-input.cpp
similarity index 99%
rename from src/platform/sdl/sdlinput.cpp
rename to src/input/sdl-input.cpp
index 1070f9eb..d0d78f06 100644
--- a/src/platform/sdl/sdlinput.cpp
+++ b/src/input/sdl-input.cpp
@@ -23,9 +23,8 @@
 #   include <emscripten/html5.h>
 #endif
 
-#include "sdlinput.h"
-
 #include "input/input_internal.h"
+#include "input/sdl-input.h"
 
 /* We force joystick polling because no events are received when
  * there is no SDL display (eg. on the Raspberry Pi). */
diff --git a/src/platform/sdl/sdlinput.h b/src/input/sdl-input.h
similarity index 100%
rename from src/platform/sdl/sdlinput.h
rename to src/input/sdl-input.h
diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj
index 9266791d..35138b77 100644
--- a/src/lol-core.vcxproj
+++ b/src/lol-core.vcxproj
@@ -81,6 +81,9 @@
     <ClCompile Include="3rdparty\imgui\imgui_draw.cpp" />
     <ClCompile Include="3rdparty\imgui\imgui_widgets.cpp" />
     <ClCompile Include="application\application.cpp" />
+    <ClCompile Include="application\sdl-app.cpp">
+      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="audio\audio.cpp" />
     <ClCompile Include="audio\sample.cpp" />
     <ClCompile Include="camera.cpp" />
@@ -148,6 +151,9 @@
     <ClCompile Include="image\resource.cpp" />
     <ClCompile Include="input\controller.cpp" />
     <ClCompile Include="input\input.cpp" />
+    <ClCompile Include="input\sdl-input.cpp">
+      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="light.cpp" />
     <ClCompile Include="lolimgui.cpp" />
     <ClCompile Include="lolua\baselua.cpp" />
@@ -162,12 +168,6 @@
     <ClCompile Include="messageservice.cpp" />
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="platform\d3d9\d3d9input.cpp" />
-    <ClCompile Include="platform\sdl\sdlapp.cpp">
-      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="platform\sdl\sdlinput.cpp">
-      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="profiler.cpp" />
     <ClCompile Include="scene.cpp" />
     <ClCompile Include="sprite.cpp" />
@@ -182,6 +182,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application\application.h" />
+    <ClInclude Include="application\sdl-app.h">
+      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="camera.h" />
     <ClInclude Include="commandstack.h" />
     <ClInclude Include="debug\fps.h" />
@@ -206,6 +209,9 @@
     <ClInclude Include="input\input.h" />
     <ClInclude Include="input\input_internal.h" />
     <ClInclude Include="input\keys.h" />
+    <ClInclude Include="input\sdl-input.h">
+      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="light.h" />
     <ClInclude Include="loldebug.h" />
     <ClInclude Include="lolgl.h" />
@@ -280,12 +286,6 @@
     <ClInclude Include="numeric.h" />
     <ClInclude Include="platform.h" />
     <ClInclude Include="platform\d3d9\d3d9input.h" />
-    <ClInclude Include="platform\sdl\sdlapp.h">
-      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="platform\sdl\sdlinput.h">
-      <ExcludedFromBuild Condition="'$(enable_sdl)'=='no'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="profiler.h" />
     <ClInclude Include="scene.h" />
     <ClInclude Include="sprite.h" />
diff --git a/src/lol-core.vcxproj.filter b/src/lol-core.vcxproj.filter
index 08fe0858..922c2998 100644
--- a/src/lol-core.vcxproj.filter
+++ b/src/lol-core.vcxproj.filter
@@ -120,11 +120,11 @@
     <ClCompile Include="debug\stats.cpp">
       <Filter>debug</Filter>
     </ClCompile>
-    <ClCompile Include="platform\sdl\sdlapp.cpp">
-      <Filter>platform\sdl</Filter>
+    <ClCompile Include="application\sdl-app.cpp">
+      <Filter>application</Filter>
     </ClCompile>
-    <ClCompile Include="platform\sdl\sdlinput.cpp">
-      <Filter>platform\sdl</Filter>
+    <ClCompile Include="input\sdl-input.cpp">
+      <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="math\half.cpp">
       <Filter>math</Filter>
@@ -396,11 +396,11 @@
     <ClInclude Include="debug\stats.h">
       <Filter>debug</Filter>
     </ClInclude>
-    <ClInclude Include="platform\sdl\sdlinput.h">
-      <Filter>platform\sdl</Filter>
+    <ClInclude Include="input\sdl-input.h">
+      <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="platform\sdl\sdlapp.h">
-      <Filter>platform\sdl</Filter>
+    <ClInclude Include="application\sdl-app.h">
+      <Filter>application</Filter>
     </ClInclude>
     <ClInclude Include="lol\algorithm\all.h">
       <Filter>lol\algorithm</Filter>