69 files changed, 10 insertions, 10 deletions

diff --git a/SConstruct b/SConstruct
index e4c4f99..015645b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -57,7 +57,7 @@ env.headers = [];
 env.targets = [];
 
 Export('env')
-SConscript('src/SConscript')
+SConscript('c++/SConscript')
 
 env.Alias('cdb', env.cdb);
 env.Alias('all', [env.targets]);
diff --git a/src/SConscript b/c++/SConscript
index 8da5a3d..8da5a3d 100644
--- a/src/SConscript
+++ b/c++/SConscript
diff --git a/src/async/.nix/derivation.nix b/c++/async/.nix/derivation.nix
index b1c6ecc..b1c6ecc 100644
--- a/src/async/.nix/derivation.nix
+++ b/c++/async/.nix/derivation.nix
diff --git a/src/async/SConscript b/c++/async/SConscript
index 69f8950..69f8950 100644
--- a/src/async/SConscript
+++ b/c++/async/SConscript
diff --git a/src/async/SConstruct b/c++/async/SConstruct
index 0d7b7c6..0d7b7c6 100644
--- a/src/async/SConstruct
+++ b/c++/async/SConstruct
diff --git a/src/async/async.cpp b/c++/async/async.cpp
index 360e455..360e455 100644
--- a/src/async/async.cpp
+++ b/c++/async/async.cpp
diff --git a/src/async/async.h b/c++/async/async.h
index 8190be0..8190be0 100644
--- a/src/async/async.h
+++ b/c++/async/async.h
diff --git a/src/async/async.tmpl.h b/c++/async/async.tmpl.h
index 9569f60..9569f60 100644
--- a/src/async/async.tmpl.h
+++ b/c++/async/async.tmpl.h
diff --git a/src/codec-json/.nix/derivation.nix b/c++/codec-json/.nix/derivation.nix
index 0f701c9..0f701c9 100644
--- a/src/codec-json/.nix/derivation.nix
+++ b/c++/codec-json/.nix/derivation.nix
diff --git a/src/codec-json/SConscript b/c++/codec-json/SConscript
index 772ac0b..772ac0b 100644
--- a/src/codec-json/SConscript
+++ b/c++/codec-json/SConscript
diff --git a/src/codec-json/SConstruct b/c++/codec-json/SConstruct
index edd5f57..edd5f57 100644
--- a/src/codec-json/SConstruct
+++ b/c++/codec-json/SConstruct
diff --git a/src/codec-json/json.h b/c++/codec-json/json.h
index 1fe6bb5..1fe6bb5 100644
--- a/src/codec-json/json.h
+++ b/c++/codec-json/json.h
diff --git a/src/codec-json/json.tmpl.h b/c++/codec-json/json.tmpl.h
index 4b3a1a2..4b3a1a2 100644
--- a/src/codec-json/json.tmpl.h
+++ b/c++/codec-json/json.tmpl.h
diff --git a/src/codec/.nix/derivation.nix b/c++/codec/.nix/derivation.nix
index 768dc6e..768dc6e 100644
--- a/src/codec/.nix/derivation.nix
+++ b/c++/codec/.nix/derivation.nix
diff --git a/src/codec/SConscript b/c++/codec/SConscript
index c038d42..c038d42 100644
--- a/src/codec/SConscript
+++ b/c++/codec/SConscript
diff --git a/src/codec/SConstruct b/c++/codec/SConstruct
index 0d7b7c6..0d7b7c6 100644
--- a/src/codec/SConstruct
+++ b/c++/codec/SConstruct
diff --git a/src/codec/data.h b/c++/codec/data.h
index 8ff06dc..8ff06dc 100644
--- a/src/codec/data.h
+++ b/c++/codec/data.h
diff --git a/src/codec/forst.h b/c++/codec/forst.h
index cadf78e..cadf78e 100644
--- a/src/codec/forst.h
+++ b/c++/codec/forst.h
diff --git a/src/codec/schema.h b/c++/codec/schema.h
index 2f63fe9..2f63fe9 100644
--- a/src/codec/schema.h
+++ b/c++/codec/schema.h
diff --git a/src/codec/simple.h b/c++/codec/simple.h
index 8760754..8760754 100644
--- a/src/codec/simple.h
+++ b/c++/codec/simple.h
diff --git a/src/codec/stream_value.h b/c++/codec/stream_value.h
index 09203cb..09203cb 100644
--- a/src/codec/stream_value.h
+++ b/c++/codec/stream_value.h
diff --git a/src/core/.nix/derivation.nix b/c++/core/.nix/derivation.nix
index 26acd3d..26acd3d 100644
--- a/src/core/.nix/derivation.nix
+++ b/c++/core/.nix/derivation.nix
diff --git a/src/core/SConscript b/c++/core/SConscript
index 04eb4c3..04eb4c3 100644
--- a/src/core/SConscript
+++ b/c++/core/SConscript
diff --git a/src/core/SConstruct b/c++/core/SConstruct
index 865d131..865d131 100644
--- a/src/core/SConstruct
+++ b/c++/core/SConstruct
diff --git a/src/core/buffer.cpp b/c++/core/buffer.cpp
index 15f4cae..15f4cae 100644
--- a/src/core/buffer.cpp
+++ b/c++/core/buffer.cpp
diff --git a/src/core/buffer.h b/c++/core/buffer.h
index f0cf76e..f0cf76e 100644
--- a/src/core/buffer.h
+++ b/c++/core/buffer.h
diff --git a/src/core/common.h b/c++/core/common.h
index a06c238..a06c238 100644
--- a/src/core/common.h
+++ b/c++/core/common.h
diff --git a/src/core/error.cpp b/c++/core/error.cpp
index 360e628..360e628 100644
--- a/src/core/error.cpp
+++ b/c++/core/error.cpp
diff --git a/src/core/error.h b/c++/core/error.h
index e816734..e816734 100644
--- a/src/core/error.h
+++ b/c++/core/error.h
diff --git a/src/core/string_literal.h b/c++/core/string_literal.h
index d530a54..d530a54 100644
--- a/src/core/string_literal.h
+++ b/c++/core/string_literal.h
diff --git a/src/core/templates.h b/c++/core/templates.h
index 39befc1..39befc1 100644
--- a/src/core/templates.h
+++ b/c++/core/templates.h
diff --git a/src/io-tls/.nix/derivation.nix b/c++/io-tls/.nix/derivation.nix
index a08b195..a08b195 100644
--- a/src/io-tls/.nix/derivation.nix
+++ b/c++/io-tls/.nix/derivation.nix
diff --git a/src/io-tls/SConscript b/c++/io-tls/SConscript
index 4f88f37..4f88f37 100644
--- a/src/io-tls/SConscript
+++ b/c++/io-tls/SConscript
diff --git a/src/io-tls/SConstruct b/c++/io-tls/SConstruct
index fbd8657..fbd8657 100644
--- a/src/io-tls/SConstruct
+++ b/c++/io-tls/SConstruct
diff --git a/src/io-tls/tls.cpp b/c++/io-tls/tls.cpp
index 9fa143c..9fa143c 100644
--- a/src/io-tls/tls.cpp
+++ b/c++/io-tls/tls.cpp
diff --git a/src/io-tls/tls.h b/c++/io-tls/tls.h
index 74b39ff..74b39ff 100644
--- a/src/io-tls/tls.h
+++ b/c++/io-tls/tls.h
diff --git a/src/io/.nix/derivation.nix b/c++/io/.nix/derivation.nix
index 39d7568..39d7568 100644
--- a/src/io/.nix/derivation.nix
+++ b/c++/io/.nix/derivation.nix
diff --git a/src/io/SConscript b/c++/io/SConscript
index 62ad58a..62ad58a 100644
--- a/src/io/SConscript
+++ b/c++/io/SConscript
diff --git a/src/io/SConstruct b/c++/io/SConstruct
index 4cccf82..4cccf82 100644
--- a/src/io/SConstruct
+++ b/c++/io/SConstruct
diff --git a/src/io/io.cpp b/c++/io/io.cpp
index f0705d2..f0705d2 100644
--- a/src/io/io.cpp
+++ b/c++/io/io.cpp
diff --git a/src/io/io.h b/c++/io/io.h
index 7653ace..7653ace 100644
--- a/src/io/io.h
+++ b/c++/io/io.h
diff --git a/src/io/io_helpers.cpp b/c++/io/io_helpers.cpp
index c2cf2be..c2cf2be 100644
--- a/src/io/io_helpers.cpp
+++ b/c++/io/io_helpers.cpp
diff --git a/src/io/io_helpers.h b/c++/io/io_helpers.h
index 94e37f4..94e37f4 100644
--- a/src/io/io_helpers.h
+++ b/c++/io/io_helpers.h
diff --git a/src/io/io_unix.cpp b/c++/io/io_unix.cpp
index c3b4f17..c3b4f17 100644
--- a/src/io/io_unix.cpp
+++ b/c++/io/io_unix.cpp
diff --git a/src/io_codec/.nix/derivation.nix b/c++/io_codec/.nix/derivation.nix
index 2ea0913..2ea0913 100644
--- a/src/io_codec/.nix/derivation.nix
+++ b/c++/io_codec/.nix/derivation.nix
diff --git a/src/io_codec/SConscript b/c++/io_codec/SConscript
index 0afd6d6..0afd6d6 100644
--- a/src/io_codec/SConscript
+++ b/c++/io_codec/SConscript
diff --git a/src/io_codec/SConstruct b/c++/io_codec/SConstruct
index 4e6e150..4e6e150 100644
--- a/src/io_codec/SConstruct
+++ b/c++/io_codec/SConstruct
diff --git a/src/io_codec/io_peer.h b/c++/io_codec/io_peer.h
index b9a4b34..b9a4b34 100644
--- a/src/io_codec/io_peer.h
+++ b/c++/io_codec/io_peer.h
diff --git a/src/io_codec/io_peer.tmpl.h b/c++/io_codec/io_peer.tmpl.h
index 880a58a..880a58a 100644
--- a/src/io_codec/io_peer.tmpl.h
+++ b/c++/io_codec/io_peer.tmpl.h
diff --git a/src/test/.nix/derivation.nix b/c++/test/.nix/derivation.nix
index 750d8ed..750d8ed 100644
--- a/src/test/.nix/derivation.nix
+++ b/c++/test/.nix/derivation.nix
diff --git a/src/test/SConscript b/c++/test/SConscript
index 6379b24..6379b24 100644
--- a/src/test/SConscript
+++ b/c++/test/SConscript
diff --git a/src/test/SConstruct b/c++/test/SConstruct
index 0d7b7c6..0d7b7c6 100644
--- a/src/test/SConstruct
+++ b/c++/test/SConstruct
diff --git a/src/test/suite.cpp b/c++/test/suite.cpp
index 0fca8f9..0fca8f9 100644
--- a/src/test/suite.cpp
+++ b/c++/test/suite.cpp
diff --git a/src/test/suite.h b/c++/test/suite.h
index 34f29bf..34f29bf 100644
--- a/src/test/suite.h
+++ b/c++/test/suite.h
diff --git a/src/window-opengl/.nix/derivation.nix b/c++/window-opengl/.nix/derivation.nix
index 95cd318..95cd318 100644
--- a/src/window-opengl/.nix/derivation.nix
+++ b/c++/window-opengl/.nix/derivation.nix
diff --git a/src/window-opengl/SConscript b/c++/window-opengl/SConscript
index bd830b9..bd830b9 100644
--- a/src/window-opengl/SConscript
+++ b/c++/window-opengl/SConscript
diff --git a/src/window-opengl/SConstruct b/c++/window-opengl/SConstruct
index 05fc016..05fc016 100644
--- a/src/window-opengl/SConstruct
+++ b/c++/window-opengl/SConstruct
diff --git a/src/window/.nix/derivation.nix b/c++/window/.nix/derivation.nix
index 9974564..9974564 100644
--- a/src/window/.nix/derivation.nix
+++ b/c++/window/.nix/derivation.nix
diff --git a/src/window/SConscript b/c++/window/SConscript
index bd830b9..bd830b9 100644
--- a/src/window/SConscript
+++ b/c++/window/SConscript
diff --git a/src/window/SConstruct b/c++/window/SConstruct
index 05fc016..05fc016 100644
--- a/src/window/SConstruct
+++ b/c++/window/SConstruct
diff --git a/src/window/backends.h b/c++/window/backends.h
index e129037..e129037 100644
--- a/src/window/backends.h
+++ b/c++/window/backends.h
diff --git a/src/window/device.h b/c++/window/device.h
index 7d3cdb1..7d3cdb1 100644
--- a/src/window/device.h
+++ b/c++/window/device.h
diff --git a/src/window/linux_xcb.h b/c++/window/linux_xcb.h
index 65ff94d..65ff94d 100644
--- a/src/window/linux_xcb.h
+++ b/c++/window/linux_xcb.h
diff --git a/src/window/old.dummy b/c++/window/old.dummy
index c762945..c762945 100644
--- a/src/window/old.dummy
+++ b/c++/window/old.dummy
diff --git a/src/window/video_mode.h b/c++/window/video_mode.h
index a8f1695..a8f1695 100644
--- a/src/window/video_mode.h
+++ b/c++/window/video_mode.h
diff --git a/src/window/window.h b/c++/window/window.h
index 36786de..36786de 100644
--- a/src/window/window.h
+++ b/c++/window/window.h
diff --git a/src/window/xcb.cpp b/c++/window/xcb.cpp
index 0a27643..0a27643 100644
--- a/src/window/xcb.cpp
+++ b/c++/window/xcb.cpp
diff --git a/src/window/xcb.h b/c++/window/xcb.h
index f4e9b9a..f4e9b9a 100644
--- a/src/window/xcb.h
+++ b/c++/window/xcb.h
diff --git a/default.nix b/default.nix
index d38ed9e..2522681 100644
--- a/default.nix
+++ b/default.nix
@@ -7,62 +7,62 @@ let
   version = "0.0.0";
 in rec {
   forstio = {
-    core = pkgs.callPackage src/core/.nix/derivation.nix {
+    core = pkgs.callPackage c++/core/.nix/derivation.nix {
       inherit version;
       inherit clang;
       inherit clang-tools;
     };
 
-    test = pkgs.callPackage src/test/.nix/derivation.nix {
+    test = pkgs.callPackage c++/test/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    async = pkgs.callPackage src/async/.nix/derivation.nix {
+    async = pkgs.callPackage c++/async/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    codec = pkgs.callPackage src/codec/.nix/derivation.nix {
+    codec = pkgs.callPackage c++/codec/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    codec-json = pkgs.callPackage src/codec-json/.nix/derivation.nix {
+    codec-json = pkgs.callPackage c++/codec-json/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    io = pkgs.callPackage src/io/.nix/derivation.nix {
+    io = pkgs.callPackage c++/io/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    io-tls = pkgs.callPackage src/io-tls/.nix/derivation.nix {
+    io-tls = pkgs.callPackage c++/io-tls/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    window = pkgs.callPackage src/window/.nix/derivation.nix {
+    window = pkgs.callPackage c++/window/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;
       inherit clang-tools;
     };
     
-    window-opengl = pkgs.callPackage src/window/.nix/derivation.nix {
+    window-opengl = pkgs.callPackage c++/window/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       inherit clang;