diff --git a/rayhunter/Cargo.toml b/bin/Cargo.toml
similarity index 100%
rename from rayhunter/Cargo.toml
rename to bin/Cargo.toml
diff --git a/rayhunter/src/config.rs b/bin/src/config.rs
similarity index 100%
rename from rayhunter/src/config.rs
rename to bin/src/config.rs
diff --git a/rayhunter/src/diag.rs b/bin/src/diag.rs
similarity index 100%
rename from rayhunter/src/diag.rs
rename to bin/src/diag.rs
diff --git a/rayhunter/src/error.rs b/bin/src/error.rs
similarity index 100%
rename from rayhunter/src/error.rs
rename to bin/src/error.rs
diff --git a/rayhunter/src/main.rs b/bin/src/main.rs
similarity index 100%
rename from rayhunter/src/main.rs
rename to bin/src/main.rs
diff --git a/rayhunter/src/pcap.rs b/bin/src/pcap.rs
similarity index 100%
rename from rayhunter/src/pcap.rs
rename to bin/src/pcap.rs
diff --git a/rayhunter/src/qmdl_store.rs b/bin/src/qmdl_store.rs
similarity index 100%
rename from rayhunter/src/qmdl_store.rs
rename to bin/src/qmdl_store.rs
diff --git a/rayhunter/src/server.rs b/bin/src/server.rs
similarity index 100%
rename from rayhunter/src/server.rs
rename to bin/src/server.rs
diff --git a/rayhunter/src/stats.rs b/bin/src/stats.rs
similarity index 100%
rename from rayhunter/src/stats.rs
rename to bin/src/stats.rs
diff --git a/rayhunter/static/css/style.css b/bin/static/css/style.css
similarity index 100%
rename from rayhunter/static/css/style.css
rename to bin/static/css/style.css
diff --git a/rayhunter/static/index.html b/bin/static/index.html
similarity index 100%
rename from rayhunter/static/index.html
rename to bin/static/index.html
diff --git a/rayhunter/static/js/main.js b/bin/static/js/main.js
similarity index 100%
rename from rayhunter/static/js/main.js
rename to bin/static/js/main.js
diff --git a/orca/Cargo.toml b/lib/Cargo.toml
similarity index 100%
rename from orca/Cargo.toml
rename to lib/Cargo.toml
diff --git a/orca/src/diag.rs b/lib/src/diag.rs
similarity index 100%
rename from orca/src/diag.rs
rename to lib/src/diag.rs
diff --git a/orca/src/diag_device.rs b/lib/src/diag_device.rs
similarity index 100%
rename from orca/src/diag_device.rs
rename to lib/src/diag_device.rs
diff --git a/orca/src/diag_reader.rs b/lib/src/diag_reader.rs
similarity index 100%
rename from orca/src/diag_reader.rs
rename to lib/src/diag_reader.rs
diff --git a/orca/src/gsmtap.rs b/lib/src/gsmtap.rs
similarity index 100%
rename from orca/src/gsmtap.rs
rename to lib/src/gsmtap.rs
diff --git a/orca/src/gsmtap_parser.rs b/lib/src/gsmtap_parser.rs
similarity index 100%
rename from orca/src/gsmtap_parser.rs
rename to lib/src/gsmtap_parser.rs
diff --git a/orca/src/hdlc.rs b/lib/src/hdlc.rs
similarity index 100%
rename from orca/src/hdlc.rs
rename to lib/src/hdlc.rs
diff --git a/orca/src/lib.rs b/lib/src/lib.rs
similarity index 100%
rename from orca/src/lib.rs
rename to lib/src/lib.rs
diff --git a/orca/src/log_codes.rs b/lib/src/log_codes.rs
similarity index 100%
rename from orca/src/log_codes.rs
rename to lib/src/log_codes.rs
diff --git a/orca/src/pcap.rs b/lib/src/pcap.rs
similarity index 100%
rename from orca/src/pcap.rs
rename to lib/src/pcap.rs
diff --git a/orca/src/qmdl.rs b/lib/src/qmdl.rs
similarity index 100%
rename from orca/src/qmdl.rs
rename to lib/src/qmdl.rs
diff --git a/orca/tests/test_lte_parsing.rs b/lib/tests/test_lte_parsing.rs
similarity index 100%
rename from orca/tests/test_lte_parsing.rs
rename to lib/tests/test_lte_parsing.rs