40 files changed, 25 insertions, 6 deletions

diff --git a/SConstruct b/SConstruct
index ead6b58..ba3c56b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,7 +56,7 @@ env.sources = [];
 env.headers = [];
 
 Export('env')
-SConscript('forstio/SConscript')
+SConscript('src/SConscript')
 
 env.Alias('cdb', env.cdb);
 env.Alias('all', [env.targets]);
diff --git a/default.nix b/default.nix
index aff0363..1f679d7 100644
--- a/default.nix
+++ b/default.nix
@@ -5,34 +5,41 @@ let
   version = "0.0.0";
 in rec {
   forstio = {
-    core = pkgs.callPackage forstio/core/.nix/derivation.nix {
+    core = pkgs.callPackage src/core/.nix/derivation.nix {
       inherit version;
       clang = pkgs.clang_15;
       clang-tools = pkgs.clang-tools_15;
     };
 
-    async = pkgs.callPackage forstio/async/.nix/derivation.nix {
+    async = pkgs.callPackage src/async/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       clang = pkgs.clang_15;
       clang-tools = pkgs.clang-tools_15;
     };
     
-    codec = pkgs.callPackage forstio/codec/.nix/derivation.nix {
+    codec = pkgs.callPackage src/codec/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       clang = pkgs.clang_15;
       clang-tools = pkgs.clang-tools_15;
     };
     
-    io = pkgs.callPackage forstio/io/.nix/derivation.nix {
+    codec-json = pkgs.callPackage src/codec-json/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       clang = pkgs.clang_15;
       clang-tools = pkgs.clang-tools_15;
     };
     
-    io-tls = pkgs.callPackage forstio/io-tls/.nix/derivation.nix {
+    io = pkgs.callPackage src/io/.nix/derivation.nix {
+      inherit version;
+      inherit forstio;
+      clang = pkgs.clang_15;
+      clang-tools = pkgs.clang-tools_15;
+    };
+    
+    io-tls = pkgs.callPackage src/io-tls/.nix/derivation.nix {
       inherit version;
       inherit forstio;
       clang = pkgs.clang_15;
diff --git a/forstio/SConscript b/src/SConscript
index 8da5a3d..8da5a3d 100644
--- a/forstio/SConscript
+++ b/src/SConscript
diff --git a/forstio/async/.nix/derivation.nix b/src/async/.nix/derivation.nix
index 8ceac08..8ceac08 100644
--- a/forstio/async/.nix/derivation.nix
+++ b/src/async/.nix/derivation.nix
diff --git a/forstio/async/SConscript b/src/async/SConscript
index 69f8950..69f8950 100644
--- a/forstio/async/SConscript
+++ b/src/async/SConscript
diff --git a/forstio/async/SConstruct b/src/async/SConstruct
index 0d7b7c6..0d7b7c6 100644
--- a/forstio/async/SConstruct
+++ b/src/async/SConstruct
diff --git a/forstio/async/async.cpp b/src/async/async.cpp
index c53ffa6..c53ffa6 100644
--- a/forstio/async/async.cpp
+++ b/src/async/async.cpp
diff --git a/forstio/async/async.h b/src/async/async.h
index 4cfed60..4cfed60 100644
--- a/forstio/async/async.h
+++ b/src/async/async.h
diff --git a/forstio/async/async.tmpl.h b/src/async/async.tmpl.h
index d081fa9..d081fa9 100644
--- a/forstio/async/async.tmpl.h
+++ b/src/async/async.tmpl.h
diff --git a/forstio/codec-json/.nix/derivation.nix b/src/codec-json/.nix/derivation.nix
index fcc276d..fcc276d 100644
--- a/forstio/codec-json/.nix/derivation.nix
+++ b/src/codec-json/.nix/derivation.nix
diff --git a/forstio/codec-json/SConscript b/src/codec-json/SConscript
index 772ac0b..772ac0b 100644
--- a/forstio/codec-json/SConscript
+++ b/src/codec-json/SConscript
diff --git a/forstio/codec-json/SConstruct b/src/codec-json/SConstruct
index edd5f57..edd5f57 100644
--- a/forstio/codec-json/SConstruct
+++ b/src/codec-json/SConstruct
diff --git a/src/codec-json/json.h b/src/codec-json/json.h
new file mode 100644
index 0000000..2c5b83e
--- /dev/null
+++ b/src/codec-json/json.h
@@ -0,0 +1,12 @@
+#pragma once
+
+namespace saw {
+namespace encoded {
+struct Json {};
+}
+
+template<typename Schema>
+class codec<Schema, Json> {
+
+};
+}
diff --git a/forstio/codec/.nix/derivation.nix b/src/codec/.nix/derivation.nix
index c9fac2e..c9fac2e 100644
--- a/forstio/codec/.nix/derivation.nix
+++ b/src/codec/.nix/derivation.nix
diff --git a/forstio/codec/SConscript b/src/codec/SConscript
index c038d42..c038d42 100644
--- a/forstio/codec/SConscript
+++ b/src/codec/SConscript
diff --git a/forstio/codec/SConstruct b/src/codec/SConstruct
index 0d7b7c6..0d7b7c6 100644
--- a/forstio/codec/SConstruct
+++ b/src/codec/SConstruct
diff --git a/forstio/codec/data.h b/src/codec/data.h
index 1682ae7..1682ae7 100644
--- a/forstio/codec/data.h
+++ b/src/codec/data.h
diff --git a/forstio/codec/proto_kel.h b/src/codec/proto_kel.h
index 3b4ebac..3b4ebac 100644
--- a/forstio/codec/proto_kel.h
+++ b/src/codec/proto_kel.h
diff --git a/forstio/codec/schema.h b/src/codec/schema.h
index b23aaa1..b23aaa1 100644
--- a/forstio/codec/schema.h
+++ b/src/codec/schema.h
diff --git a/forstio/core/.nix/derivation.nix b/src/core/.nix/derivation.nix
index adf0cb4..adf0cb4 100644
--- a/forstio/core/.nix/derivation.nix
+++ b/src/core/.nix/derivation.nix
diff --git a/forstio/core/SConscript b/src/core/SConscript
index 04eb4c3..04eb4c3 100644
--- a/forstio/core/SConscript
+++ b/src/core/SConscript
diff --git a/forstio/core/SConstruct b/src/core/SConstruct
index 865d131..865d131 100644
--- a/forstio/core/SConstruct
+++ b/src/core/SConstruct
diff --git a/forstio/core/buffer.cpp b/src/core/buffer.cpp
index ad471d7..ad471d7 100644
--- a/forstio/core/buffer.cpp
+++ b/src/core/buffer.cpp
diff --git a/forstio/core/buffer.h b/src/core/buffer.h
index 4485ff1..4485ff1 100644
--- a/forstio/core/buffer.h
+++ b/src/core/buffer.h
diff --git a/forstio/core/common.h b/src/core/common.h
index a06c238..a06c238 100644
--- a/forstio/core/common.h
+++ b/src/core/common.h
diff --git a/forstio/core/error.cpp b/src/core/error.cpp
index 727ca95..727ca95 100644
--- a/forstio/core/error.cpp
+++ b/src/core/error.cpp
diff --git a/forstio/core/error.h b/src/core/error.h
index 3d242b9..3d242b9 100644
--- a/forstio/core/error.h
+++ b/src/core/error.h
diff --git a/forstio/core/string_literal.h b/src/core/string_literal.h
index d530a54..d530a54 100644
--- a/forstio/core/string_literal.h
+++ b/src/core/string_literal.h
diff --git a/forstio/io-tls/.nix/derivation.nix b/src/io-tls/.nix/derivation.nix
index 6c62b51..6c62b51 100644
--- a/forstio/io-tls/.nix/derivation.nix
+++ b/src/io-tls/.nix/derivation.nix
diff --git a/forstio/io-tls/SConscript b/src/io-tls/SConscript
index 4f88f37..4f88f37 100644
--- a/forstio/io-tls/SConscript
+++ b/src/io-tls/SConscript
diff --git a/forstio/io-tls/SConstruct b/src/io-tls/SConstruct
index fbd8657..fbd8657 100644
--- a/forstio/io-tls/SConstruct
+++ b/src/io-tls/SConstruct
diff --git a/forstio/io-tls/tls.cpp b/src/io-tls/tls.cpp
index 9fa143c..9fa143c 100644
--- a/forstio/io-tls/tls.cpp
+++ b/src/io-tls/tls.cpp
diff --git a/forstio/io-tls/tls.h b/src/io-tls/tls.h
index 74b39ff..74b39ff 100644
--- a/forstio/io-tls/tls.h
+++ b/src/io-tls/tls.h
diff --git a/forstio/io/.nix/derivation.nix b/src/io/.nix/derivation.nix
index 0d213d3..0d213d3 100644
--- a/forstio/io/.nix/derivation.nix
+++ b/src/io/.nix/derivation.nix
diff --git a/forstio/io/SConscript b/src/io/SConscript
index 62ad58a..62ad58a 100644
--- a/forstio/io/SConscript
+++ b/src/io/SConscript
diff --git a/forstio/io/SConstruct b/src/io/SConstruct
index 4cccf82..4cccf82 100644
--- a/forstio/io/SConstruct
+++ b/src/io/SConstruct
diff --git a/forstio/io/io.cpp b/src/io/io.cpp
index f0705d2..f0705d2 100644
--- a/forstio/io/io.cpp
+++ b/src/io/io.cpp
diff --git a/forstio/io/io.h b/src/io/io.h
index bcc59fd..bcc59fd 100644
--- a/forstio/io/io.h
+++ b/src/io/io.h
diff --git a/forstio/io/io_helpers.cpp b/src/io/io_helpers.cpp
index c2cf2be..c2cf2be 100644
--- a/forstio/io/io_helpers.cpp
+++ b/src/io/io_helpers.cpp
diff --git a/forstio/io/io_helpers.h b/src/io/io_helpers.h
index 94e37f4..94e37f4 100644
--- a/forstio/io/io_helpers.h
+++ b/src/io/io_helpers.h