diff --git a/.gitignore b/.gitignore
index 8f983f260..68d86805f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@
 /dnetview
 /drk
 /faucetd
+/fu
+/fud
 /ircd
 /tau
 /taud
diff --git a/Cargo.lock b/Cargo.lock
index 213b69de3..156ba79d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1912,6 +1912,42 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "fu"
+version = "0.3.0"
+dependencies = [
+ "async-std",
+ "clap 3.2.22",
+ "darkfi",
+ "log",
+ "serde_json",
+ "simplelog",
+ "url",
+]
+
+[[package]]
+name = "fud"
+version = "0.3.0"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-std",
+ "async-trait",
+ "blake3",
+ "ctrlc",
+ "darkfi",
+ "easy-parallel",
+ "futures-lite",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "simplelog",
+ "structopt",
+ "structopt-toml",
+ "url",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index fc9b065a0..c137b5997 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,8 @@ members = [
     "bin/darkotc",
     "bin/drk",
     "bin/faucetd",
+    "bin/fud/fu",
+    "bin/fud/fud",
     "bin/ircd",
     "bin/dnetview",
     "bin/daod",
diff --git a/script/research/fud/README.md b/bin/fud/README.md
similarity index 100%
rename from script/research/fud/README.md
rename to bin/fud/README.md
diff --git a/script/research/fud/fu/.gitignore b/bin/fud/fu/.gitignore
similarity index 100%
rename from script/research/fud/fu/.gitignore
rename to bin/fud/fu/.gitignore
diff --git a/script/research/fud/fu/Cargo.toml b/bin/fud/fu/Cargo.toml
similarity index 81%
rename from script/research/fud/fu/Cargo.toml
rename to bin/fud/fu/Cargo.toml
index 344f82a8d..c81f7fabf 100644
--- a/script/research/fud/fu/Cargo.toml
+++ b/bin/fud/fu/Cargo.toml
@@ -1,20 +1,24 @@
 [package]
 name = "fu"
-version = "0.3.0"
-homepage = "https://dark.fi"
 description = "Command-line client for fud"
-authors = ["darkfi <dev@dark.fi>"]
-repository = "https://github.com/darkrenaissance/darkfi"
-license = "AGPL-3.0-only"
+version = "0.3.0"
 edition = "2021"
+authors = ["darkfi <dev@dark.fi>"]
+license = "AGPL-3.0-only"
+homepage = "https://dark.fi"
+repository = "https://github.com/darkrenaissance/darkfi"
+keywords = []
+categories = []
 
 [dependencies]
+darkfi = {path = "../../../", features = ["util", "rpc"]}
+
+# Async
 async-std = {version = "1.12.0", features = ["attributes"]}
+
+# Misc
 clap = {version = "3.2.20", features = ["derive"]}
-darkfi = {path = "../../../../", features = ["util", "rpc"]}
 log = "0.4.17"
 serde_json = "1.0.85"
 simplelog = "0.12.0"
 url = "2.3.1"
-
-[workspace]
diff --git a/script/research/fud/fu/src/main.rs b/bin/fud/fu/src/main.rs
similarity index 100%
rename from script/research/fud/fu/src/main.rs
rename to bin/fud/fu/src/main.rs
diff --git a/script/research/fud/fud/.gitignore b/bin/fud/fud/.gitignore
similarity index 100%
rename from script/research/fud/fud/.gitignore
rename to bin/fud/fud/.gitignore
diff --git a/script/research/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml
similarity index 87%
rename from script/research/fud/fud/Cargo.toml
rename to bin/fud/fud/Cargo.toml
index c5a283cb4..d3506cf6e 100644
--- a/script/research/fud/fud/Cargo.toml
+++ b/bin/fud/fud/Cargo.toml
@@ -1,23 +1,29 @@
 [package]
 name = "fud"
-version = "0.3.0"
-homepage = "https://dark.fi"
 description = "File-sharing Utility Daemon, using DHT for records discovery."
-authors = ["darkfi <dev@dark.fi>"]
-repository = "https://github.com/darkrenaissance/darkfi"
-license = "AGPL-3.0-only"
+version = "0.3.0"
 edition = "2021"
+authors = ["darkfi <dev@dark.fi>"]
+license = "AGPL-3.0-only"
+homepage = "https://dark.fi"
+repository = "https://github.com/darkrenaissance/darkfi"
+keywords = []
+categories = []
 
 [dependencies]
+darkfi = {path = "../../../", features = ["dht", "rpc"]}
+
+# Async
 async-channel = "1.7.1"
 async-executor = "1.4.1"
 async-std = "1.12.0"
 async-trait = "0.1.57"
-blake3 = "1.3.1"
 ctrlc = { version = "3.2.3", features = ["termination"] }
-darkfi = {path = "../../../../", features = ["dht", "rpc"]}
 easy-parallel = "3.2.0"
 futures-lite = "1.12.0"
+
+# Misc
+blake3 = "1.3.1"
 log = "0.4.17"
 serde_json = "1.0.85"
 simplelog = "0.12.0"
@@ -28,5 +34,3 @@ serde = "1.0.145"
 serde_derive = "1.0.145"
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
-
-[workspace]
diff --git a/script/research/fud/fud/fud_config.toml b/bin/fud/fud/fud_config.toml
similarity index 100%
rename from script/research/fud/fud/fud_config.toml
rename to bin/fud/fud/fud_config.toml
diff --git a/script/research/fud/fud/src/error.rs b/bin/fud/fud/src/error.rs
similarity index 100%
rename from script/research/fud/fud/src/error.rs
rename to bin/fud/fud/src/error.rs
diff --git a/script/research/fud/fud/src/main.rs b/bin/fud/fud/src/main.rs
similarity index 100%
rename from script/research/fud/fud/src/main.rs
rename to bin/fud/fud/src/main.rs
diff --git a/contrib/localnet/fud/clean.sh b/contrib/localnet/fud/clean.sh
new file mode 100755
index 000000000..8f22a8640
--- /dev/null
+++ b/contrib/localnet/fud/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+rm -rf fud0 fud1 lilith_hosts.tsv
+mkdir fud0
+mkdir fud1
+echo "Hello from node 0." > "fud0/node0"
+echo "Hello from node 1." > "fud1/node1"
diff --git a/contrib/localnet/fud/fud0/node0 b/contrib/localnet/fud/fud0/node0
new file mode 100644
index 000000000..ac95dcd67
--- /dev/null
+++ b/contrib/localnet/fud/fud0/node0
@@ -0,0 +1 @@
+Hello from node 0.
diff --git a/contrib/localnet/fud/fud1/node1 b/contrib/localnet/fud/fud1/node1
new file mode 100644
index 000000000..03b420e64
--- /dev/null
+++ b/contrib/localnet/fud/fud1/node1
@@ -0,0 +1 @@
+Hello from node 1.
diff --git a/script/research/fud/localnet/fud_config0.toml b/contrib/localnet/fud/fud_config0.toml
similarity index 100%
rename from script/research/fud/localnet/fud_config0.toml
rename to contrib/localnet/fud/fud_config0.toml
diff --git a/script/research/fud/localnet/fud_config1.toml b/contrib/localnet/fud/fud_config1.toml
similarity index 100%
rename from script/research/fud/localnet/fud_config1.toml
rename to contrib/localnet/fud/fud_config1.toml
diff --git a/script/research/fud/localnet/lilith_config.toml b/contrib/localnet/fud/lilith_config.toml
similarity index 100%
rename from script/research/fud/localnet/lilith_config.toml
rename to contrib/localnet/fud/lilith_config.toml
diff --git a/contrib/localnet/fud/tmux_sessions.sh b/contrib/localnet/fud/tmux_sessions.sh
new file mode 100755
index 000000000..00f022b76
--- /dev/null
+++ b/contrib/localnet/fud/tmux_sessions.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+# Start a tmux session with a lilith node and two fud nodes.
+
+if [ "$1" = "-v" ]; then
+	verbose="-v"
+else
+	verbose=""
+fi
+
+tmux new-session -d
+tmux send-keys "../../../lilith ${verbose} -c lilith_config.toml" Enter
+sleep 2
+tmux split-window -v
+tmux send-keys "../../../fud ${verbose} -c fud_config0.toml" Enter
+sleep 2
+tmux select-pane -t 1
+tmux split-window -h
+tmux send-keys "../../../fud ${verbose} -c fud_config1.toml" Enter
+tmux attach
diff --git a/script/research/fud/localnet/fud0/node0 b/script/research/fud/localnet/fud0/node0
deleted file mode 100644
index 2d3471991..000000000
--- a/script/research/fud/localnet/fud0/node0
+++ /dev/null
@@ -1 +0,0 @@
-Hello from node 0
diff --git a/script/research/fud/localnet/fud1/node1 b/script/research/fud/localnet/fud1/node1
deleted file mode 100644
index d584a6d16..000000000
--- a/script/research/fud/localnet/fud1/node1
+++ /dev/null
@@ -1 +0,0 @@
-Hello from node 1
diff --git a/script/research/fud/localnet/tmux_sessions.sh b/script/research/fud/localnet/tmux_sessions.sh
deleted file mode 100755
index bb39159d0..000000000
--- a/script/research/fud/localnet/tmux_sessions.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-
-# Start a tmux session with a lilith node and two fud nodes.
-
-tmux new-session -d
-tmux send-keys "../../../../lilith -c lilith_config.toml" Enter
-sleep 2
-tmux split-window -v
-tmux send-keys "../fud/target/debug/fud -c fud_config0.toml" Enter
-sleep 2
-tmux select-pane -t 1
-tmux split-window -h
-tmux send-keys "../fud/target/debug/fud -c fud_config1.toml" Enter
-tmux attach