diff --git a/Cargo.lock b/Cargo.lock
index 9dc6526..aeca49f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2336,6 +2336,13 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "trx-cw"
+version = "0.1.0"
+dependencies = [
+ "trx-core",
+]
+
 [[package]]
 name = "trx-frontend"
 version = "0.1.0"
@@ -2425,6 +2432,7 @@ dependencies = [
  "trx-aprs",
  "trx-backend",
  "trx-core",
+ "trx-cw",
  "trx-ft8",
  "trx-protocol",
  "trx-wspr",
diff --git a/Cargo.toml b/Cargo.toml
index b10d95b..dead104 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@
 [workspace]
 members = [
     "src/decoders/trx-aprs",
+    "src/decoders/trx-cw",
     "src/decoders/trx-ft8",
     "src/decoders/trx-wspr",
     "src/trx-core",
diff --git a/src/decoders/trx-cw/Cargo.toml b/src/decoders/trx-cw/Cargo.toml
new file mode 100644
index 0000000..b0eecce
--- /dev/null
+++ b/src/decoders/trx-cw/Cargo.toml
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2026 Stanislaw Grams <stanislawgrams@gmail.com>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+
+[package]
+name = "trx-cw"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+trx-core = { path = "../../trx-core" }
diff --git a/src/trx-server/src/decode/cw.rs b/src/decoders/trx-cw/src/lib.rs
similarity index 100%
rename from src/trx-server/src/decode/cw.rs
rename to src/decoders/trx-cw/src/lib.rs
diff --git a/src/trx-server/Cargo.toml b/src/trx-server/Cargo.toml
index 4ea6e35..a79e5e3 100644
--- a/src/trx-server/Cargo.toml
+++ b/src/trx-server/Cargo.toml
@@ -25,6 +25,7 @@ trx-app = { path = "../trx-app" }
 trx-backend = { path = "trx-backend" }
 trx-core = { path = "../trx-core" }
 trx-aprs = { path = "../decoders/trx-aprs" }
+trx-cw = { path = "../decoders/trx-cw" }
 trx-ft8 = { path = "../decoders/trx-ft8" }
 trx-wspr = { path = "../decoders/trx-wspr" }
 trx-protocol = { path = "../trx-protocol" }
diff --git a/src/trx-server/src/audio.rs b/src/trx-server/src/audio.rs
index 2c2344e..95ff018 100644
--- a/src/trx-server/src/audio.rs
+++ b/src/trx-server/src/audio.rs
@@ -23,11 +23,11 @@ use trx_core::audio::{
 use trx_core::decode::{AprsPacket, DecodedMessage, Ft8Message, WsprMessage};
 use trx_core::rig::state::{RigMode, RigState};
 use trx_aprs::AprsDecoder;
+use trx_cw::CwDecoder;
 use trx_ft8::Ft8Decoder;
 use trx_wspr::WsprDecoder;
 
 use crate::config::AudioConfig;
-use crate::decode;
 use crate::decode_logs::DecoderLoggers;
 
 const APRS_HISTORY_RETENTION: Duration = Duration::from_secs(24 * 60 * 60);
@@ -765,7 +765,7 @@ pub async fn run_cw_decoder(
     decode_logs: Option<Arc<DecoderLoggers>>,
 ) {
     info!("CW decoder started ({}Hz, {} ch)", sample_rate, channels);
-    let mut decoder = decode::cw::CwDecoder::new(sample_rate);
+    let mut decoder = CwDecoder::new(sample_rate);
     let mut was_active = false;
     let mut last_reset_seq: u64 = 0;
     let mut active = matches!(state_rx.borrow().status.mode, RigMode::CW | RigMode::CWR);
diff --git a/src/trx-server/src/decode/mod.rs b/src/trx-server/src/decode/mod.rs
deleted file mode 100644
index b969820..0000000
--- a/src/trx-server/src/decode/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Stanislaw Grams <stanislawgrams@gmail.com>
-//
-// SPDX-License-Identifier: BSD-2-Clause
-
-pub mod cw;
diff --git a/src/trx-server/src/main.rs b/src/trx-server/src/main.rs
index 42611a1..1c07111 100644
--- a/src/trx-server/src/main.rs
+++ b/src/trx-server/src/main.rs
@@ -5,7 +5,6 @@
 mod aprsfi;
 mod audio;
 mod config;
-mod decode;
 mod decode_logs;
 mod error;
 mod listener;