diff --git a/Cargo.toml b/Cargo.toml
index 39d4922..8bfca5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,31 +1,7 @@
-[package]
-name = "salobj"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-apache-avro = "0.19.0"
-base_topic_derive = {path = "base_topic_derive"}
-handle_command = {path = "handle_command"}
-chrono = "0.4"
-clap = { version = "4.1.6", features = ["derive"] }
-num-traits = "0.2.19"
-schema_registry_converter = { version = "4.5.0", features = ["avro"] }
-serde = "1.0.219"
-serde_derive = "1.0.219"
-serde_json = "1.0.142"
-serde-xml-rs = "0.8.1"
-tokio = { version = "1.47.1", features = ["full"] }
-whoami = "1.6.1"
-log = "0.4.27"
-simple_logger = "5.1.0"
-md5 = "0.8.0"
-rand = "0.9.2"
-futures = "0.3.31"
-rdkafka = { version = "0.38.0", features = ["cmake-build", "ssl", "gssapi-vendored"]}
-miniz_oxide = "0.8.9"
-
-[dev-dependencies]
-num-bigint = "0.4"
+[workspace]
+members = [
+    "salobj",
+    "base_topic_derive",
+    "handle_command",
+]
+resolver = "2"
diff --git a/base_topic_derive/Cargo.lock b/base_topic_derive/Cargo.lock
new file mode 100644
index 0000000..55b1ddc
--- /dev/null
+++ b/base_topic_derive/Cargo.lock
@@ -0,0 +1,46 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "base_topic_derive"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
diff --git a/handle_command/Cargo.lock b/handle_command/Cargo.lock
new file mode 100644
index 0000000..2c713ab
--- /dev/null
+++ b/handle_command/Cargo.lock
@@ -0,0 +1,63 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "handle_command"
+version = "0.1.0"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
diff --git a/salobj/Cargo.toml b/salobj/Cargo.toml
new file mode 100644
index 0000000..7a59c38
--- /dev/null
+++ b/salobj/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "salobj"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+apache-avro = "0.19.0"
+base_topic_derive = {path = "../base_topic_derive"}
+handle_command = {path = "../handle_command"}
+chrono = "0.4"
+clap = { version = "4.1.6", features = ["derive"] }
+num-traits = "0.2.19"
+schema_registry_converter = { version = "4.5.0", features = ["avro"] }
+serde = "1.0.219"
+serde_derive = "1.0.219"
+serde_json = "1.0.142"
+serde-xml-rs = "0.8.1"
+tokio = { version = "1.47.1", features = ["full"] }
+whoami = "1.6.1"
+log = "0.4.27"
+simple_logger = "5.1.0"
+md5 = "0.8.0"
+rand = "0.9.2"
+futures = "0.3.31"
+rdkafka = { version = "0.38.0", features = ["cmake-build", "ssl", "gssapi-vendored"]}
+miniz_oxide = "0.8.9"
+
+[dev-dependencies]
+num-bigint = "0.4"
diff --git a/examples/read_test_topic.rs b/salobj/examples/read_test_topic.rs
similarity index 100%
rename from examples/read_test_topic.rs
rename to salobj/examples/read_test_topic.rs
diff --git a/examples/write_test_topic.rs b/salobj/examples/write_test_topic.rs
similarity index 100%
rename from examples/write_test_topic.rs
rename to salobj/examples/write_test_topic.rs
diff --git a/src/bin/run_test_csc.rs b/salobj/src/bin/run_test_csc.rs
similarity index 100%
rename from src/bin/run_test_csc.rs
rename to salobj/src/bin/run_test_csc.rs
diff --git a/src/bin/set_summary_state.rs b/salobj/src/bin/set_summary_state.rs
similarity index 100%
rename from src/bin/set_summary_state.rs
rename to salobj/src/bin/set_summary_state.rs
diff --git a/src/component_info.rs b/salobj/src/component_info.rs
similarity index 100%
rename from src/component_info.rs
rename to salobj/src/component_info.rs
diff --git a/src/controller.rs b/salobj/src/controller.rs
similarity index 100%
rename from src/controller.rs
rename to salobj/src/controller.rs
diff --git a/src/csc/base_csc.rs b/salobj/src/csc/base_csc.rs
similarity index 100%
rename from src/csc/base_csc.rs
rename to salobj/src/csc/base_csc.rs
diff --git a/src/csc/mod.rs b/salobj/src/csc/mod.rs
similarity index 100%
rename from src/csc/mod.rs
rename to salobj/src/csc/mod.rs
diff --git a/src/csc/summary_state.rs b/salobj/src/csc/summary_state.rs
similarity index 100%
rename from src/csc/summary_state.rs
rename to salobj/src/csc/summary_state.rs
diff --git a/src/csc/test_csc/csc.rs b/salobj/src/csc/test_csc/csc.rs
similarity index 100%
rename from src/csc/test_csc/csc.rs
rename to salobj/src/csc/test_csc/csc.rs
diff --git a/src/csc/test_csc/mod.rs b/salobj/src/csc/test_csc/mod.rs
similarity index 100%
rename from src/csc/test_csc/mod.rs
rename to salobj/src/csc/test_csc/mod.rs
diff --git a/src/csc/test_csc/topics/arrays.rs b/salobj/src/csc/test_csc/topics/arrays.rs
similarity index 100%
rename from src/csc/test_csc/topics/arrays.rs
rename to salobj/src/csc/test_csc/topics/arrays.rs
diff --git a/src/csc/test_csc/topics/mod.rs b/salobj/src/csc/test_csc/topics/mod.rs
similarity index 100%
rename from src/csc/test_csc/topics/mod.rs
rename to salobj/src/csc/test_csc/topics/mod.rs
diff --git a/src/csc/test_csc/topics/scalars.rs b/salobj/src/csc/test_csc/topics/scalars.rs
similarity index 100%
rename from src/csc/test_csc/topics/scalars.rs
rename to salobj/src/csc/test_csc/topics/scalars.rs
diff --git a/src/csc/test_csc/topics/telemetry.rs b/salobj/src/csc/test_csc/topics/telemetry.rs
similarity index 100%
rename from src/csc/test_csc/topics/telemetry.rs
rename to salobj/src/csc/test_csc/topics/telemetry.rs
diff --git a/src/csc/test_csc/topics/wait.rs b/salobj/src/csc/test_csc/topics/wait.rs
similarity index 100%
rename from src/csc/test_csc/topics/wait.rs
rename to salobj/src/csc/test_csc/topics/wait.rs
diff --git a/src/domain.rs b/salobj/src/domain.rs
similarity index 100%
rename from src/domain.rs
rename to salobj/src/domain.rs
diff --git a/src/error/errors.rs b/salobj/src/error/errors.rs
similarity index 100%
rename from src/error/errors.rs
rename to salobj/src/error/errors.rs
diff --git a/src/error/mod.rs b/salobj/src/error/mod.rs
similarity index 100%
rename from src/error/mod.rs
rename to salobj/src/error/mod.rs
diff --git a/src/generics/ackcmd.rs b/salobj/src/generics/ackcmd.rs
similarity index 100%
rename from src/generics/ackcmd.rs
rename to salobj/src/generics/ackcmd.rs
diff --git a/src/generics/configuration_applied.rs b/salobj/src/generics/configuration_applied.rs
similarity index 100%
rename from src/generics/configuration_applied.rs
rename to salobj/src/generics/configuration_applied.rs
diff --git a/src/generics/configurations_available.rs b/salobj/src/generics/configurations_available.rs
similarity index 100%
rename from src/generics/configurations_available.rs
rename to salobj/src/generics/configurations_available.rs
diff --git a/src/generics/disable.rs b/salobj/src/generics/disable.rs
similarity index 100%
rename from src/generics/disable.rs
rename to salobj/src/generics/disable.rs
diff --git a/src/generics/empty_topic.rs b/salobj/src/generics/empty_topic.rs
similarity index 100%
rename from src/generics/empty_topic.rs
rename to salobj/src/generics/empty_topic.rs
diff --git a/src/generics/enable.rs b/salobj/src/generics/enable.rs
similarity index 100%
rename from src/generics/enable.rs
rename to salobj/src/generics/enable.rs
diff --git a/src/generics/enter_control.rs b/salobj/src/generics/enter_control.rs
similarity index 100%
rename from src/generics/enter_control.rs
rename to salobj/src/generics/enter_control.rs
diff --git a/src/generics/error_code.rs b/salobj/src/generics/error_code.rs
similarity index 100%
rename from src/generics/error_code.rs
rename to salobj/src/generics/error_code.rs
diff --git a/src/generics/exit_control.rs b/salobj/src/generics/exit_control.rs
similarity index 100%
rename from src/generics/exit_control.rs
rename to salobj/src/generics/exit_control.rs
diff --git a/src/generics/heartbeat.rs b/salobj/src/generics/heartbeat.rs
similarity index 100%
rename from src/generics/heartbeat.rs
rename to salobj/src/generics/heartbeat.rs
diff --git a/src/generics/large_file_object_available.rs b/salobj/src/generics/large_file_object_available.rs
similarity index 100%
rename from src/generics/large_file_object_available.rs
rename to salobj/src/generics/large_file_object_available.rs
diff --git a/src/generics/log_level.rs b/salobj/src/generics/log_level.rs
similarity index 100%
rename from src/generics/log_level.rs
rename to salobj/src/generics/log_level.rs
diff --git a/src/generics/log_message.rs b/salobj/src/generics/log_message.rs
similarity index 100%
rename from src/generics/log_message.rs
rename to salobj/src/generics/log_message.rs
diff --git a/src/generics/mod.rs b/salobj/src/generics/mod.rs
similarity index 100%
rename from src/generics/mod.rs
rename to salobj/src/generics/mod.rs
diff --git a/src/generics/set_log_level.rs b/salobj/src/generics/set_log_level.rs
similarity index 100%
rename from src/generics/set_log_level.rs
rename to salobj/src/generics/set_log_level.rs
diff --git a/src/generics/simulation_mode.rs b/salobj/src/generics/simulation_mode.rs
similarity index 100%
rename from src/generics/simulation_mode.rs
rename to salobj/src/generics/simulation_mode.rs
diff --git a/src/generics/software_version.rs b/salobj/src/generics/software_version.rs
similarity index 100%
rename from src/generics/software_version.rs
rename to salobj/src/generics/software_version.rs
diff --git a/src/generics/standby.rs b/salobj/src/generics/standby.rs
similarity index 100%
rename from src/generics/standby.rs
rename to salobj/src/generics/standby.rs
diff --git a/src/generics/start.rs b/salobj/src/generics/start.rs
similarity index 100%
rename from src/generics/start.rs
rename to salobj/src/generics/start.rs
diff --git a/src/generics/status_code.rs b/salobj/src/generics/status_code.rs
similarity index 100%
rename from src/generics/status_code.rs
rename to salobj/src/generics/status_code.rs
diff --git a/src/generics/summary_state.rs b/salobj/src/generics/summary_state.rs
similarity index 100%
rename from src/generics/summary_state.rs
rename to salobj/src/generics/summary_state.rs
diff --git a/src/lib.rs b/salobj/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to salobj/src/lib.rs
diff --git a/src/remote.rs b/salobj/src/remote.rs
similarity index 100%
rename from src/remote.rs
rename to salobj/src/remote.rs
diff --git a/src/sal_enums.rs b/salobj/src/sal_enums.rs
similarity index 100%
rename from src/sal_enums.rs
rename to salobj/src/sal_enums.rs
diff --git a/src/sal_info.rs b/salobj/src/sal_info.rs
similarity index 100%
rename from src/sal_info.rs
rename to salobj/src/sal_info.rs
diff --git a/src/sal_subsystem.rs b/salobj/src/sal_subsystem.rs
similarity index 100%
rename from src/sal_subsystem.rs
rename to salobj/src/sal_subsystem.rs
diff --git a/src/topics/base_sal_topic.rs b/salobj/src/topics/base_sal_topic.rs
similarity index 100%
rename from src/topics/base_sal_topic.rs
rename to salobj/src/topics/base_sal_topic.rs
diff --git a/src/topics/base_topic.rs b/salobj/src/topics/base_topic.rs
similarity index 100%
rename from src/topics/base_topic.rs
rename to salobj/src/topics/base_topic.rs
diff --git a/src/topics/controller_command.rs b/salobj/src/topics/controller_command.rs
similarity index 100%
rename from src/topics/controller_command.rs
rename to salobj/src/topics/controller_command.rs
diff --git a/src/topics/controller_command_ack.rs b/salobj/src/topics/controller_command_ack.rs
similarity index 100%
rename from src/topics/controller_command_ack.rs
rename to salobj/src/topics/controller_command_ack.rs
diff --git a/src/topics/mod.rs b/salobj/src/topics/mod.rs
similarity index 100%
rename from src/topics/mod.rs
rename to salobj/src/topics/mod.rs
diff --git a/src/topics/read_topic.rs b/salobj/src/topics/read_topic.rs
similarity index 100%
rename from src/topics/read_topic.rs
rename to salobj/src/topics/read_topic.rs
diff --git a/src/topics/remote_command.rs b/salobj/src/topics/remote_command.rs
similarity index 100%
rename from src/topics/remote_command.rs
rename to salobj/src/topics/remote_command.rs
diff --git a/src/topics/topic.rs b/salobj/src/topics/topic.rs
similarity index 100%
rename from src/topics/topic.rs
rename to salobj/src/topics/topic.rs
diff --git a/src/topics/topic_info.rs b/salobj/src/topics/topic_info.rs
similarity index 100%
rename from src/topics/topic_info.rs
rename to salobj/src/topics/topic_info.rs
diff --git a/src/topics/write_topic.rs b/salobj/src/topics/write_topic.rs
similarity index 100%
rename from src/topics/write_topic.rs
rename to salobj/src/topics/write_topic.rs
diff --git a/src/utils/cli.rs b/salobj/src/utils/cli.rs
similarity index 100%
rename from src/utils/cli.rs
rename to salobj/src/utils/cli.rs
diff --git a/src/utils/command_ack.rs b/salobj/src/utils/command_ack.rs
similarity index 100%
rename from src/utils/command_ack.rs
rename to salobj/src/utils/command_ack.rs
diff --git a/src/utils/csc.rs b/salobj/src/utils/csc.rs
similarity index 100%
rename from src/utils/csc.rs
rename to salobj/src/utils/csc.rs
diff --git a/src/utils/mod.rs b/salobj/src/utils/mod.rs
similarity index 100%
rename from src/utils/mod.rs
rename to salobj/src/utils/mod.rs
diff --git a/src/utils/schema_utils.rs b/salobj/src/utils/schema_utils.rs
similarity index 100%
rename from src/utils/schema_utils.rs
rename to salobj/src/utils/schema_utils.rs
diff --git a/src/utils/types.rs b/salobj/src/utils/types.rs
similarity index 100%
rename from src/utils/types.rs
rename to salobj/src/utils/types.rs
diff --git a/src/utils/xml_utils.rs b/salobj/src/utils/xml_utils.rs
similarity index 100%
rename from src/utils/xml_utils.rs
rename to salobj/src/utils/xml_utils.rs
diff --git a/tests/data/Test/Test_Commands.xml b/salobj/tests/data/Test/Test_Commands.xml
similarity index 100%
rename from tests/data/Test/Test_Commands.xml
rename to salobj/tests/data/Test/Test_Commands.xml
diff --git a/tests/data/Test/Test_Events.xml b/salobj/tests/data/Test/Test_Events.xml
similarity index 100%
rename from tests/data/Test/Test_Events.xml
rename to salobj/tests/data/Test/Test_Events.xml
diff --git a/tests/data/Test/Test_Generics.xml b/salobj/tests/data/Test/Test_Generics.xml
similarity index 100%
rename from tests/data/Test/Test_Generics.xml
rename to salobj/tests/data/Test/Test_Generics.xml
diff --git a/tests/data/Test/Test_Telemetry.xml b/salobj/tests/data/Test/Test_Telemetry.xml
similarity index 100%
rename from tests/data/Test/Test_Telemetry.xml
rename to salobj/tests/data/Test/Test_Telemetry.xml
diff --git a/tests/data/Test/Test_ackcmd.json b/salobj/tests/data/Test/Test_ackcmd.json
similarity index 100%
rename from tests/data/Test/Test_ackcmd.json
rename to salobj/tests/data/Test/Test_ackcmd.json
diff --git a/tests/data/Test/Test_arrays.json b/salobj/tests/data/Test/Test_arrays.json
similarity index 100%
rename from tests/data/Test/Test_arrays.json
rename to salobj/tests/data/Test/Test_arrays.json
diff --git a/tests/data/Test/Test_command_disable.json b/salobj/tests/data/Test/Test_command_disable.json
similarity index 100%
rename from tests/data/Test/Test_command_disable.json
rename to salobj/tests/data/Test/Test_command_disable.json
diff --git a/tests/data/Test/Test_command_enable.json b/salobj/tests/data/Test/Test_command_enable.json
similarity index 100%
rename from tests/data/Test/Test_command_enable.json
rename to salobj/tests/data/Test/Test_command_enable.json
diff --git a/tests/data/Test/Test_command_exitControl.json b/salobj/tests/data/Test/Test_command_exitControl.json
similarity index 100%
rename from tests/data/Test/Test_command_exitControl.json
rename to salobj/tests/data/Test/Test_command_exitControl.json
diff --git a/tests/data/Test/Test_command_fault.json b/salobj/tests/data/Test/Test_command_fault.json
similarity index 100%
rename from tests/data/Test/Test_command_fault.json
rename to salobj/tests/data/Test/Test_command_fault.json
diff --git a/tests/data/Test/Test_command_setArrays.json b/salobj/tests/data/Test/Test_command_setArrays.json
similarity index 100%
rename from tests/data/Test/Test_command_setArrays.json
rename to salobj/tests/data/Test/Test_command_setArrays.json
diff --git a/tests/data/Test/Test_command_setLogLevel.json b/salobj/tests/data/Test/Test_command_setLogLevel.json
similarity index 100%
rename from tests/data/Test/Test_command_setLogLevel.json
rename to salobj/tests/data/Test/Test_command_setLogLevel.json
diff --git a/tests/data/Test/Test_command_setScalars.json b/salobj/tests/data/Test/Test_command_setScalars.json
similarity index 100%
rename from tests/data/Test/Test_command_setScalars.json
rename to salobj/tests/data/Test/Test_command_setScalars.json
diff --git a/tests/data/Test/Test_command_standby.json b/salobj/tests/data/Test/Test_command_standby.json
similarity index 100%
rename from tests/data/Test/Test_command_standby.json
rename to salobj/tests/data/Test/Test_command_standby.json
diff --git a/tests/data/Test/Test_command_start.json b/salobj/tests/data/Test/Test_command_start.json
similarity index 100%
rename from tests/data/Test/Test_command_start.json
rename to salobj/tests/data/Test/Test_command_start.json
diff --git a/tests/data/Test/Test_command_wait.json b/salobj/tests/data/Test/Test_command_wait.json
similarity index 100%
rename from tests/data/Test/Test_command_wait.json
rename to salobj/tests/data/Test/Test_command_wait.json
diff --git a/tests/data/Test/Test_field_enums.json b/salobj/tests/data/Test/Test_field_enums.json
similarity index 100%
rename from tests/data/Test/Test_field_enums.json
rename to salobj/tests/data/Test/Test_field_enums.json
diff --git a/tests/data/Test/Test_global_enums.json b/salobj/tests/data/Test/Test_global_enums.json
similarity index 100%
rename from tests/data/Test/Test_global_enums.json
rename to salobj/tests/data/Test/Test_global_enums.json
diff --git a/tests/data/Test/Test_hash_table.json b/salobj/tests/data/Test/Test_hash_table.json
similarity index 100%
rename from tests/data/Test/Test_hash_table.json
rename to salobj/tests/data/Test/Test_hash_table.json
diff --git a/tests/data/Test/Test_logevent_arrays.json b/salobj/tests/data/Test/Test_logevent_arrays.json
similarity index 100%
rename from tests/data/Test/Test_logevent_arrays.json
rename to salobj/tests/data/Test/Test_logevent_arrays.json
diff --git a/tests/data/Test/Test_logevent_configurationApplied.json b/salobj/tests/data/Test/Test_logevent_configurationApplied.json
similarity index 100%
rename from tests/data/Test/Test_logevent_configurationApplied.json
rename to salobj/tests/data/Test/Test_logevent_configurationApplied.json
diff --git a/tests/data/Test/Test_logevent_configurationsAvailable.json b/salobj/tests/data/Test/Test_logevent_configurationsAvailable.json
similarity index 100%
rename from tests/data/Test/Test_logevent_configurationsAvailable.json
rename to salobj/tests/data/Test/Test_logevent_configurationsAvailable.json
diff --git a/tests/data/Test/Test_logevent_errorCode.json b/salobj/tests/data/Test/Test_logevent_errorCode.json
similarity index 100%
rename from tests/data/Test/Test_logevent_errorCode.json
rename to salobj/tests/data/Test/Test_logevent_errorCode.json
diff --git a/tests/data/Test/Test_logevent_heartbeat.json b/salobj/tests/data/Test/Test_logevent_heartbeat.json
similarity index 100%
rename from tests/data/Test/Test_logevent_heartbeat.json
rename to salobj/tests/data/Test/Test_logevent_heartbeat.json
diff --git a/tests/data/Test/Test_logevent_logLevel.json b/salobj/tests/data/Test/Test_logevent_logLevel.json
similarity index 100%
rename from tests/data/Test/Test_logevent_logLevel.json
rename to salobj/tests/data/Test/Test_logevent_logLevel.json
diff --git a/tests/data/Test/Test_logevent_logMessage.json b/salobj/tests/data/Test/Test_logevent_logMessage.json
similarity index 100%
rename from tests/data/Test/Test_logevent_logMessage.json
rename to salobj/tests/data/Test/Test_logevent_logMessage.json
diff --git a/tests/data/Test/Test_logevent_scalars.json b/salobj/tests/data/Test/Test_logevent_scalars.json
similarity index 100%
rename from tests/data/Test/Test_logevent_scalars.json
rename to salobj/tests/data/Test/Test_logevent_scalars.json
diff --git a/tests/data/Test/Test_logevent_simulationMode.json b/salobj/tests/data/Test/Test_logevent_simulationMode.json
similarity index 100%
rename from tests/data/Test/Test_logevent_simulationMode.json
rename to salobj/tests/data/Test/Test_logevent_simulationMode.json
diff --git a/tests/data/Test/Test_logevent_softwareVersions.json b/salobj/tests/data/Test/Test_logevent_softwareVersions.json
similarity index 100%
rename from tests/data/Test/Test_logevent_softwareVersions.json
rename to salobj/tests/data/Test/Test_logevent_softwareVersions.json
diff --git a/tests/data/Test/Test_logevent_summaryState.json b/salobj/tests/data/Test/Test_logevent_summaryState.json
similarity index 100%
rename from tests/data/Test/Test_logevent_summaryState.json
rename to salobj/tests/data/Test/Test_logevent_summaryState.json
diff --git a/tests/data/Test/Test_scalars.json b/salobj/tests/data/Test/Test_scalars.json
similarity index 100%
rename from tests/data/Test/Test_scalars.json
rename to salobj/tests/data/Test/Test_scalars.json
diff --git a/tests/test_base_csc.rs b/salobj/tests/test_base_csc.rs
similarity index 100%
rename from tests/test_base_csc.rs
rename to salobj/tests/test_base_csc.rs