diff --git a/.nix/derivation.nix b/.nix/derivation.nix
index d709d84..3e6b53f 100644
--- a/.nix/derivation.nix
+++ b/.nix/derivation.nix
@@ -23,7 +23,9 @@ stdenvNoCC.mkDerivation {
   ];
 
   buildInputs = [
-    forstio
+    forstio.core
+    forstio.async
+    forstio.io
     xorg.libxcb
     xorg.libX11
     libGL
diff --git a/SConstruct b/SConstruct
index aa8a463..894eb47 100644
--- a/SConstruct
+++ b/SConstruct
@@ -42,11 +42,11 @@ env_vars.Add('prefix',
 	validator=isAbsolutePath
 )
 
-env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=['#source','#','#driver'],
+env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=['#source','#driver'],
     CXX='clang++',
     CPPDEFINES=['SAW_UNIX_XCB'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
-    LIBS=['forstio','xcb','X11','X11-xcb'])
+    LIBS=['forstio-core','forstio-async','forstio-io','xcb','X11','X11-xcb'])
 env.__class__.add_source_files = add_kel_source_files
 env.Tool('compilation_db');
 env.cdb = env.CompilationDatabase('compile_commands.json');
diff --git a/default.nix b/default.nix
index 7d4feba..2d9d737 100644
--- a/default.nix
+++ b/default.nix
@@ -1,18 +1,24 @@
-{ pkgs ? import <nixpkgs> {
-  overlays = [
-    (import ((builtins.fetchGit {
-      url = "gitea@git.keldu.de:nixos/kelducfg.git";
-      ref = "master";
-    }).outPath + "/overlays/default.nix"))
-  ];
-}
+{ pkgs ? import <nixpkgs> {}
 }:
 
 let
-  forstio = import ((builtins.fetchGit {
-    url = "gitea@git.keldu.de:forstio/forstio.git";
-    ref = "dev";
-  }).outPath + "/default.nix") {};
+  forstio = { 
+    core =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-core.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+    async =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-async.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+    io =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-io.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+  };
 in
 pkgs.callPackage ./.nix/derivation.nix {
   inherit forstio;
diff --git a/driver/device_xcb.h b/driver/device_xcb.h
index bab53c1..2a9a39c 100644
--- a/driver/device_xcb.h
+++ b/driver/device_xcb.h
@@ -2,7 +2,7 @@
 
 #include <X11/Xlib-xcb.h>
 #include <X11/Xlib.h>
-#include <forstio/io.h>
+#include <forstio/io/io.h>
 #include <xcb/xcb.h>
 
 #include <map>
diff --git a/source/forstio/window/device.h b/source/forstio/window/device.h
index 1667997..fe2fd2c 100644
--- a/source/forstio/window/device.h
+++ b/source/forstio/window/device.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 #include <forstio/common.h>
 
 #include <string_view>
diff --git a/source/forstio/window/gl/gl_window.h b/source/forstio/window/gl/gl_window.h
index df4fe5b..1b6a188 100644
--- a/source/forstio/window/gl/gl_window.h
+++ b/source/forstio/window/gl/gl_window.h
@@ -3,7 +3,7 @@
 #include "../video_mode.h"
 #include "../window.h"
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 
 #include <string_view>
 
diff --git a/source/forstio/window/window.h b/source/forstio/window/window.h
index adad79b..2252c63 100644
--- a/source/forstio/window/window.h
+++ b/source/forstio/window/window.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 #include <forstio/common.h>
 
 #include <string_view>