diff --git a/Makefile b/Makefile
index a5639b664..58c2be612 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 all: wakunode start_network quicksim
 
-start_network: waku/start_network.nim
-	nim c --threads:on -o:build/start_network waku/start_network.nim
+start_network: node/v0/start_network.nim
+	nim c --threads:on -o:build/start_network node/v0/start_network.nim
 
-quicksim: waku/quicksim.nim
-	nim c --threads:on -o:build/quicksim waku/quicksim.nim
+quicksim: node/v0/quicksim.nim
+	nim c --threads:on -o:build/quicksim node/v0/quicksim.nim
 
-wakunode: waku/wakunode.nim
-	nim c --threads:on -o:build/wakunode waku/wakunode.nim
+wakunode: node/v0/wakunode.nim
+	nim c --threads:on -o:build/wakunode node/v0/wakunode.nim
diff --git a/waku/README.md b/node/v0/README.md
similarity index 100%
rename from waku/README.md
rename to node/v0/README.md
diff --git a/waku/config.nim b/node/v0/config.nim
similarity index 100%
rename from waku/config.nim
rename to node/v0/config.nim
diff --git a/waku/docker/Dockerfile b/node/v0/docker/Dockerfile
similarity index 100%
rename from waku/docker/Dockerfile
rename to node/v0/docker/Dockerfile
diff --git a/waku/docker/Makefile b/node/v0/docker/Makefile
similarity index 100%
rename from waku/docker/Makefile
rename to node/v0/docker/Makefile
diff --git a/waku/examples/waku-grafana-dashboard.json b/node/v0/examples/waku-grafana-dashboard.json
similarity index 100%
rename from waku/examples/waku-grafana-dashboard.json
rename to node/v0/examples/waku-grafana-dashboard.json
diff --git a/waku/metrics/prometheus/prometheus.yml b/node/v0/metrics/prometheus/prometheus.yml
similarity index 100%
rename from waku/metrics/prometheus/prometheus.yml
rename to node/v0/metrics/prometheus/prometheus.yml
diff --git a/waku/metrics/waku-sim-all-nodes-grafana-dashboard.json b/node/v0/metrics/waku-sim-all-nodes-grafana-dashboard.json
similarity index 100%
rename from waku/metrics/waku-sim-all-nodes-grafana-dashboard.json
rename to node/v0/metrics/waku-sim-all-nodes-grafana-dashboard.json
diff --git a/waku/nim.cfg b/node/v0/nim.cfg
similarity index 100%
rename from waku/nim.cfg
rename to node/v0/nim.cfg
diff --git a/waku/quicksim.nim b/node/v0/quicksim.nim
similarity index 97%
rename from waku/quicksim.nim
rename to node/v0/quicksim.nim
index fcc598669..2abf2089b 100644
--- a/waku/quicksim.nim
+++ b/node/v0/quicksim.nim
@@ -1,7 +1,7 @@
 import
   os, strformat, chronicles, json_rpc/[rpcclient, rpcserver], nimcrypto/sysrand,
   eth/common as eth_common, eth/keys, eth/p2p/rlpx_protocols/waku_protocol,
-  ../vendor/nimbus/nimbus/rpc/[hexstrings, rpc_types, waku],
+  ../../vendor/nimbus/nimbus/rpc/[hexstrings, rpc_types, waku],
   options as what # TODO: Huh? Redefinition?
 
 from os import DirSep
diff --git a/waku/rpc/wakucallsigs.nim b/node/v0/rpc/wakucallsigs.nim
similarity index 100%
rename from waku/rpc/wakucallsigs.nim
rename to node/v0/rpc/wakucallsigs.nim
diff --git a/waku/start_network.nim b/node/v0/start_network.nim
similarity index 100%
rename from waku/start_network.nim
rename to node/v0/start_network.nim
diff --git a/waku/wakunode.nim b/node/v0/wakunode.nim
similarity index 98%
rename from waku/wakunode.nim
rename to node/v0/wakunode.nim
index 3b9bb3f94..48d218451 100644
--- a/waku/wakunode.nim
+++ b/node/v0/wakunode.nim
@@ -4,7 +4,7 @@ import
   eth/[keys, p2p, async_utils], eth/common/utils, eth/net/nat,
   eth/p2p/[discovery, enode, peer_pool, bootnodes, whispernodes],
   eth/p2p/rlpx_protocols/[whisper_protocol, waku_protocol, waku_bridge],
-  ../vendor/nimbus/nimbus/rpc/[waku, wakusim, key_storage]
+  ../../vendor/nimbus/nimbus/rpc/[waku, wakusim, key_storage]
 
 const clientId = "Nimbus waku node"