diff --git a/demos/calc.cpp b/demos/calc.cpp
index 66031d2..1c4def8 100644
--- a/demos/calc.cpp
+++ b/demos/calc.cpp
@@ -1,5 +1,5 @@
-#include "sfml/backend.hpp"
-#include "sfml/components.hpp"
+#include "sfmlbackend/backend.hpp"
+#include "sfmlbackend/components.hpp"
 #include "guecs.hpp"
 #include <fmt/xchar.h>
 #include <deque>
diff --git a/include/guecs.hpp b/include/guecs.hpp
index c0a61e8..9d2e48f 100644
--- a/include/guecs.hpp
+++ b/include/guecs.hpp
@@ -8,7 +8,7 @@
 #include <queue>
 #include <typeindex>
 #include <unordered_map>
-#include "sfml/components.hpp"
+#include "sfmlbackend/components.hpp"
 
 namespace guecs {
   using std::shared_ptr, std::wstring, std::string;
diff --git a/include/sfml/backend.hpp b/include/sfmlbackend/backend.hpp
similarity index 100%
rename from include/sfml/backend.hpp
rename to include/sfmlbackend/backend.hpp
diff --git a/include/sfml/color.hpp b/include/sfmlbackend/color.hpp
similarity index 100%
rename from include/sfml/color.hpp
rename to include/sfmlbackend/color.hpp
diff --git a/include/sfml/components.hpp b/include/sfmlbackend/components.hpp
similarity index 98%
rename from include/sfml/components.hpp
rename to include/sfmlbackend/components.hpp
index 6e86ffa..68003ac 100644
--- a/include/sfml/components.hpp
+++ b/include/sfmlbackend/components.hpp
@@ -2,7 +2,7 @@
 #include <SFML/Graphics.hpp>
 
 #include "dbc.hpp"
-#include "sfml/color.hpp"
+#include "sfmlbackend/color.hpp"
 #include "lel.hpp"
 #include <string>
 #include <memory>
diff --git a/include/sfml/config.hpp b/include/sfmlbackend/config.hpp
similarity index 100%
rename from include/sfml/config.hpp
rename to include/sfmlbackend/config.hpp
diff --git a/include/sfml/shaders.hpp b/include/sfmlbackend/shaders.hpp
similarity index 100%
rename from include/sfml/shaders.hpp
rename to include/sfmlbackend/shaders.hpp
diff --git a/include/sfml/sound.hpp b/include/sfmlbackend/sound.hpp
similarity index 100%
rename from include/sfml/sound.hpp
rename to include/sfmlbackend/sound.hpp
diff --git a/include/sfml/textures.hpp b/include/sfmlbackend/textures.hpp
similarity index 100%
rename from include/sfml/textures.hpp
rename to include/sfmlbackend/textures.hpp
diff --git a/meson.build b/meson.build
index e4926e3..2212951 100644
--- a/meson.build
+++ b/meson.build
@@ -72,15 +72,15 @@ sources = [
   'src/dbc.cpp',
   'src/guecs.cpp',
   'src/lel.cpp',
-  'src/sfml/components.cpp',
+  'src/sfmlbackend/components.cpp',
 ]
 
 sfml_impl = [
-  'src/sfml/config.cpp',
-  'src/sfml/backend.cpp',
-  'src/sfml/shaders.cpp',
-  'src/sfml/sound.cpp',
-  'src/sfml/textures.cpp',
+  'src/sfmlbackend/config.cpp',
+  'src/sfmlbackend/backend.cpp',
+  'src/sfmlbackend/shaders.cpp',
+  'src/sfmlbackend/sound.cpp',
+  'src/sfmlbackend/textures.cpp',
 ]
 
 lel_guecs_inc = include_directories('include')
@@ -97,9 +97,11 @@ lel_guecs_dep = declare_dependency(
   link_with: lel_guecs_lib,
   include_directories: lel_guecs_inc)
 
-executable('runtests', [
-  'src/sfml/config.cpp',
+executable('runtests', sfml_impl + [
   'tests/lel.cpp',
+  'tests/shaders.cpp',
+  'tests/sound.cpp',
+  'tests/textures.cpp',
   'tests/guecs.cpp',
   ],
   cpp_args: cpp_args,
@@ -109,12 +111,12 @@ executable('runtests', [
   link_with: [lel_guecs_lib],
   dependencies: dependencies + [catch2])
 
-#executable('calc', sfml_impl + [
-#  'demos/calc.cpp',
-#  ],
-#  cpp_args: cpp_args,
-#  link_args: link_args,
-#  override_options: exe_defaults,
-#  include_directories: lel_guecs_inc,
-#  link_with: [lel_guecs_lib],
-#  dependencies: dependencies)
+executable('calc', sfml_impl + [
+  'demos/calc.cpp',
+  ],
+  cpp_args: cpp_args,
+  link_args: link_args,
+  override_options: exe_defaults,
+  include_directories: lel_guecs_inc,
+  link_with: [lel_guecs_lib],
+  dependencies: dependencies)
diff --git a/src/sfml/backend.cpp b/src/sfmlbackend/backend.cpp
similarity index 83%
rename from src/sfml/backend.cpp
rename to src/sfmlbackend/backend.cpp
index 049ecc1..55fea91 100644
--- a/src/sfml/backend.cpp
+++ b/src/sfmlbackend/backend.cpp
@@ -1,7 +1,7 @@
-#include "sfml/backend.hpp"
-#include "sfml/shaders.hpp"
-#include "sfml/sound.hpp"
-#include "sfml/textures.hpp"
+#include "sfmlbackend/backend.hpp"
+#include "sfmlbackend/shaders.hpp"
+#include "sfmlbackend/sound.hpp"
+#include "sfmlbackend/textures.hpp"
 
 namespace sfml {
   guecs::SpriteTexture Backend::texture_get(const string& name) {
diff --git a/src/sfml/components.cpp b/src/sfmlbackend/components.cpp
similarity index 99%
rename from src/sfml/components.cpp
rename to src/sfmlbackend/components.cpp
index 5e917e6..2410ce9 100644
--- a/src/sfml/components.cpp
+++ b/src/sfmlbackend/components.cpp
@@ -1,5 +1,5 @@
 #include "guecs.hpp"
-#include "sfml/backend.hpp"
+#include "sfmlbackend/backend.hpp"
 
 namespace guecs {
   static Backend* BACKEND = nullptr;
diff --git a/src/sfml/config.cpp b/src/sfmlbackend/config.cpp
similarity index 97%
rename from src/sfml/config.cpp
rename to src/sfmlbackend/config.cpp
index 21a73cf..de4756f 100644
--- a/src/sfml/config.cpp
+++ b/src/sfmlbackend/config.cpp
@@ -1,4 +1,4 @@
-#include "sfml/config.hpp"
+#include "sfmlbackend/config.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
 
diff --git a/src/sfml/shaders.cpp b/src/sfmlbackend/shaders.cpp
similarity index 96%
rename from src/sfml/shaders.cpp
rename to src/sfmlbackend/shaders.cpp
index e2c6c76..3559a95 100644
--- a/src/sfml/shaders.cpp
+++ b/src/sfmlbackend/shaders.cpp
@@ -1,8 +1,8 @@
-#include "sfml/shaders.hpp"
+#include "sfmlbackend/shaders.hpp"
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "sfml/config.hpp"
+#include "sfmlbackend/config.hpp"
 #include <memory>
 
 namespace shaders {
diff --git a/src/sfml/sound.cpp b/src/sfmlbackend/sound.cpp
similarity index 96%
rename from src/sfml/sound.cpp
rename to src/sfmlbackend/sound.cpp
index f3f558c..8d6ed72 100644
--- a/src/sfml/sound.cpp
+++ b/src/sfmlbackend/sound.cpp
@@ -1,7 +1,7 @@
-#include "sfml/sound.hpp"
+#include "sfmlbackend/sound.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "sfml/config.hpp"
+#include "sfmlbackend/config.hpp"
 
 namespace sound {
   static SoundManager SMGR;
diff --git a/src/sfml/textures.cpp b/src/sfmlbackend/textures.cpp
similarity index 95%
rename from src/sfml/textures.cpp
rename to src/sfmlbackend/textures.cpp
index 48ef7df..0525e63 100644
--- a/src/sfml/textures.cpp
+++ b/src/sfmlbackend/textures.cpp
@@ -1,8 +1,8 @@
-#include "sfml/textures.hpp"
+#include "sfmlbackend/textures.hpp"
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "sfml/config.hpp"
+#include "sfmlbackend/config.hpp"
 #include <memory>
 
 namespace textures {
diff --git a/tests/shaders.cpp b/tests/shaders.cpp
index 79b9e71..09e5db2 100644
--- a/tests/shaders.cpp
+++ b/tests/shaders.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfml/shaders.hpp"
+#include "sfmlbackend/shaders.hpp"
 
 using namespace fmt;
 
diff --git a/tests/sound.cpp b/tests/sound.cpp
index 09d7329..0d0e4c0 100644
--- a/tests/sound.cpp
+++ b/tests/sound.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfml/sound.hpp"
+#include "sfmlbackend/sound.hpp"
 
 using namespace fmt;
 
diff --git a/tests/textures.cpp b/tests/textures.cpp
index 4ead2c0..e966a6b 100644
--- a/tests/textures.cpp
+++ b/tests/textures.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfml/textures.hpp"
+#include "sfmlbackend/textures.hpp"
 
 using namespace fmt;