diff --git a/.gitmodules b/.gitmodules
index 8e1b9fa..1ea2a29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,18 @@
 [submodule "shanty-index"]
 	path = shanty-index
 	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/index.git
+[submodule "shanty-tag"]
+	path = shanty-tag
+	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/tag.git
+[submodule "shanty-org"]
+	path = shanty-org
+	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/org.git
+[submodule "shanty-watch"]
+	path = shanty-watch
+	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/watch.git
+[submodule "shanty-dl"]
+	path = shanty-dl
+	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/dl.git
+[submodule "shanty-search"]
+	path = shanty-search
+	url = ssh://connor@git.rcjohnstone.com:2222/Shanty/search.git
diff --git a/Cargo.lock b/Cargo.lock
index 38b7176..4ba2200 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2542,11 +2542,19 @@ dependencies = [
 name = "shanty-search"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "chrono",
  "clap",
+ "dirs",
+ "sea-orm",
  "serde",
+ "serde_json",
  "shanty-db",
+ "shanty-tag",
  "thiserror",
+ "tokio",
  "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
diff --git a/shanty-search b/shanty-search
new file mode 160000
index 0000000..208dbf4
--- /dev/null
+++ b/shanty-search
@@ -0,0 +1 @@
+Subproject commit 208dbf422b34dea3c5bb0837e5f425206119baa9
diff --git a/shanty-search/Cargo.toml b/shanty-search/Cargo.toml
deleted file mode 100644
index 6fcd2fc..0000000
--- a/shanty-search/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "shanty-search"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-description = "Online music search for Shanty"
-
-[dependencies]
-shanty-db = { path = "../shanty-db" }
-clap = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-tracing = { workspace = true }
diff --git a/shanty-search/src/lib.rs b/shanty-search/src/lib.rs
deleted file mode 100644
index 7677c18..0000000
--- a/shanty-search/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//! Online music search.
-//!
-//! Searches for artists, albums, and tracks via online databases (MusicBrainz,
-//! Last.fm, etc.) and returns structured results for adding to the library.
diff --git a/shanty-search/src/main.rs b/shanty-search/src/main.rs
deleted file mode 100644
index 003acec..0000000
--- a/shanty-search/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    println!("shanty-search: online music search");
-}
diff --git a/shanty-tag b/shanty-tag
index 9c59cf7..9e93c5e 160000
--- a/shanty-tag
+++ b/shanty-tag
@@ -1 +1 @@
-Subproject commit 9c59cf73e7e6631d9c33004fc0ff8fb957f673b9
+Subproject commit 9e93c5e6d28ad106016402ef6a3223d9d24c2927