diff --git a/build.zig b/build.zig
index 42b7b7e4..98236030 100644
--- a/build.zig
+++ b/build.zig
@@ -1,7 +1,165 @@
-const Builder = @import("std").Build;
+const std = @import("std");
+const Builder = std.Build;
+
+const zkvmTarget = struct {
+    name: []const u8,
+    set_pie: bool,
+};
+
+const zkvm_targets: []const zkvmTarget = &.{
+    .{ .name = "powdr", .set_pie = true },
+    .{ .name = "ceno", .set_pie = false },
+};
 
 // TODO build test monorepo
-pub fn build(b: *Builder) void {
+pub fn build(b: *Builder) !void {
+    try build_zkvm_targets(b);
+
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
+    // add ssz
+    const ssz = b.dependency("ssz.zig", .{
+        .target = target,
+        .optimize = optimize,
+    }).module("ssz.zig");
+
+    // add zeam-params
+    const params = b.addModule("zeam-params", .{
+        .target = target,
+        .optimize = optimize,
+        .root_source_file = b.path("pkgs/params/src/lib.zig"),
+    });
+
+    // add zeam-types
+    const zeam_types = b.addModule("zeam-types", .{
+        .root_source_file = b.path("pkgs/types/src/lib.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+
+    // add zeam-state-transition
+    const zeam_state_transition = b.addModule("zeam-state-transition", .{
+        .root_source_file = b.path("pkgs/state-transition/src/lib.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+
+    // add state proving manager
+    const zeam_state_proving_manager = b.addModule("zeam-state-proving-manager", .{
+        .root_source_file = b.path("pkgs/state-proving-manager/src/manager.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+
+    // add beam node
+    const zeam_beam_node = b.addModule("zeam-beam-node", .{
+        .target = target,
+        .optimize = optimize,
+        .root_source_file = b.path("pkgs/beam-node/src/node.zig"),
+    });
+
+    const st_lib = b.addStaticLibrary(.{
+        .name = "zeam-state-transition",
+        .root_source_file = b.path("pkgs/state-transition/src/lib.zig"),
+        .optimize = optimize,
+        .target = target,
+    });
+    b.installArtifact(st_lib);
+
+    // Add the cli executable
+    const cli_exe = b.addExecutable(.{
+        .name = "zeam",
+        .root_source_file = b.path("pkgs/cli/src/main.zig"),
+        .optimize = optimize,
+        .target = target,
+    });
+    // addimport to root module is even required afer declaring it in mod
+    cli_exe.root_module.addImport("ssz", ssz);
+    cli_exe.root_module.addImport("zeam-types", zeam_types);
+    cli_exe.root_module.addImport("zeam-state-transition", zeam_state_transition);
+    cli_exe.root_module.addImport("zeam-state-proving-manager", zeam_state_proving_manager);
+    cli_exe.root_module.addImport("zeam-beam-node", zeam_beam_node);
+    cli_exe.root_module.addImport("zeam-params", params);
+    b.installArtifact(cli_exe);
+
+    const tests = b.addTest(.{
+        .root_source_file = b.path("pkgs/tests.zig"),
+        .optimize = optimize,
+        .target = target,
+    });
+    tests.root_module.addImport("ssz", ssz);
+    tests.root_module.addImport("zeam-types", zeam_types);
+
+    const run_tests = b.addRunArtifact(tests);
     const test_step = b.step("test", "Run unit tests");
-    _ = test_step;
+    test_step.dependOn(&run_tests.step);
+}
+
+fn build_zkvm_targets(b: *Builder) !void {
+    const target_query = .{ .cpu_arch = .riscv32, .os_tag = .freestanding, .abi = .none, .cpu_model = .{ .explicit = &std.Target.riscv.cpu.generic_rv32 } };
+    const target = b.resolveTargetQuery(target_query);
+    const optimize = .ReleaseFast;
+
+    // add ssz
+    const ssz = b.dependency("ssz.zig", .{
+        .target = target,
+        .optimize = optimize,
+    }).module("ssz.zig");
+
+    // add zeam-params
+    const params = b.addModule("zeam-params", .{
+        .target = target,
+        .optimize = optimize,
+        .root_source_file = b.path("pkgs/params/src/lib.zig"),
+    });
+
+    // add zeam-types
+    const zeam_types = b.addModule("zeam-types", .{
+        .target = target,
+        .optimize = optimize,
+        .root_source_file = b.path("pkgs/types/src/lib.zig"),
+    });
+
+    // add state transition
+    const zeam_state_transition = b.addModule("zeam-state-transition", .{
+        .root_source_file = b.path("pkgs/state-transition/src/lib.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+    zeam_state_transition.addImport("zeam-types", zeam_types);
+    zeam_state_transition.addImport("ssz", ssz);
+
+    for (zkvm_targets) |zkvm_target| {
+        var module_root_path: [256]u8 = undefined;
+        _ = try std.fmt.bufPrintZ(&module_root_path, "pkgs/state-transition-runtime/src/{s}/lib.zig", .{zkvm_target.name});
+        const zkvm_module = b.addModule("zkvm", .{
+            .optimize = optimize,
+            .target = target,
+            .root_source_file = b.path(&module_root_path),
+        });
+
+        // target has to be riscv5 runtime provable/verifiable on zkVMs
+        var exec_name: [256]u8 = undefined;
+        const exe = b.addExecutable(.{
+            .name = try std.fmt.bufPrint(&exec_name, "zeam-stf-{s}", .{zkvm_target.name}),
+            .root_source_file = b.path("pkgs/state-transition-runtime/src/main.zig"),
+            .optimize = optimize,
+            .target = target,
+        });
+        // addimport to root module is even required afer declaring it in mod
+        exe.root_module.addImport("ssz", ssz);
+        exe.root_module.addImport("zeam-types", zeam_types);
+        exe.root_module.addImport("zeam-state-transition", zeam_state_transition);
+        exe.root_module.addImport("zkvm", zkvm_module);
+        exe.root_module.addImport("params", params);
+        var start_s_path: [256]u8 = undefined;
+        exe.addAssemblyFile(b.path(try std.fmt.bufPrint(&start_s_path, "pkgs/state-transition-runtime/src/{s}/start.s", .{zkvm_target.name})));
+        if (zkvm_target.set_pie) {
+            exe.pie = true;
+        }
+        var linker_script_path: [256]u8 = undefined;
+        exe.setLinkerScript(b.path(try std.fmt.bufPrint(&linker_script_path, "pkgs/state-transition-runtime/src/{s}/{s}.ld", .{ zkvm_target.name, zkvm_target.name })));
+        b.installArtifact(exe);
+    }
 }
diff --git a/build.zig.zon b/build.zig.zon
index 92f77597..8c9b8bc2 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,5 +1,11 @@
 .{
     .name = "zeam",
     .version = "0.0.0",
+    .dependencies = .{
+        .@"ssz.zig" = .{
+            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
+            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
+        },
+    },
     .paths = .{""},
 }
diff --git a/pkgs/beam-node/build.zig b/pkgs/beam-node/build.zig
deleted file mode 100644
index 0c22824f..00000000
--- a/pkgs/beam-node/build.zig
+++ /dev/null
@@ -1,62 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-    // add state transition
-    const zeam_state_transition = b.dependency("zeam-state-transition", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-transition");
-    // add state transition manager
-    const zeam_state_proving_manager = b.dependency("zeam-state-proving-manager", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-proving-manager");
-
-    const mod = b.addModule("zeam-beam-node", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/node.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-types", .module = zeam_types },
-            .{ .name = "zeam-state-transition", .module = zeam_state_transition },
-            .{ .name = "zeam-state-proving-manager", .module = zeam_state_proving_manager },
-        },
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-beam-node",
-        .root_source_file = .{ .cwd_relative = "src/node.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/node.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-types", zeam_types);
-    tests.root_module.addImport("zeam-state-transition", zeam_state_transition);
-    tests.root_module.addImport("zeam-state-proving-manager", zeam_state_proving_manager);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/beam-node/build.zig.zon b/pkgs/beam-node/build.zig.zon
deleted file mode 100644
index 347f3261..00000000
--- a/pkgs/beam-node/build.zig.zon
+++ /dev/null
@@ -1,20 +0,0 @@
-.{
-    .name = "zeam-beam-node",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-        .@"zeam-state-transition" = .{
-            .path = "../state-transition",
-        },
-        .@"zeam-state-proving-manager" = .{
-            .path = "../state-proving-manager",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/cli/build.zig b/pkgs/cli/build.zig
deleted file mode 100644
index 45096250..00000000
--- a/pkgs/cli/build.zig
+++ /dev/null
@@ -1,77 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-
-    const zeam_state_transition = b.dependency("zeam-state-transition", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-transition");
-    // add state proving manager
-    const zeam_state_proving_manager = b.dependency("zeam-state-proving-manager", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-proving-manager");
-    // add beam node
-    const zeam_beam_node = b.dependency("zeam-beam-node", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-beam-node");
-
-    const mod = b.addModule("zeam", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-types", .module = zeam_types },
-            .{ .name = "zeam-state-transition", .module = zeam_state_transition },
-            .{ .name = "zeam-state-proving-manager", .module = zeam_state_proving_manager },
-            .{ .name = "zeam-beam-node", .module = zeam_beam_node },
-        },
-    });
-    _ = mod;
-
-    // target has to be riscv5 runtime provable/verifiable on zkVMs
-    const exe = b.addExecutable(.{
-        .name = "zeam",
-        .root_source_file = .{ .cwd_relative = "src/main.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    // addimport to root module is even required afer declaring it in mod
-    exe.root_module.addImport("ssz", ssz);
-    exe.root_module.addImport("zeam-types", zeam_types);
-    exe.root_module.addImport("zeam-state-transition", zeam_state_transition);
-    exe.root_module.addImport("zeam-state-proving-manager", zeam_state_proving_manager);
-    exe.root_module.addImport("zeam-beam-node", zeam_beam_node);
-    b.installArtifact(exe);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/main.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-types", zeam_types);
-    tests.root_module.addImport("zeam-transition-runtime", zeam_state_transition);
-    tests.root_module.addImport("zeam-state-proving-manager", zeam_state_proving_manager);
-    tests.root_module.addImport("zeam-beam-node", zeam_beam_node);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/cli/build.zig.zon b/pkgs/cli/build.zig.zon
deleted file mode 100644
index 42e8f8d9..00000000
--- a/pkgs/cli/build.zig.zon
+++ /dev/null
@@ -1,23 +0,0 @@
-.{
-    .name = "zeam",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-        .@"zeam-state-transition" = .{
-            .path = "../state-transition",
-        },
-        .@"zeam-state-proving-manager" = .{
-            .path = "../state-proving-manager",
-        },
-        .@"zeam-beam-node" = .{
-            .path = "../beam-node",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/cli/src/main.zig b/pkgs/cli/src/main.zig
index e69de29b..723e831d 100644
--- a/pkgs/cli/src/main.zig
+++ b/pkgs/cli/src/main.zig
@@ -0,0 +1,9 @@
+const std = @import("std");
+const types = @import("zeam-types");
+
+pub fn main() !void {
+    // Random action to confirm that module imports are working.
+    // Replace with real code.
+    const slot: types.Slot = undefined;
+    std.debug.print("slot={any}", .{slot});
+}
diff --git a/pkgs/config/build.zig b/pkgs/config/build.zig
deleted file mode 100644
index d1568d77..00000000
--- a/pkgs/config/build.zig
+++ /dev/null
@@ -1,57 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-
-    // add zeam-params
-    const zeam_params = b.dependency("zeam-params", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-params");
-
-    const mod = b.addModule("zeam-chain-config", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/lib.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-params", .module = zeam_params },
-            .{ .name = "zeam-types", .module = zeam_types },
-        },
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-chain-config",
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-params", zeam_params);
-    tests.root_module.addImport("zeam-types", zeam_types);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/config/build.zig.zon b/pkgs/config/build.zig.zon
deleted file mode 100644
index ef18070d..00000000
--- a/pkgs/config/build.zig.zon
+++ /dev/null
@@ -1,17 +0,0 @@
-.{
-    .name = "zeam-chain-config",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-params" = .{
-            .path = "../params",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/params/build.zig b/pkgs/params/build.zig
deleted file mode 100644
index dfcc5bc5..00000000
--- a/pkgs/params/build.zig
+++ /dev/null
@@ -1,31 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    const mod = b.addModule("zeam-params", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/lib.zig"),
-        .target = target,
-        .optimize = optimize,
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-params",
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/params/build.zig.zon b/pkgs/params/build.zig.zon
deleted file mode 100644
index a9dcd04e..00000000
--- a/pkgs/params/build.zig.zon
+++ /dev/null
@@ -1,6 +0,0 @@
-.{
-    .name = "zeam-params",
-    .version = "0.0.0",
-    .dependencies = .{},
-    .paths = .{""},
-}
diff --git a/pkgs/state-proving-manager/build.zig b/pkgs/state-proving-manager/build.zig
deleted file mode 100644
index ce3629cc..00000000
--- a/pkgs/state-proving-manager/build.zig
+++ /dev/null
@@ -1,56 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-    // add state transition
-    const zeam_state_transition = b.dependency("zeam-state-transition", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-transition");
-    // TODO build and install state transition runtime to run in zkVM
-
-    const mod = b.addModule("zeam-state-proving-manager", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/manager.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-types", .module = zeam_types },
-            .{ .name = "zeam-state-transition", .module = zeam_state_transition },
-        },
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-state-proving-manager",
-        .root_source_file = .{ .cwd_relative = "src/manager.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/manager.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-types", zeam_types);
-    tests.root_module.addImport("zeam-state-transition", zeam_state_transition);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/state-proving-manager/build.zig.zon b/pkgs/state-proving-manager/build.zig.zon
deleted file mode 100644
index bb5a7013..00000000
--- a/pkgs/state-proving-manager/build.zig.zon
+++ /dev/null
@@ -1,20 +0,0 @@
-.{
-    .name = "zeam-state-proving-manager",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-        .@"zeam-state-transition" = .{
-            .path = "../state-transition",
-        },
-        .@"zeam-state-transition-runtime" = .{
-            .path = "../state-transition-runtime",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/state-transition-runtime/build.zig b/pkgs/state-transition-runtime/build.zig
deleted file mode 100644
index fd2bb779..00000000
--- a/pkgs/state-transition-runtime/build.zig
+++ /dev/null
@@ -1,98 +0,0 @@
-const Builder = @import("std").Build;
-const std = @import("std");
-
-const zkvm_types = enum {
-    ceno,
-    powdr,
-    sp1,
-};
-
-pub fn build(b: *Builder) void {
-    const target_query = .{ .cpu_arch = .riscv32, .os_tag = .freestanding, .abi = .none, .cpu_model = .{ .explicit = &std.Target.riscv.cpu.generic_rv32 } };
-
-    const target = b.resolveTargetQuery(target_query);
-    const optimize = b.standardOptimizeOption(.{});
-
-    // Declare the -Dzkvm option, which is a choice between all supported zkvms
-    const zkvm = b.option(zkvm_types, "zkvm", "zkvm target") orelse .powdr;
-    const zkvm_module = b.addModule("zkvm", .{
-        .optimize = optimize,
-        .target = target,
-        .root_source_file = b.path(switch (zkvm) {
-            .ceno => "src/ceno/lib.zig",
-            .powdr => "src/powdr/lib.zig",
-            .sp1 => "src/sp1/lib.zig",
-        }),
-    });
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-
-    const zeam_state_transition = b.dependency("zeam-state-transition", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-state-transition");
-
-    const mod = b.addModule("zeam-state-transition-runtime", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-types", .module = zeam_types },
-            .{ .name = "zeam-state-transition", .module = zeam_state_transition },
-        },
-    });
-    _ = mod;
-
-    // target has to be riscv5 runtime provable/verifiable on zkVMs
-    const exe = b.addExecutable(.{
-        .name = "zeam-state-transition-runtime",
-        .root_source_file = b.path("src/main.zig"),
-        .optimize = optimize,
-        .target = target,
-    });
-    // addimport to root module is even required afer declaring it in mod
-    exe.root_module.addImport("ssz", ssz);
-    exe.root_module.addImport("zeam-types", zeam_types);
-    exe.root_module.addImport("zeam-state-transition", zeam_state_transition);
-    exe.root_module.addImport("zkvm", zkvm_module);
-    switch (zkvm) {
-        .ceno => {
-            exe.addAssemblyFile(b.path("src/ceno/start.s"));
-            exe.setLinkerScript(b.path("src/ceno/ceno.ld"));
-        },
-        .powdr => {
-            exe.addAssemblyFile(b.path("src/powdr/start.s"));
-            exe.setLinkerScript(b.path("src/powdr/powdr.x"));
-            exe.pie = true;
-        },
-        .sp1 => {
-            exe.addAssemblyFile(b.path("src/sp1/start.s"));
-            exe.setLinkerScript(b.path("src/sp1/sp1.ld"));
-        },
-    }
-    b.installArtifact(exe);
-
-    // const tests = b.addTest(.{
-    //     .root_source_file = .{ .cwd_relative = "src/transition.zig" },
-    //     .optimize = optimize,
-    //     .target = target,
-    // });
-    // tests.root_module.addImport("ssz", ssz);
-    // tests.root_module.addImport("zeam-types", zeam_types);
-    // tests.root_module.addImport("zeam-transition-runtime", zeam_state_transition);
-
-    // const run_tests = b.addRunArtifact(tests);
-    // const test_step = b.step("test", "Run unit tests");
-    // test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/state-transition-runtime/build.zig.zon b/pkgs/state-transition-runtime/build.zig.zon
deleted file mode 100644
index 9567ba00..00000000
--- a/pkgs/state-transition-runtime/build.zig.zon
+++ /dev/null
@@ -1,17 +0,0 @@
-.{
-    .name = "zeam-state-transition-runtime",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-        .@"zeam-state-transition" = .{
-            .path = "../state-transition",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/state-transition-runtime/src/powdr/powdr.x b/pkgs/state-transition-runtime/src/powdr/powdr.ld
similarity index 100%
rename from pkgs/state-transition-runtime/src/powdr/powdr.x
rename to pkgs/state-transition-runtime/src/powdr/powdr.ld
diff --git a/pkgs/state-transition/build.zig b/pkgs/state-transition/build.zig
deleted file mode 100644
index bc4d4a92..00000000
--- a/pkgs/state-transition/build.zig
+++ /dev/null
@@ -1,57 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    // add ssz
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-
-    // add zeam-params
-    const zeam_params = b.dependency("zeam-params", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-params");
-
-    // add zeam-types
-    const zeam_types = b.dependency("zeam-types", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-types");
-
-    const mod = b.addModule("zeam-state-transition", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/lib.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-params", .module = zeam_params },
-            .{ .name = "zeam-types", .module = zeam_types },
-        },
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-state-transition",
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-params", zeam_params);
-    tests.root_module.addImport("zeam-types", zeam_types);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/state-transition/build.zig.zon b/pkgs/state-transition/build.zig.zon
deleted file mode 100644
index 595c108c..00000000
--- a/pkgs/state-transition/build.zig.zon
+++ /dev/null
@@ -1,17 +0,0 @@
-.{
-    .name = "zeam-state-transition",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-params" = .{
-            .path = "../params",
-        },
-        .@"zeam-types" = .{
-            .path = "../types",
-        },
-    },
-    .paths = .{""},
-}
diff --git a/pkgs/tests.zig b/pkgs/tests.zig
new file mode 100644
index 00000000..819e0426
--- /dev/null
+++ b/pkgs/tests.zig
@@ -0,0 +1,11 @@
+comptime {
+    _ = @import("state-transition/src/lib.zig");
+    // uncomment in #3
+    // _ = @import("state-proving-manager/src/manager.zig");
+    // uncomment after rebase / fixing preset issue
+    // _ = @import("params/src/lib.zig");
+    _ = @import("cli/src/main.zig");
+    // uncomment after rebase / fixing preset issue
+    // _ = @import("types/src/lib.zig");
+    _ = @import("./beam-node/src/node.zig");
+}
diff --git a/pkgs/types/build.zig b/pkgs/types/build.zig
deleted file mode 100644
index fa333f8c..00000000
--- a/pkgs/types/build.zig
+++ /dev/null
@@ -1,49 +0,0 @@
-const Builder = @import("std").Build;
-
-pub fn build(b: *Builder) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    const ssz = b.dependency("ssz.zig", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("ssz.zig");
-
-    // add zeam-params
-    const zeam_params = b.dependency("zeam-params", .{
-        .target = target,
-        .optimize = optimize,
-    }).module("zeam-params");
-
-
-    const mod = b.addModule("zeam-types", Builder.Module.CreateOptions{
-        .root_source_file = b.path("src/lib.zig"),
-        .target = target,
-        .optimize = optimize,
-        .imports = &.{
-            .{ .name = "ssz", .module = ssz },
-            .{ .name = "zeam-params", .module = zeam_params },
-        },
-    });
-    _ = mod;
-
-    const lib = b.addStaticLibrary(.{
-        .name = "zeam-types",
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    b.installArtifact(lib);
-
-    const tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/lib.zig" },
-        .optimize = optimize,
-        .target = target,
-    });
-    tests.root_module.addImport("ssz", ssz);
-    tests.root_module.addImport("zeam-params", zeam_params);
-
-    const run_tests = b.addRunArtifact(tests);
-    const test_step = b.step("test", "Run unit tests");
-    test_step.dependOn(&run_tests.step);
-}
diff --git a/pkgs/types/build.zig.zon b/pkgs/types/build.zig.zon
deleted file mode 100644
index cd22dda5..00000000
--- a/pkgs/types/build.zig.zon
+++ /dev/null
@@ -1,14 +0,0 @@
-.{
-    .name = "zeam-types",
-    .version = "0.0.0",
-    .dependencies = .{
-        .@"ssz.zig" = .{
-            .url = "https://github.com/blockblaz/ssz.zig/archive/refs/tags/v0.0.3.tar.gz",
-            .hash = "12205edd9484a4d1988afcf29010cd04102ea81da3d0ddf7244c55a75258aa844201",
-        },
-        .@"zeam-params" = .{
-            .path = "../params",
-        },
-    },
-    .paths = .{""},
-}