30 files changed, 25 insertions, 42 deletions
diff --git a/.github/workflows/hosted.yml b/.github/workflows/hosted.yml
index b5b5a30f..61ee6175 100644
--- a/.github/workflows/hosted.yml
+++ b/.github/workflows/hosted.yml
@@ -16,4 +16,4 @@ jobs:
      steps:
       - uses: actions/checkout@v2
       - name: Test and Build script
-        run:  bash  ./scripts/test_build.sh
+        run:  bash  ./ci/test_build.sh
diff --git a/.github/workflows/self_hosted.yml b/.github/workflows/self_hosted.yml
index 35298f0d..e0df7f48 100644
--- a/.github/workflows/self_hosted.yml
+++ b/.github/workflows/self_hosted.yml
@@ -23,4 +23,4 @@ jobs:
      steps:
       - uses: actions/checkout@v2
       - name: Test and Build script
-        run:  bash  ./scripts/test_build.sh
+        run:  bash  ./ci/test_build.sh
diff --git a/Cargo.toml b/Cargo.toml
index cbffb168..cfe416e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 
 members = [
-    "mqtt/mqtt_client",
+    "common/mqtt_client",
     "tedge",
-    "tedge-mapper",
-    "translator/c8y_json_translator",
+    "mapper/cumulocity/c8y_mapper",
+    "mapper/cumulocity/c8y_translator_lib",
 ]
 
 [profile.release]
diff --git a/README.md b/README.md
index f29731ae..ec303cf3 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,2 @@
-# thin-edge
-The Software AG Thin Edge
-
-## Directory layout
-- thin-edge
-  - /core
-  - /translator
-    - /cumulocity
-    - /azure
-    - /aws
-  - /connector
-    - /apama
-  - /device-management
-    - /debian
-    - /docker
-    - /firmware
-    - /configuration
-    - /monitoring
-  - /tests
+# thin-edge.io
+The thin-edge.io
diff --git a/scripts/test_build.sh b/ci/test_build.sh
index 0d59eb38..0d59eb38 100755
--- a/scripts/test_build.sh
+++ b/ci/test_build.sh
diff --git a/mqtt/mqtt_client/Cargo.toml b/common/mqtt_client/Cargo.toml
index 5d2899d9..5d2899d9 100644
--- a/mqtt/mqtt_client/Cargo.toml
+++ b/common/mqtt_client/Cargo.toml
diff --git a/mqtt/mqtt_client/examples/publish_test.rs b/common/mqtt_client/examples/publish_test.rs
index e70475f0..e70475f0 100644
--- a/mqtt/mqtt_client/examples/publish_test.rs
+++ b/common/mqtt_client/examples/publish_test.rs
diff --git a/mqtt/mqtt_client/examples/simple_mapper.rs b/common/mqtt_client/examples/simple_mapper.rs
index 1a709bcf..1a709bcf 100644
--- a/mqtt/mqtt_client/examples/simple_mapper.rs
+++ b/common/mqtt_client/examples/simple_mapper.rs
diff --git a/mqtt/mqtt_client/examples/temperature_publisher.rs b/common/mqtt_client/examples/temperature_publisher.rs
index 49b304e3..49b304e3 100644
--- a/mqtt/mqtt_client/examples/temperature_publisher.rs
+++ b/common/mqtt_client/examples/temperature_publisher.rs
diff --git a/mqtt/mqtt_client/src/lib.rs b/common/mqtt_client/src/lib.rs
index eee88e48..eee88e48 100644
--- a/mqtt/mqtt_client/src/lib.rs
+++ b/common/mqtt_client/src/lib.rs
diff --git a/mqtt/mqtt_client/tests/integration_test.rs b/common/mqtt_client/tests/integration_test.rs
index e5b0e984..e5b0e984 100644
--- a/mqtt/mqtt_client/tests/integration_test.rs
+++ b/common/mqtt_client/tests/integration_test.rs
diff --git a/broker/configuration/cumulocity/.gitignore b/configuration/broker/configuration/cumulocity/.gitignore
index 6418d3f2..6418d3f2 100644
--- a/broker/configuration/cumulocity/.gitignore
+++ b/configuration/broker/configuration/cumulocity/.gitignore
diff --git a/broker/configuration/cumulocity/README.md b/configuration/broker/configuration/cumulocity/README.md
index 3fb874d0..3fb874d0 100644
--- a/broker/configuration/cumulocity/README.md
+++ b/configuration/broker/configuration/cumulocity/README.md
diff --git a/broker/configuration/cumulocity/c8y-trusted-root-certificates.pem b/configuration/broker/configuration/cumulocity/c8y-trusted-root-certificates.pem
index 25f2243f..25f2243f 100644
--- a/broker/configuration/cumulocity/c8y-trusted-root-certificates.pem
+++ b/configuration/broker/configuration/cumulocity/c8y-trusted-root-certificates.pem
diff --git a/broker/configuration/cumulocity/create-mosquitto-conf.sh b/configuration/broker/configuration/cumulocity/create-mosquitto-conf.sh
index b5705b90..b5705b90 100755
--- a/broker/configuration/cumulocity/create-mosquitto-conf.sh
+++ b/configuration/broker/configuration/cumulocity/create-mosquitto-conf.sh
diff --git a/broker/configuration/cumulocity/create-self-signed-certificate.sh b/configuration/broker/configuration/cumulocity/create-self-signed-certificate.sh
index 7f62c9f2..7f62c9f2 100755
--- a/broker/configuration/cumulocity/create-self-signed-certificate.sh
+++ b/configuration/broker/configuration/cumulocity/create-self-signed-certificate.sh
diff --git a/broker/configuration/cumulocity/test-bridge.sh b/configuration/broker/configuration/cumulocity/test-bridge.sh
index f62832c1..f62832c1 100755
--- a/broker/configuration/cumulocity/test-bridge.sh
+++ b/configuration/broker/configuration/cumulocity/test-bridge.sh
diff --git a/broker/configuration/cumulocity/upload-certificate.sh b/configuration/broker/configuration/cumulocity/upload-certificate.sh
index d18c33a6..d18c33a6 100755
--- a/broker/configuration/cumulocity/upload-certificate.sh
+++ b/configuration/broker/configuration/cumulocity/upload-certificate.sh
diff --git a/scripts/init/README.md b/configuration/init/README.md
index 45ab6ab3..45ab6ab3 100644
--- a/scripts/init/README.md
+++ b/configuration/init/README.md
diff --git a/scripts/init/initd/tedge b/configuration/init/initd/tedge
index 30734c74..30734c74 100644
--- a/scripts/init/initd/tedge
+++ b/configuration/init/initd/tedge
diff --git a/scripts/init/systemd/tedge-mapper.service b/configuration/init/systemd/tedge-mapper.service
index 5e299f99..5e299f99 100644
--- a/scripts/init/systemd/tedge-mapper.service
+++ b/configuration/init/systemd/tedge-mapper.service
diff --git a/scripts/init/systemd/tedge.service b/configuration/init/systemd/tedge.service
index a925d134..a925d134 100644
--- a/scripts/init/systemd/tedge.service
+++ b/configuration/init/systemd/tedge.service
diff --git a/mapper/cumulocity/c8y_mapper/Cargo.toml b/mapper/cumulocity/c8y_mapper/Cargo.toml
new file mode 100644
index 00000000..06091236
--- /dev/null
+++ b/mapper/cumulocity/c8y_mapper/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "c8y_mapper"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+c8y_translator_lib = {version = "0.1.0", path = "../c8y_translator_lib" }
+chrono = "0.4.19"
+env_logger = "0.8.2"
+log = "0.4.14"
+mqtt_client = {version = "0.1.0", path = "../../../common/mqtt_client" }
+tokio = { version = "1.1.0", features = ["full"] }
diff --git a/tedge-mapper/src/main.rs b/mapper/cumulocity/c8y_mapper/src/main.rs
index a5637823..a5637823 100644
--- a/tedge-mapper/src/main.rs
+++ b/mapper/cumulocity/c8y_mapper/src/main.rs
diff --git a/tedge-mapper/src/mapper.rs b/mapper/cumulocity/c8y_mapper/src/mapper.rs
index 9882ae72..558adaaf 100644
--- a/tedge-mapper/src/mapper.rs
+++ b/mapper/cumulocity/c8y_mapper/src/mapper.rs
@@ -1,4 +1,4 @@
-use c8y_json_translator::CumulocityJson;
+use c8y_translator_lib::CumulocityJson;
 
 use log;
 
@@ -88,7 +88,7 @@ impl Mapper {
         Ok(())
     }
 
-    fn map(input: &[u8]) -> Result<Vec<u8>, c8y_json_translator::ThinEdgeJsonError> {
+    fn map(input: &[u8]) -> Result<Vec<u8>, c8y_translator_lib::ThinEdgeJsonError> {
         CumulocityJson::from_thin_edge_json(input)
     }
 }
diff --git a/translator/c8y_json_translator/Cargo.toml b/mapper/cumulocity/c8y_translator_lib/Cargo.toml
index bece0a2e..76947fdd 100644
--- a/translator/c8y_json_translator/Cargo.toml
+++ b/mapper/cumulocity/c8y_translator_lib/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "c8y_json_translator"
+name = "c8y_translator_lib"
 version = "0.1.0"
 edition = "2018"
 
diff --git a/translator/c8y_json_translator/examples/translate_to_c8yjson.rs b/mapper/cumulocity/c8y_translator_lib/examples/translate_to_c8yjson.rs
index 7d39bce6..37219535 100644
--- a/translator/c8y_json_translator/examples/translate_to_c8yjson.rs
+++ b/mapper/cumulocity/c8y_translator_lib/examples/translate_to_c8yjson.rs
@@ -1,4 +1,4 @@
-use c8y_json_translator::CumulocityJson;
+use c8y_translator_lib::CumulocityJson;
 
 fn single_value_translation() {
     let single_value_thin_edge_json = r#"  {
diff --git a/translator/c8y_json_translator/src/lib.rs b/mapper/cumulocity/c8y_translator_lib/src/lib.rs
index 6d5f2b7f..210b535e 100644
--- a/translator/c8y_json_translator/src/lib.rs
+++ b/mapper/cumulocity/c8y_translator_lib/src/lib.rs
@@ -2,7 +2,7 @@
 //! Takes thin_edge_json bytes and returns c8y json bytes
 //!
 //! ```
-//! use c8y_json_translator::CumulocityJson;
+//! use c8y_translator_lib::CumulocityJson;
 //! let single_value_thin_edge_json = r#"{
 //!        "time": "2020-06-22T17:03:14.000+02:00",
 //!        "temperature": 23,
diff --git a/tedge-mapper/Cargo.toml b/tedge-mapper/Cargo.toml
deleted file mode 100644
index 76b52e2f..00000000
--- a/tedge-mapper/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "tedge-mapper"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-c8y_json_translator = {version = "0.1.0", path = "../translator/c8y_json_translator"}
-chrono = "0.4.19"
-env_logger = "0.8.2"
-log = "0.4.14"
-mqtt_client = {version = "0.1.0", path = "../mqtt/mqtt_client"}
-tokio = { version = "1.1.0", features = ["full"] }
diff --git a/tedge/Cargo.toml b/tedge/Cargo.toml
index 232fe8a3..41767a7a 100644
--- a/tedge/Cargo.toml
+++ b/tedge/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.12"
 futures-timer = "3.0.2"
 json = "0.12.4"
 log = "0.4.14"
-mqtt_client = {version = "0.1.0", path = "../mqtt/mqtt_client"}
+mqtt_client = {version = "0.1.0", path = "../common/mqtt_client" }
 rand = "0.8.3"
 rcgen = { version = "0.8.9", features = ["pem"] }
 rumqttc = { git = "https://github.com/bytebeamio/rumqtt" }