diff --git a/.gitignore b/.gitignore
index 63881a2cbc..668a16a426 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ CMakeLists.txt.user
 
 # CLion project files
 /.idea
+
+#macOS
+.DS_Store
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab67305ca7..2fd567c2b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(HAS_HDF5                                "Platform supports HDF5 library"
 option(HAS_QT5                                 "Platform supports Qt 5 library"                                    ON)
 option(HAS_CAPNPROTO                           "Platform supports Cap'n Proto library"                            OFF)
 
-option(BUILD_DOCS                              "Build the eCAL documentation"                                      ON)
+option(BUILD_DOCS                              "Build the eCAL documentation"                                     OFF)
 option(BUILD_APPS                              "Build the eCAL applications"                                       ON)
 option(BUILD_SAMPLES                           "Build the eCAL samples"                                            ON)
 option(BUILD_TIME                              "Build the eCAL time interfaces"                                    ON)
@@ -116,7 +116,7 @@ if (ECAL_THIRDPARTY_BUILD_PROTOBUF)
     add_executable(protobuf::protoc ALIAS protoc)
     set(Protobuf_PROTOC_EXECUTABLE protoc)
   endif()
-  set(Protobuf_VERSION 3.5.1)
+  set(Protobuf_VERSION 3.11.4)
 endif()
 
 if (ECAL_THIRDPARTY_BUILD_SPDLOG)
@@ -310,24 +310,24 @@ endif()
 # --------------------------------------------------------
 # protobuf utilities
 # --------------------------------------------------------
-add_subdirectory(contrib/ecalproto/src)
+add_subdirectory(contrib/ecalproto)
 
 # --------------------------------------------------------
 # ecal core internal protobuf
 # --------------------------------------------------------
-add_subdirectory(ecal/pb/src)
+add_subdirectory(ecal/pb)
 
 # --------------------------------------------------------
 # ecal core
 # --------------------------------------------------------
-add_subdirectory(ecal/core/src)
+add_subdirectory(ecal/core)
 
 # --------------------------------------------------------
 # custom libs
 # --------------------------------------------------------
 add_subdirectory(lib/ThreadingUtils)
 add_subdirectory(lib/CustomTclap)
-add_subdirectory(lib/EcalUtils)
+add_subdirectory(lib/ecal_utils)
 if(HAS_QT5)
   add_subdirectory(lib/CustomQt)
 endif()
@@ -358,7 +358,7 @@ endif()
 # ecal hdf5 support
 # --------------------------------------------------------
 if(HAS_HDF5)
-  add_subdirectory(contrib/ecalhdf5/src)
+  add_subdirectory(contrib/ecalhdf5)
   add_subdirectory(contrib/message)
 endif()
 
@@ -374,7 +374,7 @@ endif()
 # --------------------------------------------------------
 if(BUILD_CSHARP_BINDING AND WIN32)
   add_subdirectory(lang/csharp/Continental/eCAL/Core/)
-  #add_subdirectory(lang/csharp/Continental/eCAL/Protobuf/)
+  add_subdirectory(lang/csharp/Continental/eCAL/Protobuf/)
 endif()
 
 # --------------------------------------------------------
@@ -382,7 +382,7 @@ endif()
 # --------------------------------------------------------
 add_subdirectory(app/apps)
 if(BUILD_APPS)
-  add_subdirectory(app/mon/topic)
+  add_subdirectory(app/mon/mon_cli)
   add_subdirectory(app/util/config)
   add_subdirectory(app/util/stop)
 endif()
@@ -437,24 +437,24 @@ if(BUILD_TESTS)
   # test contrib
   # ------------------------------------------------------
   if(HAS_HDF5)
-    add_subdirectory(testing/contrib/ecalhdf5/hdf5_test/src)
+    add_subdirectory(testing/contrib/ecalhdf5/hdf5_test)
   endif()
-  add_subdirectory(testing/contrib/ecalproto/dynproto_test/src)
-  add_subdirectory(testing/contrib/ecalproto/ecal_proto_test/src)
+  add_subdirectory(testing/contrib/ecalproto/dynproto_test)
+  add_subdirectory(testing/contrib/ecalproto/ecal_proto_test)
 
   # ------------------------------------------------------
   # test ecal
   # ------------------------------------------------------
-  add_subdirectory(testing/ecal/clientserver_test/src)
-  add_subdirectory(testing/ecal/core_test/src)
-  add_subdirectory(testing/ecal/event_test/src)
-  add_subdirectory(testing/ecal/expmap_test/src)
+  add_subdirectory(testing/ecal/clientserver_test)
+  add_subdirectory(testing/ecal/core_test)
+  add_subdirectory(testing/ecal/event_test)
+  add_subdirectory(testing/ecal/expmap_test)
 if(NOT ECAL_LAYER_ICEORYX)
-  add_subdirectory(testing/ecal/io_memfile_test/src)
+  add_subdirectory(testing/ecal/io_memfile_test)
 endif(NOT ECAL_LAYER_ICEORYX)
-  add_subdirectory(testing/ecal/pubsub_inproc_test/src)
-  add_subdirectory(testing/ecal/pubsub_proto_test/src)
-  add_subdirectory(testing/ecal/pubsub_test/src)
+  add_subdirectory(testing/ecal/pubsub_inproc_test)
+  add_subdirectory(testing/ecal/pubsub_proto_test)
+  add_subdirectory(testing/ecal/pubsub_test)
 endif()
 
 # --------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..882e2001c0
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,2 @@
+@Library('ecal-ci') _
+executeMatrixPipeline()
diff --git a/README.md b/README.md
index 7546810de3..ffc4ae3fc6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-
-
 # eCAL - enhanced Communication Abstraction Layer
 
 Copyright (c) 2019, Continental Corporation.
@@ -50,43 +48,26 @@ git submodule update
 
 eCAL is using CMake as build system. When configuring with CMake, you can turn on / off the following features.
 
-- `HAS_HDF5`, default: `ON`
-  Platform supports HDF5 library, necessary to build eCAL recording / replay tools
-- `HAS_QT5`, default: `ON`
-  Platform supports Qt 5 library, necessary to build eCAL monitoring tool
-- `HAS_CAPNPROTO`, default: `OFF`
-  Platform supports Cap'n Proto library, necessary to use capnp serialization as message system and to enable eCAL monitoring capnp message reflection
-  eCAL does not add Cap'n Proto as a submodule. If you set this option to `ON`, please make sure that the library is installed on your system and CMake can find it (consider setting CMAKE_PREFIX_PATH to point to the library).
-- `BUILD_DOCS`, default `ON`
-  Build the eCAL documentation, requires the installation of doxygen and a recent CMake version (>= 3.14 preferred, but some lower versions might work)
-- `BUILD_APPS`, default `ON`,
-  Build the eCAL applications, such as the monitoring tool
-- `BUILD_SAMPLES`, default `OFF`
-  Build the eCAL sample applications
-- `BUILD_TIME`, default `ON`
-  Build the eCAL time interfaces, necessary if you want to use ecal in time synchronized mode (based on ptp for example)
-- `BUILD_PY_BINDING`, default `OFF`
-  Build the eCAL python language binding
-- `BUILD_CSHARP_BINDING`, default `OFF`
-  Build the eCAL C# language binding
-- `BUILD_TESTS', default `OFF`
-  Build the eCAL google tests
-- `ECAL_LAYER_ICEORYX`, default `OFF`
-  Use iceoryx shared memory as local communication layer, requires [eclipse/iceoryx](https://github.com/eclipse/iceoryx) installation
-- `ECAL_INCLUDE_PY_SAMPLES`, default: `OFF`
-  Include python language sample projects into CMake
-- `ECAL_INSTALL_SAMPLE_SOURCES`, default: `ON`
-  Install the sources of eCAL samples
-- `ECAL_JOIN_MULTICAST_TWICE`, default: `OFF`
-  Specific multicast network bug workaround
-- `ECAL_NPCAP_SUPPORT`, default `OFF`
-  Enable the eCAL to use Npcap for udp socket communication (i.e. the Win10 performance fix)
-- `ECAL_THIRDPARTY_BUILD_PROTOBUF`, default `ON`
-  Build Protobuf with eCAL, included as a submodule in the thirdparty folder. You can always use your custom protobuf installation, this is only for convenience. Note, at least protobuf 3.0 is required to compile eCAL, we recommend using 3.5.1 or newer (tested with 3.5.1).
-- `ECAL_THIRDPARTY_BUILD_SPDLOG`, default `ON`
-  Build Spdlog with eCAL, included as a submodule in the thirdparty folder. You can always use your custom spdlog installation, this is only for convenience.
-- `ECAL_THIRDPARTY_BUILD_GTEST`, default `OFF`
-  Build GoogleTest with eCAL, included as a submodule in the thirdparty folder. You can always use your custom gtest installation, this is only for convenience.
+| CMake option                     | Default | Description |
+|----------------------------------|---------|------------ |
+| `HAS_HDF5`                       | `ON`    | Platform supports HDF5 library, necessary to build eCAL recording / replay tools |
+| `HAS_QT5`                        | `ON`    | Platform supports Qt 5 library, necessary to build eCAL monitoring tool |
+| `HAS_CAPNPROTO`                  | `OFF`   | Platform supports Cap'n Proto library, necessary to use capnp serialization as message system and to enable eCAL monitoring capnp message reflection. eCAL does not add Cap'n Proto as a submodule. If you set this option to `ON`, please make sure that the library is installed on your system and CMake can find it (consider setting CMAKE_PREFIX_PATH to point to the library). |
+| `BUILD_DOCS`                     | `OFF`   | Build the eCAL documentation, requires the installation of doxygen and a recent CMake version (>= 3.14 preferred, but some lower versions might work) |
+| `BUILD_APPS`                     | `ON`    | Build the eCAL applications, such as the monitoring tool |
+| `BUILD_SAMPLES`                  | `OFF`   | Build the eCAL sample applications |
+| `BUILD_TIME`                     | `ON`    | Build the eCAL time interfaces, necessary if you want to use ecal in time synchronized mode (based on ptp for example) |
+| `BUILD_PY_BINDING`               | `OFF`   | Build the eCAL python language binding |
+| `BUILD_CSHARP_BINDING`           | `OFF`   | Build the eCAL C# language binding |
+| `BUILD_TESTS`                    | `OFF`   | Build the eCAL google tests |
+| `ECAL_LAYER_ICEORYX`             | `OFF`   | Use iceoryx shared memory as local communication layer, requires [eclipse/iceoryx](https://github.com/eclipse/iceoryx) installation |
+| `ECAL_INCLUDE_PY_SAMPLES`        | `OFF`   | Include python language sample projects into CMake |
+| `ECAL_INSTALL_SAMPLE_SOURCES`    | `ON`    | Install the sources of eCAL samples |
+| `ECAL_JOIN_MULTICAST_TWICE`      | `OFF`   | Specific multicast network bug workaround |
+| `ECAL_NPCAP_SUPPORT`             | `OFF`   | Enable the eCAL to use Npcap for udp socket communication (i.e. the Win10 performance fix) |
+| `ECAL_THIRDPARTY_BUILD_PROTOBUF` | `ON`    | Build Protobuf with eCAL, included as a submodule in the thirdparty folder. You can always use your custom protobuf installation, this is only for convenience. Note, at least protobuf 3.0 is required to compile eCAL, we recommend using 3.11.4 or newer (tested with 3.11.4). |
+| `ECAL_THIRDPARTY_BUILD_SPDLOG`   | `ON`    | Build Spdlog with eCAL, included as a submodule in the thirdparty folder. You can always use your custom spdlog installation, this is only for convenience. |
+| `ECAL_THIRDPARTY_BUILD_GTEST`    | `OFF`   | Build GoogleTest with eCAL, included as a submodule in the thirdparty folder. You can always use your custom gtest installation, this is only for convenience. |
 
 All options can be passed on the command line `cmake -D<option>=<value>` or in the CMake GUI application.
 
@@ -128,7 +109,7 @@ All options can be passed on the command line `cmake -D<option>=<value>` or in t
 	sudo apt-get -y install git cmake doxygen graphviz build-essential zlib1g-dev qt5-default libhdf5-dev libprotobuf-dev libprotoc-dev protobuf-compiler
 	```
 	
-3. If you plan to create the eCAL python language extension (here as an example for the pythonm 3.6 version):
+3. If you plan to create the eCAL python language extension (here as an example for the python 3.6 version):
 	```bash
 	sudo apt-get install python3.6-dev
 	sudo apt-get install python3-pip
@@ -137,19 +118,23 @@ All options can be passed on the command line `cmake -D<option>=<value>` or in t
 
 ### Compile eCAL
 1. Check out the repository as described [here](#checkout-the-repository).
-2. Compile eCAL:
+
+3. Compile eCAL:
+_(Disable the THIRDPARTY_BUILD_PROTOBUF cmake option to not get a conflict with your installed protobuf version!)_
 	```bash
 	mkdir _build
 	cd _build
 	cmake .. -DCMAKE_BUILD_TYPE=Release -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF
 	make -j4
 	```
-3. Create a debian package and install it, if desired:
+	
+4. Create a debian package and install it, if desired:
 	```bash
 	cpack -G DEB
 	sudo dpkg -i _deploy/eCAL-*
 	```
-3. Create and install the eCAL python egg:
+	
+5. Create and install the eCAL python egg:
 	```bash
 	cmake --build . --target create_python_egg --config Release
 	sudo python3 -m easy_install _deploy/ecal-*
@@ -157,7 +142,9 @@ All options can be passed on the command line `cmake -D<option>=<value>` or in t
 
 ### UDP network configuration
 
-setup the correct ip address - here for adapter eth0, ip address 192.168.0.1
+#### Setup the ip address
+
+First you need to setup the correct ip address for sure - here for adapter eth0, ip address 192.168.0.1
 
 ```bash
 sudo ifconfig eth0 192.168.0.1 netmask 255.255.255.0
@@ -165,7 +152,9 @@ sudo ifconfig eth0 192.168.0.1 netmask 255.255.255.0
 
 Restart the ethernet interface or the whole machine to apply changes, check if you can ping to each other.
 
-After the ipc configuration setup the multicast route for udp multicasting
+#### Setup the multicast routes
+
+After the ip configuration you need to setup the multicast route for udp multicasting
 
 ```bash
 ifconfig eth0 multicast 
@@ -255,8 +244,15 @@ Afterwards you will find the python eCAL egg in the _deploy subfolder inside you
 python -m easy_install ecal-X.Y.Z-pyX.Y.egg
 ```
 
+#### Create eCAL csharp extension
+
+To build the eCAL csharp extension you need to set the CMake option `BUILD_CSHARP_BINDING` to `ON`. In order to make the CSharp Google::Protobuf extesnsion work you need to install additionally the Microsoft package management tool [Nuget](https://www.nuget.org/downloads). Please 
+ensure that the installation path is part of your windows user or system PATH environment variable. Nuget will be used to download the .Net Google.Protobuf package automatically when building the extension.
+
 ### UDP network configuration
 
+#### Setup the multicast routes
+
 You need to open a command window with administrative (!) privileges. Then run
 
 ```bat
@@ -285,6 +281,56 @@ You can find the ecal.ini configuration file under %APPDATA%\eCAL.
 Don't forget to disable any windows firewall.
 
 
+#### Network performance issue on Windows 10 Systems - Npcap
+
+##### Background
+
+The "normal" eCAL Multicast communication may lead to low performance on Windows 10. This is not an eCAL issue but related to the Windows Firewall Service which cannot be deactivated since Win 10, any more. eCAL however includes an option to work around that issue. For that you have to install the Npcap driver and configure eCAL to use it.
+
+##### How to use Npcap
+
+  1. Download Npcap: https://nmap.org/npcap/
+
+  2. Install Npcap with default Options:
+
+  ![Npcap installer'](gfx/configuration/npcap_installer.png?raw=true "Npcap installer")
+
+  3. Remove all elements / protocols except NPCAP and NPF from the Npcap Loopback Adapter
+
+   **This is important, as you may not be able to connect to your corporate Wifi any more, if you skip this step!**
+
+   The NPF element is only available if you installed Npcap in WinPcap compatibility mode
+
+  ![Npcap settings'](gfx/configuration/npcap_settings.png?raw=true "Npcap settings")
+
+  4. Edit `[C:/Program Data/eCAL/]ecal.ini`:
+
+```
+   npcap_enabled = true
+```
+
+  5. Check eCAL Mon
+
+  ![Npcap eCALMon'](gfx/configuration/npcap_ecalmon.png?raw=true "Npcap eCALMon")
+
+
+##### Troubleshooting
+
+If you enable Npcap but didn't install it, installed it with the wrong settings or your installation is broken, eCAL Mon will tell you that the Npcap Initialization has failed. eCAL will still work, but not use Npcap.
+
+Npcap seems to break itself if you reinstall it, as the uninstaller does not remove the Loopback Adapter properly. The new Npcap installation will fail to create a new Loopback Adapter and the installation will be corrupt!
+
+Please do a clean install of Npcap:
+
+  1. Uninstall Npcap
+
+  2. Manually uninstall all Npcap Loopback Adapters using the Windows device manager.
+
+  3. Manually uninstall all Microsoft KM-TEST Loopback adapters with the device manager
+
+  4. Install Npcap again with the settings above
+
+
 ## Transport Layer Concept
 
 eCAL is able to communicate on different so called transport layers, but first of all you have to decide if you want to communicate in a network or in a local host only mode. To configure this you need to set the ecal.ini [network/network_enabled] parameter to true (network communication mode) or false (local host only communication mode).
@@ -327,7 +373,7 @@ Besides the communication core eCAL comes with some high-level applications for
 ### Monitor
 
 To start the monitor please open the application from the windows start menu or type
-```ecal_mon``` on a linux system.
+```ecal_mon_gui``` on a linux system.
 
 The monitor provides different kinds of sorted views for all eCAL publications, subscriptions or service instances. The content of messages is visualized with plugins. Currently the monitor is shipped with ready to use plugins for two serialization formats ([google protobuf](https://developers.google.com/protocol-buffers) and [capnproto](https://capnproto.org/).), as well as simple string data.
 
@@ -1150,6 +1196,9 @@ public class minimal_snd
       System.Threading.Thread.Sleep(100);
     }
 
+    // dispose publisher
+    publisher.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
@@ -1182,6 +1231,9 @@ public class minimal_rcv
       if (message != null) System.Console.WriteLine(String.Format("Received:  {0}", message.data));
     }
 
+    // dispose subscriber
+    subscriber.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
@@ -1218,6 +1270,9 @@ public class minimal_rcv_cb
       System.Threading.Thread.Sleep(100);
     }
 
+    // dispose subscriber
+    subscriber.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
@@ -1343,3 +1398,4 @@ Will load the specified default eCAL ini file and print out the loaded configura
 *eCAL* is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE.txt) for the full license text.
 
 > Written with [StackEdit](https://stackedit.io/).
+
diff --git a/app/apps/include/ecal/ecal_apps.h b/app/apps/include/ecal/ecal_apps.h
index 1447d5f4ae..0c561a6c8e 100644
--- a/app/apps/include/ecal/ecal_apps.h
+++ b/app/apps/include/ecal/ecal_apps.h
@@ -23,9 +23,9 @@ namespace eCAL
 {
   namespace Apps
   {
-    constexpr char MON[]      = "ecal_mon";
-    constexpr char REC[]      = "ecal_rec";
+    constexpr char MON_GUI[]  = "ecal_mon_gui";
     constexpr char PLAY_GUI[] = "ecal_play_gui";
+    constexpr char REC[]      = "ecal_rec";
     constexpr char REC_GUI[]  = "ecal_rec_gui";
   }
 }
diff --git a/app/iconset/FlorianReimold/puzzle_blue_error.svg b/app/iconset/FlorianReimold/puzzle_blue_error.svg
new file mode 100644
index 0000000000..d5077e17d8
--- /dev/null
+++ b/app/iconset/FlorianReimold/puzzle_blue_error.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46666"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="puzzle_blue_error.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 67.73333 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="135.46666 : 67.73333 : 1"
+       inkscape:persp3d-origin="67.73333 : 45.155553 : 1"
+       id="perspective839" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-1610.4993"
+     inkscape:cy="676.23974"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53336)">
+    <path
+       style="opacity:1;fill:#004ba0;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="M 320 0 A 55.999999 56.428581 0 0 0 264 56.427734 A 55.999999 56.428581 0 0 0 288 102.71094 L 288 128 L 160 128 C 142.27199 128 128 142.27199 128 160 L 128 288 L 102.65625 288 A 56.42858 55.999998 3.5082388e-15 0 0 56.427734 264 A 56.42858 55.999998 3.5082388e-15 0 0 0 320 A 56.42858 55.999998 3.5082388e-15 0 0 56.427734 376 A 56.42858 55.999998 3.5082388e-15 0 0 102.71094 352 L 128 352 L 128 480 C 128 497.72801 142.27199 512 160 512 L 288 512 L 288 486.71094 A 55.999997 56.428579 0 0 1 264 440.42773 A 55.999997 56.428579 0 0 1 320 384 A 55.999997 56.428579 0 0 1 376 440.42773 A 55.999997 56.428579 0 0 1 352 486.65625 L 352 512 L 480 512 C 497.72801 512 512 497.72801 512 480 L 512 352 L 486.71094 352 A 56.428577 55.999995 3.5082388e-15 0 1 440.42773 376 A 56.428577 55.999995 3.5082388e-15 0 1 384 320 A 56.428577 55.999995 3.5082388e-15 0 1 440.42773 264 A 56.428577 55.999995 3.5082388e-15 0 1 486.65625 288 L 512 288 L 512 160 C 512 142.27199 497.72801 128 480 128 L 352 128 L 352 102.65625 A 55.999999 56.428581 0 0 0 376 56.427734 A 55.999999 56.428581 0 0 0 320 0 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,161.53336)"
+       id="rect833" />
+    <g
+       id="g834"
+       transform="translate(-42.333326,-67.733336)">
+      <path
+         style="fill:#e00000;fill-opacity:1;stroke:#301010;stroke-width:8.46666622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 131.23333,275.83335 c -3.20432,10e-4 -6.12923,1.81543 -7.56164,4.68017 -11.30112,22.55848 -22.58926,45.15647 -33.877694,67.73333 -0.504105,1.26882 -0.880614,2.62464 -0.894003,3.78651 0,4.67601 3.790656,8.46667 8.466667,8.46667 h 67.73333 c 4.67602,0 8.46667,-3.79066 8.46667,-8.46667 -0.001,-1.31366 -0.30765,-2.60907 -0.89572,-3.78375 -11.81751,-23.57955 -23.74765,-47.55536 -33.86801,-67.73608 -1.43373,-2.8673 -4.36529,-4.68167 -7.5696,-4.68018 z"
+         id="path901"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zccccssccz" />
+      <circle
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.64444399;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="path4648"
+         cx="131.23332"
+         cy="343.7431"
+         r="5.644444" />
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.49117374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect4650"
+         width="11.288888"
+         height="37.394451"
+         x="125.58888"
+         y="295.5889"
+         ry="5.3420639" />
+    </g>
+  </g>
+</svg>
diff --git a/app/iconset/FlorianReimold/puzzle_blue_warning.svg b/app/iconset/FlorianReimold/puzzle_blue_warning.svg
new file mode 100644
index 0000000000..01e82f0672
--- /dev/null
+++ b/app/iconset/FlorianReimold/puzzle_blue_warning.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46666"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="puzzle_blue_warning.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 67.73333 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="135.46666 : 67.73333 : 1"
+       inkscape:persp3d-origin="67.73333 : 45.155553 : 1"
+       id="perspective839" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-862.6704"
+     inkscape:cy="676.23974"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53336)">
+    <path
+       style="opacity:1;fill:#004ba0;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="M 320 0 A 55.999999 56.428581 0 0 0 264 56.427734 A 55.999999 56.428581 0 0 0 288 102.71094 L 288 128 L 160 128 C 142.27199 128 128 142.27199 128 160 L 128 288 L 102.65625 288 A 56.42858 55.999998 3.5082388e-15 0 0 56.427734 264 A 56.42858 55.999998 3.5082388e-15 0 0 0 320 A 56.42858 55.999998 3.5082388e-15 0 0 56.427734 376 A 56.42858 55.999998 3.5082388e-15 0 0 102.71094 352 L 128 352 L 128 480 C 128 497.72801 142.27199 512 160 512 L 288 512 L 288 486.71094 A 55.999997 56.428579 0 0 1 264 440.42773 A 55.999997 56.428579 0 0 1 320 384 A 55.999997 56.428579 0 0 1 376 440.42773 A 55.999997 56.428579 0 0 1 352 486.65625 L 352 512 L 480 512 C 497.72801 512 512 497.72801 512 480 L 512 352 L 486.71094 352 A 56.428577 55.999995 3.5082388e-15 0 1 440.42773 376 A 56.428577 55.999995 3.5082388e-15 0 1 384 320 A 56.428577 55.999995 3.5082388e-15 0 1 440.42773 264 A 56.428577 55.999995 3.5082388e-15 0 1 486.65625 288 L 512 288 L 512 160 C 512 142.27199 497.72801 128 480 128 L 352 128 L 352 102.65625 A 55.999999 56.428581 0 0 0 376 56.427734 A 55.999999 56.428581 0 0 0 320 0 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,161.53336)"
+       id="rect833" />
+    <g
+       id="g849"
+       transform="translate(-33.866656,-127)">
+      <path
+         style="fill:#ffcd33;fill-opacity:1;stroke:#302810;stroke-width:8.46666622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 122.76666,335.10001 c -3.20432,10e-4 -6.12923,1.81543 -7.56164,4.68017 -11.30112,22.55848 -22.589261,45.15647 -33.87769,67.73333 -0.504105,1.26882 -0.880615,2.62464 -0.894003,3.78651 0,4.67601 3.790656,8.46667 8.466666,8.46667 h 67.733337 c 4.67601,0 8.46666,-3.79066 8.46666,-8.46667 -0.001,-1.31366 -0.30765,-2.60907 -0.89572,-3.78375 -11.81751,-23.57955 -23.74765,-47.55536 -33.868,-67.73608 -1.43374,-2.8673 -4.36529,-4.68167 -7.56961,-4.68018 z"
+         id="path901-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zccccssccz" />
+      <circle
+         style="opacity:1;fill:#302810;fill-opacity:1;stroke:none;stroke-width:5.64444399;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="path4648-3"
+         cx="122.76666"
+         cy="403.00977"
+         r="5.644444" />
+      <rect
+         style="opacity:1;fill:#302810;fill-opacity:1;stroke:none;stroke-width:5.49117374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect4650-1"
+         width="11.288888"
+         height="37.394451"
+         x="117.12222"
+         y="354.85556"
+         ry="5.3420639" />
+    </g>
+  </g>
+</svg>
diff --git a/app/iconset/FlorianReimold/screen_blue_error.svg b/app/iconset/FlorianReimold/screen_blue_error.svg
new file mode 100644
index 0000000000..310168945c
--- /dev/null
+++ b/app/iconset/FlorianReimold/screen_blue_error.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46666"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="screen_blue_error.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-128.72448"
+     inkscape:cy="930.88637"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53336)">
+    <rect
+       style="opacity:1;fill:#002d60;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect823"
+       width="33.866665"
+       height="33.866665"
+       x="50.799999"
+       y="254.66669"
+       ry="7.6549477e-06" />
+    <rect
+       style="opacity:1;fill:#419aff;fill-opacity:1;stroke:#002d60;stroke-width:8.46666622;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect819"
+       width="127"
+       height="93.133331"
+       x="4.2333331"
+       y="165.76669"
+       ry="8.466671" />
+    <rect
+       style="opacity:1;fill:#002d60;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect821"
+       width="84.666664"
+       height="16.933346"
+       x="25.4"
+       y="280.06668"
+       ry="2.1166797" />
+    <g
+       id="g4582"
+       transform="matrix(0.66666669,0,0,0.66666669,26.811107,193.54444)">
+      <path
+         sodipodi:nodetypes="zccccssccz"
+         inkscape:connector-curvature="0"
+         id="path901"
+         d="m 93.133332,21.833363 c -4.806476,0.002 -9.193845,2.72314 -11.34246,7.02025 -16.951677,33.83771 -33.883892,67.73471 -50.816536,101.599997 -0.756157,1.90323 -1.320921,3.93696 -1.341004,5.67976 0,7.01401 5.685984,12.7 12.7,12.7 H 143.93333 c 7.01402,0 12.7,-5.68599 12.7,-12.7 -0.002,-1.97049 -0.46148,-3.9136 -1.34358,-5.67563 -17.72627,-35.369327 -35.62148,-71.333027 -50.80201,-101.604117 -2.1506,-4.30094 -6.547931,-7.0225 -11.354408,-7.02026 z"
+         style="fill:#e00000;fill-opacity:1;stroke:#301010;stroke-width:12.69999956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="8.4666662"
+         cy="123.69798"
+         cx="93.133331"
+         id="path4648"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.46666622;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <rect
+         ry="8.0130959"
+         y="51.466698"
+         x="84.666664"
+         height="56.091675"
+         width="16.933332"
+         id="rect4650"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.23676014;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    </g>
+  </g>
+</svg>
diff --git a/app/iconset/FlorianReimold/screen_blue_warning.svg b/app/iconset/FlorianReimold/screen_blue_warning.svg
new file mode 100644
index 0000000000..59ce0f800a
--- /dev/null
+++ b/app/iconset/FlorianReimold/screen_blue_warning.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46666"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="screen_blue_warning.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="219.4839"
+     inkscape:cy="230.07518"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53336)">
+    <rect
+       style="opacity:1;fill:#002d60;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect823"
+       width="33.866665"
+       height="33.866665"
+       x="50.799999"
+       y="254.66669"
+       ry="7.6549477e-06" />
+    <rect
+       style="opacity:1;fill:#419aff;fill-opacity:1;stroke:#002d60;stroke-width:8.46666622;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect819"
+       width="127"
+       height="93.133331"
+       x="4.2333331"
+       y="165.76669"
+       ry="8.466671" />
+    <rect
+       style="opacity:1;fill:#002d60;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect821"
+       width="84.666664"
+       height="16.933346"
+       x="25.4"
+       y="280.06668"
+       ry="2.1166797" />
+    <g
+       id="g4582"
+       transform="matrix(0.66666669,0,0,0.66666669,26.811107,193.54444)">
+      <path
+         sodipodi:nodetypes="zccccssccz"
+         inkscape:connector-curvature="0"
+         id="path901"
+         d="m 93.133332,21.833363 c -4.806476,0.002 -9.193845,2.72314 -11.34246,7.02025 -16.951677,33.83771 -33.883892,67.73471 -50.816536,101.599997 -0.756157,1.90323 -1.320921,3.93696 -1.341004,5.67976 0,7.01401 5.685984,12.7 12.7,12.7 H 143.93333 c 7.01402,0 12.7,-5.68599 12.7,-12.7 -0.002,-1.97049 -0.46148,-3.9136 -1.34358,-5.67563 -17.72627,-35.369327 -35.62148,-71.333027 -50.80201,-101.604117 -2.1506,-4.30094 -6.547931,-7.0225 -11.354408,-7.02026 z"
+         style="fill:#ffcd33;fill-opacity:1;stroke:#302810;stroke-width:12.69999956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="8.4666662"
+         cy="123.69798"
+         cx="93.133331"
+         id="path4648"
+         style="opacity:1;fill:#302810;fill-opacity:1;stroke:none;stroke-width:8.46666622;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <rect
+         ry="8.0130959"
+         y="51.466698"
+         x="84.666664"
+         height="56.091675"
+         width="16.933332"
+         id="rect4650"
+         style="opacity:1;fill:#302810;fill-opacity:1;stroke:none;stroke-width:8.23676014;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    </g>
+  </g>
+</svg>
diff --git a/app/iconset/MuraruMihai/hide.svg b/app/iconset/MuraruMihai/hide.svg
new file mode 100644
index 0000000000..f70c188eed
--- /dev/null
+++ b/app/iconset/MuraruMihai/hide.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458334"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="hide.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="242.15302"
+     inkscape:cy="157.7828"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="2091"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-270.54165)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.31082284;stroke-opacity:1"
+       id="rect871"
+       width="19.527826"
+       height="10.090307"
+       x="-43.521435"
+       y="-262.2645"
+       transform="matrix(-0.62400003,-0.78142432,0.00705127,-0.99997514,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.31082284;stroke-opacity:1"
+       id="rect871-5"
+       width="19.527824"
+       height="10.090307"
+       x="-19.741999"
+       y="286.3248"
+       transform="matrix(-0.62663023,0.77931672,0.00368085,0.99999323,0,0)" />
+  </g>
+</svg>
diff --git a/app/iconset/MuraruMihai/show.svg b/app/iconset/MuraruMihai/show.svg
new file mode 100644
index 0000000000..3238c202e3
--- /dev/null
+++ b/app/iconset/MuraruMihai/show.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458334"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="show.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="242.15302"
+     inkscape:cy="157.7828"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="2091"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-270.54165)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.31082284;stroke-opacity:1"
+       id="rect871"
+       width="19.527826"
+       height="10.090307"
+       x="5.0352621"
+       y="266.98907"
+       transform="matrix(0.62400003,0.78142432,-0.00705127,0.99997514,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.31082284;stroke-opacity:1"
+       id="rect871-5"
+       width="19.527824"
+       height="10.090307"
+       x="19.145662"
+       y="-311.16885"
+       transform="matrix(0.62663023,-0.77931672,-0.00368085,-0.99999323,0,0)" />
+  </g>
+</svg>
diff --git a/app/iconset/ecalicons.qrc b/app/iconset/ecalicons.qrc
index 48a0112fab..f626e3e448 100644
--- a/app/iconset/ecalicons.qrc
+++ b/app/iconset/ecalicons.qrc
@@ -85,9 +85,15 @@
         <file alias="ERROR">FlorianReimold/error.svg</file>
         <file alias="HOST_CONNECTED_ERROR">FlorianReimold/screen_green_error.svg</file>
         <file alias="HOST_CONNECTED_WARNING">FlorianReimold/screen_green_warning.svg</file>
+        <file alias="HOST_ERROR">FlorianReimold/screen_blue_error.svg</file>
+        <file alias="HOST_WARNING">FlorianReimold/screen_blue_warning.svg</file>
         <file alias="ADDON_CONNECTED_ERROR">FlorianReimold/puzzle_green_error.svg</file>
         <file alias="ADDON_CONNECTED_WARNING">FlorianReimold/puzzle_green_warning.svg</file>
+        <file alias="ADDON_ERROR">FlorianReimold/puzzle_blue_error.svg</file>
+        <file alias="ADDON_WARNING">FlorianReimold/puzzle_blue_warning.svg</file>
         <file alias="EDIT_FILE">FlorianReimold/edit_file.svg</file>
         <file alias="ADD_FILE">FlorianReimold/add_file.svg</file>
+        <file alias="SHOW">MuraruMihai/show.svg</file>
+        <file alias="HIDE">MuraruMihai/hide.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mon/topic/CMakeLists.txt b/app/mon/mon_cli/CMakeLists.txt
similarity index 87%
rename from app/mon/topic/CMakeLists.txt
rename to app/mon/mon_cli/CMakeLists.txt
index 0ba629cdbc..8d75ec1db0 100644
--- a/app/mon/topic/CMakeLists.txt
+++ b/app/mon/mon_cli/CMakeLists.txt
@@ -16,22 +16,22 @@
 #
 # ========================= eCAL LICENSE =================================
 
-project(topic)
+project(mon)
 
 find_package(Protobuf REQUIRED)
 find_package(tclap REQUIRED)
 
-set(ecaltopic_src
-  src/ecal_topic.cpp
+set(ecalmon_src
+  src/ecal_mon.cpp
 )
 
 if(WIN32)
-  set(ecaltopic_win_src
-    src/ecal_topic.rc
+  set(ecalmon_win_src
+    src/ecal_mon.rc
   )
 endif()
 
-ecal_add_app_console(${PROJECT_NAME} ${ecaltopic_src} ${ecaltopic_win_src})
+ecal_add_app_console(${PROJECT_NAME} ${ecalmon_src} ${ecalmon_win_src})
 
 target_include_directories(${PROJECT_NAME}
   PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
diff --git a/app/mon/topic/src/ecal_topic.cpp b/app/mon/mon_cli/src/ecal_mon.cpp
similarity index 98%
rename from app/mon/topic/src/ecal_topic.cpp
rename to app/mon/mon_cli/src/ecal_mon.cpp
index 5a7a6f6489..0a0cb07085 100644
--- a/app/mon/topic/src/ecal_topic.cpp
+++ b/app/mon/mon_cli/src/ecal_mon.cpp
@@ -18,7 +18,7 @@
 */
 
 /**
- * @brief eCALTopic Console Application
+ * @brief eCALMon Console Application
 **/
 
 #include <iostream>
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4127 4244 4267 4512)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/message.h>
 #ifdef _MSC_VER
@@ -43,7 +43,7 @@
 
 #include "ecal/pb/monitoring.pb.h"
 
-#include "ecal_topic_defs.h"
+#include "ecal_mon_defs.h"
 
 #define GetMessageA GetMessage
 
@@ -94,8 +94,8 @@ int main(int argc, char** argv)
     /* Create & Parse the command line                                      */
     /************************************************************************/
     // Define the command line object.
-    std::string version_str = std::string(ECAL_TOPIC_VERSION) + " (" + std::string(ECAL_TOPIC_DATE) + ")";
-    TCLAP::CmdLine cmd(ECAL_TOPIC_NAME, ' ' , version_str);
+    std::string version_str = std::string(ECAL_MON_VERSION) + " (" + std::string(ECAL_MON_DATE) + ")";
+    TCLAP::CmdLine cmd(ECAL_MON_NAME, ' ' , version_str);
 
     // Define the values from argument and add them to the command line.
     TCLAP::ValueArg<std::string> bandwidth_arg("b", "bandwidth", "display bandwidth used by topic", false, "", "string");
diff --git a/app/mon/topic/src/ecal_topic.rc b/app/mon/mon_cli/src/ecal_mon.rc
similarity index 80%
rename from app/mon/topic/src/ecal_topic.rc
rename to app/mon/mon_cli/src/ecal_mon.rc
index 26e9c49347..84a7ccbea5 100644
--- a/app/mon/topic/src/ecal_topic.rc
+++ b/app/mon/mon_cli/src/ecal_mon.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
-#include "ecal_topic_defs.h"
+#include "ecal_mon_defs.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION ECAL_TOPIC_VERSION_MAJOR, ECAL_TOPIC_VERSION_MINOR, ECAL_TOPIC_VERSION_PATCH, 0
- PRODUCTVERSION ECAL_TOPIC_VERSION_MAJOR, ECAL_TOPIC_VERSION_MINOR, ECAL_TOPIC_VERSION_PATCH, 0
+ FILEVERSION ECAL_MON_VERSION_MAJOR, ECAL_MON_VERSION_MINOR, ECAL_MON_VERSION_PATCH, 0
+ PRODUCTVERSION ECAL_MON_VERSION_MAJOR, ECAL_MON_VERSION_MINOR, ECAL_MON_VERSION_PATCH, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -42,13 +42,13 @@ BEGIN
         BLOCK "040004b0"
         BEGIN
             VALUE "CompanyName", "Continental Automotive Systems"
-            VALUE "FileDescription", "eCAL Topic"
-            VALUE "FileVersion", ECAL_TOPIC_VERSION
-            VALUE "InternalName", "eCALTopic.exe"
+            VALUE "FileDescription", "eCAL Monitor CLI"
+            VALUE "FileVersion", ECAL_MON_VERSION
+            VALUE "InternalName", "ecal_mon.exe"
             VALUE "LegalCopyright", "Continental Automotive Systems. All Rights Reserved."
-            VALUE "OriginalFilename", "eCALTopic.exe"
-            VALUE "ProductName", ECAL_TOPIC_NAME
-            VALUE "ProductVersion", ECAL_TOPIC_VERSION
+            VALUE "OriginalFilename", "ecal_mon.exe"
+            VALUE "ProductName", ECAL_MON_NAME
+            VALUE "ProductVersion", ECAL_MON_VERSION
         END
     END
     BLOCK "VarFileInfo"
diff --git a/app/mon/topic/src/ecal_topic_defs.h b/app/mon/mon_cli/src/ecal_mon_defs.h
similarity index 71%
rename from app/mon/topic/src/ecal_topic_defs.h
rename to app/mon/mon_cli/src/ecal_mon_defs.h
index 7a06f7de16..ca4a0b2d95 100644
--- a/app/mon/topic/src/ecal_topic_defs.h
+++ b/app/mon/mon_cli/src/ecal_mon_defs.h
@@ -18,19 +18,19 @@
 ;*/
 
 ;/**
-; * eCALTopic version definition
+; * eCALMon version definition
 ;**/
 
 #pragma once
 
 ;/* version parsed out into numeric values */
-#define ECAL_TOPIC_VERSION_MAJOR              1
-#define ECAL_TOPIC_VERSION_MINOR              0
-#define ECAL_TOPIC_VERSION_PATCH              1
+#define ECAL_MON_VERSION_MAJOR              1
+#define ECAL_MON_VERSION_MINOR              0
+#define ECAL_MON_VERSION_PATCH              2
 
 ;/* version as string */
-#define ECAL_TOPIC_VERSION                    "v.1.0.1.20150910"
-#define ECAL_TOPIC_DATE                       "10.09.2015"
+#define ECAL_MON_VERSION                    "v.1.0.2.20200313"
+#define ECAL_MON_DATE                       "13.03.2020"
 
 ;/* name as string */
-#define ECAL_TOPIC_NAME                       "eCALTopic"
+#define ECAL_MON_NAME                       "eCALMon"
diff --git a/app/mon/topic/src/resource.h b/app/mon/mon_cli/src/resource.h
similarity index 100%
rename from app/mon/topic/src/resource.h
rename to app/mon/mon_cli/src/resource.h
diff --git a/app/mon/mon_gui/CMakeLists.txt b/app/mon/mon_gui/CMakeLists.txt
index 0b21aac71b..b2cbf61538 100644
--- a/app/mon/mon_gui/CMakeLists.txt
+++ b/app/mon/mon_gui/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 # ========================= eCAL LICENSE =================================
 
-project(mon)
+project(mon_gui)
 
 find_package(Qt5 COMPONENTS
     Core
@@ -252,7 +252,7 @@ endif()
 if(WIN32)
 install(CODE
     "
-    set(_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/ecal_mon.exe)
+    set(_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/ecal_mon_gui.exe)
     execute_process(
             COMMAND \"${CMAKE_COMMAND}\" -E
                 env PATH=\"${_qt_bin_dir}\" \"${WINDEPLOYQT_EXECUTABLE}\"
diff --git a/app/mon/mon_gui/src/ecalmon.h b/app/mon/mon_gui/src/ecalmon.h
index f8e8371585..8b431f85ba 100644
--- a/app/mon/mon_gui/src/ecalmon.h
+++ b/app/mon/mon_gui/src/ecalmon.h
@@ -34,7 +34,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/main_window.ui b/app/mon/mon_gui/src/main_window.ui
index 31901cb2bf..6042d1cbb5 100644
--- a/app/mon/mon_gui/src/main_window.ui
+++ b/app/mon/mon_gui/src/main_window.ui
@@ -386,7 +386,7 @@
   <action name="action_monitor_refresh_now">
    <property name="icon">
     <iconset resource="../../../iconset/ecalicons.qrc">
-     <normaloff>:/ecalicons/RESTART</normaloff>:/ecalicons/RESTART</iconset>
+     <normaloff>:/ecalicons/UPDATE</normaloff>:/ecalicons/UPDATE</iconset>
    </property>
    <property name="text">
     <string>&amp;Refresh monitor now</string>
@@ -446,7 +446,7 @@
   <action name="action_poll_log_now">
    <property name="icon">
     <iconset resource="../../../iconset/ecalicons.qrc">
-     <normaloff>:/ecalicons/RESTART</normaloff>:/ecalicons/RESTART</iconset>
+     <normaloff>:/ecalicons/UPDATE</normaloff>:/ecalicons/UPDATE</iconset>
    </property>
    <property name="text">
     <string>&amp;Poll log now</string>
diff --git a/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/ecalmon_tree_widget.h b/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/ecalmon_tree_widget.h
index a41f6875cb..794c0a5704 100644
--- a/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/ecalmon_tree_widget.h
+++ b/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/ecalmon_tree_widget.h
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/log_widget/log_widget.cpp b/app/mon/mon_gui/src/widgets/log_widget/log_widget.cpp
index 369e895ed3..5c030c3081 100644
--- a/app/mon/mon_gui/src/widgets/log_widget/log_widget.cpp
+++ b/app/mon/mon_gui/src/widgets/log_widget/log_widget.cpp
@@ -31,7 +31,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/column_tree_model.h b/app/mon/mon_gui/src/widgets/models/column_tree_model.h
index 34960195c7..45a5981d8f 100644
--- a/app/mon/mon_gui/src/widgets/models/column_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/column_tree_model.h
@@ -42,9 +42,9 @@ class ColumnTreeModel : public QAbstractTreeModel
   ColumnTreeModel(QObject *parent = nullptr);
   ~ColumnTreeModel();
 
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
 protected:
   int mapColumnToItem(int model_column, int tree_item_type) const override;
diff --git a/app/mon/mon_gui/src/widgets/models/group_tree_model.h b/app/mon/mon_gui/src/widgets/models/group_tree_model.h
index 9875ddabfe..72d44a7e5a 100644
--- a/app/mon/mon_gui/src/widgets/models/group_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/group_tree_model.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/host_tree_item.h b/app/mon/mon_gui/src/widgets/models/host_tree_item.h
index b7cbd1b83c..72005ed877 100644
--- a/app/mon/mon_gui/src/widgets/models/host_tree_item.h
+++ b/app/mon/mon_gui/src/widgets/models/host_tree_item.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/host_tree_model.h b/app/mon/mon_gui/src/widgets/models/host_tree_model.h
index bf0964abda..40cd3507be 100644
--- a/app/mon/mon_gui/src/widgets/models/host_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/host_tree_model.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
@@ -58,17 +58,17 @@ class HostTreeModel : public GroupTreeModel
   HostTreeModel(QObject *parent = nullptr);
   ~HostTreeModel();
 
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
   QVector<QPair<int, QString>> getTreeItemColumnNameMapping() const;
 
-  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb);
+  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) override;
 
 protected:
   int mapColumnToItem(int model_column, int tree_item_type) const override;
-  int groupColumn() const;
+  int groupColumn() const override;
 
 private:
   std::map<Columns, QString> column_labels_ =
diff --git a/app/mon/mon_gui/src/widgets/models/log_model.cpp b/app/mon/mon_gui/src/widgets/models/log_model.cpp
index 9858ce9ae3..9733a835f9 100644
--- a/app/mon/mon_gui/src/widgets/models/log_model.cpp
+++ b/app/mon/mon_gui/src/widgets/models/log_model.cpp
@@ -22,7 +22,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/log_model.h b/app/mon/mon_gui/src/widgets/models/log_model.h
index d93c22344b..2235b7cf7c 100644
--- a/app/mon/mon_gui/src/widgets/models/log_model.h
+++ b/app/mon/mon_gui/src/widgets/models/log_model.h
@@ -26,7 +26,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_item.h b/app/mon/mon_gui/src/widgets/models/process_tree_item.h
index 9fd2a2a53f..12bdb80b30 100644
--- a/app/mon/mon_gui/src/widgets/models/process_tree_item.h
+++ b/app/mon/mon_gui/src/widgets/models/process_tree_item.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/process.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_model.cpp b/app/mon/mon_gui/src/widgets/models/process_tree_model.cpp
index 49da7f1596..d5aef479ff 100644
--- a/app/mon/mon_gui/src/widgets/models/process_tree_model.cpp
+++ b/app/mon/mon_gui/src/widgets/models/process_tree_model.cpp
@@ -78,7 +78,7 @@ void ProcessTreeModel::monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb)
   for (const auto& process_pb : monitoring_pb.processes())
   {
     // Create a Process ID that is unique across all hosts
-    std::string process_identifier = (process_pb.pid() + "@" + process_pb.hname());
+    std::string process_identifier = (std::to_string(process_pb.pid()) + "@" + process_pb.hname());
 
     if (tree_item_map_.find(process_identifier) == tree_item_map_.end())
     {
diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_model.h b/app/mon/mon_gui/src/widgets/models/process_tree_model.h
index 18f3f35e67..1ac60b07e9 100644
--- a/app/mon/mon_gui/src/widgets/models/process_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/process_tree_model.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
@@ -69,17 +69,17 @@ class ProcessTreeModel : public GroupTreeModel
   ProcessTreeModel(QObject *parent = nullptr);
   ~ProcessTreeModel();
 
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
   QVector<QPair<int, QString>> getTreeItemColumnNameMapping() const;
 
-  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb);
+  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) override;
 
 protected:
   int mapColumnToItem(int model_column, int tree_item_type) const override;
-  int groupColumn() const;
+  int groupColumn() const override;
 
 private:
   std::map<Columns, QString> columnLabels =
diff --git a/app/mon/mon_gui/src/widgets/models/service_tree_item.h b/app/mon/mon_gui/src/widgets/models/service_tree_item.h
index 3fdeff408b..8d4446b6c3 100644
--- a/app/mon/mon_gui/src/widgets/models/service_tree_item.h
+++ b/app/mon/mon_gui/src/widgets/models/service_tree_item.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/service.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/service_tree_model.h b/app/mon/mon_gui/src/widgets/models/service_tree_model.h
index 2ecef53d18..4427ff35f4 100644
--- a/app/mon/mon_gui/src/widgets/models/service_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/service_tree_model.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
@@ -63,17 +63,17 @@ class ServiceTreeModel : public GroupTreeModel
   ServiceTreeModel(QObject *parent = nullptr);
   ~ServiceTreeModel();
 
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
   QVector<QPair<int, QString>> getTreeItemColumnNameMapping() const;
 
-  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb);
+  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) override;
 
 protected:
   int mapColumnToItem(int model_column, int tree_item_type) const override;
-  int groupColumn() const;
+  int groupColumn() const override;
 
 private:
   std::map<Columns, QString> columnLabels =
diff --git a/app/mon/mon_gui/src/widgets/models/topic_tree_item.h b/app/mon/mon_gui/src/widgets/models/topic_tree_item.h
index 53306597bc..cf9bb73239 100644
--- a/app/mon/mon_gui/src/widgets/models/topic_tree_item.h
+++ b/app/mon/mon_gui/src/widgets/models/topic_tree_item.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/topic.pb.h"
 #ifdef _MSC_VER
diff --git a/app/mon/mon_gui/src/widgets/models/topic_tree_model.h b/app/mon/mon_gui/src/widgets/models/topic_tree_model.h
index 4d1e4183cf..9956ab0def 100644
--- a/app/mon/mon_gui/src/widgets/models/topic_tree_model.h
+++ b/app/mon/mon_gui/src/widgets/models/topic_tree_model.h
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
@@ -71,17 +71,17 @@ class TopicTreeModel : public GroupTreeModel
   TopicTreeModel(QObject *parent = nullptr);
   ~TopicTreeModel();
 
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
+  int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
-  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
   QVector<QPair<int, QString>> getTreeItemColumnNameMapping() const;
 
-  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb);
+  void monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) override;
 
 protected:
   int mapColumnToItem(int model_column, int tree_item_type) const override;
-  int groupColumn() const;
+  int groupColumn() const override;
 
 private:
   std::map<Columns, QString> columnLabels =
diff --git a/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.cpp b/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.cpp
index be2c9c6dbf..6f5947e7c5 100644
--- a/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.cpp
+++ b/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "NpcapStatusDialog.h"
+#include "npcap_status_dialog.h"
 
 #include <QPushButton>
 #include <udpcap/npcap_helpers.h>
diff --git a/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.h b/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.h
index e3aa580bc2..81af9b647b 100644
--- a/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.h
+++ b/app/mon/mon_gui/src/widgets/npcap_status_dialog/npcap_status_dialog.h
@@ -22,7 +22,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 
-#include "ui_NpcapStatusDialog.h"
+#include "ui_npcap_status_dialog.h"
 
 #include <string>
 #include <vector>
diff --git a/app/play/play_cli/src/ecal_play_cli.cpp b/app/play/play_cli/src/ecal_play_cli.cpp
index c42ef7b1c4..25c9e8d53a 100644
--- a/app/play/play_cli/src/ecal_play_cli.cpp
+++ b/app/play/play_cli/src/ecal_play_cli.cpp
@@ -54,7 +54,6 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <unistd.h>
-#include <stropts.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/app/play/play_cli/src/ecal_play_service.h b/app/play/play_cli/src/ecal_play_service.h
index a4e01842d9..4115102420 100644
--- a/app/play/play_cli/src/ecal_play_service.h
+++ b/app/play/play_cli/src/ecal_play_service.h
@@ -21,7 +21,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4100 4146 4505 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <ecal/pb/play/service.pb.h>
 #ifdef _MSC_VER
diff --git a/app/play/play_core/CMakeLists.txt b/app/play/play_core/CMakeLists.txt
index 87d6ce93e5..7bb6bb53e9 100644
--- a/app/play/play_core/CMakeLists.txt
+++ b/app/play/play_core/CMakeLists.txt
@@ -62,7 +62,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
   ThreadingUtils
-  EcalUtils
+  eCAL::utils
 )
 
 if(MSVC)
diff --git a/app/play/play_core/src/ecal_play.cpp b/app/play/play_core/src/ecal_play.cpp
index 5ebbfa0e55..71673e2c0d 100644
--- a/app/play/play_core/src/ecal_play.cpp
+++ b/app/play/play_core/src/ecal_play.cpp
@@ -29,7 +29,7 @@
 #include "play_thread.h"
 #include "ecalhdf5/eh5_meas.h"
 
-#include "EcalUtils/String.h"
+#include "ecal_utils/string.h"
 
 EcalPlay::EcalPlay()
 {
diff --git a/app/play/play_core/src/play_thread.cpp b/app/play/play_core/src/play_thread.cpp
index b12f55cb72..d3d4ec3594 100644
--- a/app/play/play_core/src/play_thread.cpp
+++ b/app/play/play_core/src/play_thread.cpp
@@ -32,7 +32,7 @@
 PlayThread::PlayThread()
   : time_log_complete_time_span_(0)
 {
-  state_publisher_thread_ = std::move(std::unique_ptr<StatePublisherThread>(new StatePublisherThread(*this)));
+  state_publisher_thread_ = std::unique_ptr<StatePublisherThread>(new StatePublisherThread(*this));
   state_publisher_thread_->Start();
 }
 
diff --git a/app/play/play_gui/src/ecal_play_gui.cpp b/app/play/play_gui/src/ecal_play_gui.cpp
index 4b10aa6127..ea2efd2ab2 100644
--- a/app/play/play_gui/src/ecal_play_gui.cpp
+++ b/app/play/play_gui/src/ecal_play_gui.cpp
@@ -575,7 +575,7 @@ void EcalplayGui::populateRecentMeasurementsMenu()
 
       QAction* meas_action = ui_.menu_recent_measurement->addAction(label + ": " + measurement);
       meas_action->setToolTip(measurement);
-      connect(meas_action, &QAction::triggered, this, [this, measurement]() {QEcalPlay::instance()->loadMeasurement(measurement); });
+      connect(meas_action, &QAction::triggered, this, [measurement]() {QEcalPlay::instance()->loadMeasurement(measurement); });
       counter++;
     }
   }
@@ -588,7 +588,7 @@ void EcalplayGui::populateRecentMeasurementsMenu()
   ui_.menu_recent_measurement->addSeparator();
   QAction* clear_recent_measurements_list = ui_.menu_recent_measurement->addAction("Clear list");
   connect(clear_recent_measurements_list, &QAction::triggered, this,
-      [this]()
+      []()
       {
         QSettings settings;
         settings.setValue("recent_measurements", QStringList());
diff --git a/app/play/play_gui/src/widgets/channel_widget/channel_widget.cpp b/app/play/play_gui/src/widgets/channel_widget/channel_widget.cpp
index 2af5007e16..85f9a2ddbf 100644
--- a/app/play/play_gui/src/widgets/channel_widget/channel_widget.cpp
+++ b/app/play/play_gui/src/widgets/channel_widget/channel_widget.cpp
@@ -35,7 +35,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/app/play/play_gui/src/widgets/player_controls_widget/player_controls_widget.cpp b/app/play/play_gui/src/widgets/player_controls_widget/player_controls_widget.cpp
index 870b7d7ab2..3a3270b316 100644
--- a/app/play/play_gui/src/widgets/player_controls_widget/player_controls_widget.cpp
+++ b/app/play/play_gui/src/widgets/player_controls_widget/player_controls_widget.cpp
@@ -264,7 +264,7 @@ void PlayerControlsWidget::channelMappingChanged(const std::map<std::string, std
 {
   // Remove non-existing items
   auto children_to_remove = step_reference_channel_model_->root()->findChildren(
-      [this, &channel_mapping](const QAbstractTreeItem* const item)
+      [&channel_mapping](const QAbstractTreeItem* const item)
       {
         if (item && item->type() == (int)TreeItemType::Channel)
         {
@@ -284,7 +284,7 @@ void PlayerControlsWidget::channelMappingChanged(const std::map<std::string, std
   for (auto& channel_pair : channel_mapping)
   {
     auto exisiting_items = step_reference_channel_model_->root()->findChildren(
-        [this, &channel_pair](const QAbstractTreeItem* const item)
+        [&channel_pair](const QAbstractTreeItem* const item)
         {
           if (item && item->type() == (int)TreeItemType::Channel)
           {
@@ -345,7 +345,7 @@ void PlayerControlsWidget::setPlayPauseButtonToPause()
 void PlayerControlsWidget::setSelectedStepReferenceChannel(const QString& step_reference_channel)
 {
   auto exisiting_items = step_reference_channel_model_->root()->findChildren(
-      [this, &step_reference_channel](const QAbstractTreeItem* const item)
+      [&step_reference_channel](const QAbstractTreeItem* const item)
       {
         if (item && item->type() == (int)TreeItemType::Channel)
         {
@@ -400,4 +400,4 @@ void PlayerControlsWidget::resetLayout()
   setSettingsVisible(false);
   settings_widget_->resetLayout();
   QEcalPlay::instance()->setStepReferenceChannel("");
-}
\ No newline at end of file
+}
diff --git a/app/rec/rec_cli/CMakeLists.txt b/app/rec/rec_cli/CMakeLists.txt
index 47e418844e..822d2c6911 100644
--- a/app/rec/rec_cli/CMakeLists.txt
+++ b/app/rec/rec_cli/CMakeLists.txt
@@ -45,7 +45,7 @@ target_link_libraries(${PROJECT_NAME}
   eCAL::rec_core
   eCAL::core
   tclap::tclap
-  EcalUtils
+  eCAL::utils
 )
 
 ecal_install_app(${PROJECT_NAME})
diff --git a/app/rec/rec_cli/src/ecal_rec_cli.cpp b/app/rec/rec_cli/src/ecal_rec_cli.cpp
index 36f840998b..62378a9a28 100644
--- a/app/rec/rec_cli/src/ecal_rec_cli.cpp
+++ b/app/rec/rec_cli/src/ecal_rec_cli.cpp
@@ -29,7 +29,7 @@
 #include <ecal/ecal.h>
 #include <ecal/msg/protobuf/server.h>
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 #include <tclap/CmdLine.h>
 
diff --git a/app/rec/rec_cli/src/ecal_rec_service.cpp b/app/rec/rec_cli/src/ecal_rec_service.cpp
index 8118be5c4e..ec1424d5e6 100644
--- a/app/rec/rec_cli/src/ecal_rec_service.cpp
+++ b/app/rec/rec_cli/src/ecal_rec_service.cpp
@@ -24,7 +24,7 @@
 #include <clocale>
 #include <locale>
 
-#include <EcalUtils/EcalUtils.h>
+#include <ecal_utils/ecal_utils.h>
 
 #include <ecal/ecal.h>
 
diff --git a/app/rec/rec_cli/src/ecal_rec_service.h b/app/rec/rec_cli/src/ecal_rec_service.h
index bd2c46d8d6..93b7ac55af 100644
--- a/app/rec/rec_cli/src/ecal_rec_service.h
+++ b/app/rec/rec_cli/src/ecal_rec_service.h
@@ -21,7 +21,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4100 4146 4505 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <ecal/pb/rec/service.pb.h>
 #ifdef _MSC_VER
diff --git a/app/rec/rec_core/CMakeLists.txt b/app/rec/rec_core/CMakeLists.txt
index 733884fc1a..0cf4475bcf 100644
--- a/app/rec/rec_core/CMakeLists.txt
+++ b/app/rec/rec_core/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(${PROJECT_NAME}
     eCAL::hdf5
     ThreadingUtils
     Threads::Threads
-    EcalUtils
+    eCAL::utils
     EcalParser
 )
 
diff --git a/app/rec/rec_core/src/ecal_rec.cpp b/app/rec/rec_core/src/ecal_rec.cpp
index a50a734669..163627d570 100644
--- a/app/rec/rec_core/src/ecal_rec.cpp
+++ b/app/rec/rec_core/src/ecal_rec.cpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <EcalUtils/Path.h>
+#include <ecal_utils/filesystem.h>
 
 namespace eCAL
 {
diff --git a/app/rec/rec_core/src/hdf5_writer_thread.cpp b/app/rec/rec_core/src/hdf5_writer_thread.cpp
index dc36985d9c..61408d1fa8 100644
--- a/app/rec/rec_core/src/hdf5_writer_thread.cpp
+++ b/app/rec/rec_core/src/hdf5_writer_thread.cpp
@@ -22,11 +22,9 @@
 #include "rec_core/ecal_rec_logger.h"
 #include "recorder.h"
 
-#include <EcalUtils/Path.h>
-
 #include <fstream>
-#include <EcalUtils/Path.h>
 
+#include <ecal_utils/filesystem.h>
 #include <EcalParser/EcalParser.h>
 
 namespace eCAL
@@ -73,7 +71,7 @@ namespace eCAL
       }
       joined_meas_path += job_config_.GetMeasName();
 
-      return EcalUtils::Path::AbsolutePath(joined_meas_path);
+      return EcalUtils::Filesystem::AbsolutePath(joined_meas_path);
     }
 
 
@@ -270,14 +268,14 @@ namespace eCAL
     bool Hdf5WriterThread::CreateEcalmeasFile() const
     {
       std::string measurement_path = GetCompleteMeasurementPath();
-      if (!EcalUtils::Path::MkPath(measurement_path))
+      if (!EcalUtils::Filesystem::MkPath(measurement_path))
       {
         EcalRecLogger::Instance()->error("Error Creating directory \"" + measurement_path + "\"");
         return false;
       }
 
       // Get the last dirname of the complete measurement path and use it as meas name
-      std::list<std::string> path_components = EcalUtils::Path::CleanPathComponentList(measurement_path);
+      std::list<std::string> path_components = EcalUtils::Filesystem::CleanPathComponentList(measurement_path);
       std::string meas_name;
       if (!path_components.empty())
       {
@@ -292,7 +290,7 @@ namespace eCAL
       meas_name += ".ecalmeas";
 
       // Create file /meas/root/dir/meas_name/meas_name.ecalmeas
-      std::string ecalmeas_file_path = EcalUtils::Path::ToNativeSeperators(GetCompleteMeasurementPath() + '/' + meas_name);
+      std::string ecalmeas_file_path = EcalUtils::Filesystem::ToNativeSeperators(GetCompleteMeasurementPath() + '/' + meas_name);
 
       EcalRecLogger::Instance()->info("Creating eacalmeas file: " + ecalmeas_file_path);
 
@@ -306,11 +304,11 @@ namespace eCAL
       std::string doc_dir   = GetCompleteMeasurementPath() + "/doc/";
       std::string full_path = doc_dir + "description.txt";
 
-      full_path = EcalUtils::Path::ToNativeSeperators(full_path);
+      full_path = EcalUtils::Filesystem::ToNativeSeperators(full_path);
 
       EcalRecLogger::Instance()->info("Saving description to " + full_path);
 
-      if (!EcalUtils::Path::MkPath(doc_dir))
+      if (!EcalUtils::Filesystem::MkPath(doc_dir))
       {
         EcalRecLogger::Instance()->error("Error saving description: Cannot create doc dir \"" + doc_dir + "\"");
         return false;
@@ -334,7 +332,7 @@ namespace eCAL
     bool Hdf5WriterThread::OpenHdf5Writer() const
     {
       std::string host_name = eCAL::Process::GetHostName();
-      std::string hdf5_dir  = EcalUtils::Path::ToNativeSeperators(GetCompleteMeasurementPath() + "/" + host_name);
+      std::string hdf5_dir  = EcalUtils::Filesystem::ToNativeSeperators(GetCompleteMeasurementPath() + "/" + host_name);
 
 #ifndef NDEBUG
       EcalRecLogger::Instance()->debug("Hdf5WriterThread::Open(): hdf5_dir: \"" + hdf5_dir + "\", base_name: \"" + host_name + "\"");
diff --git a/app/rec/rec_core/src/monitoring_thread.cpp b/app/rec/rec_core/src/monitoring_thread.cpp
index 8333b3f2ac..ea3db589c6 100644
--- a/app/rec/rec_core/src/monitoring_thread.cpp
+++ b/app/rec/rec_core/src/monitoring_thread.cpp
@@ -21,11 +21,11 @@
 
 #include <ecal/ecal.h>
 
-#include <EcalUtils/EcalUtils.h>
+#include <ecal_utils/ecal_utils.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <ecal/pb/monitoring.pb.h>
 #include <ecal/pb/process.pb.h>
diff --git a/app/rec/rec_core/src/recorder.cpp b/app/rec/rec_core/src/recorder.cpp
index 18f9c580ce..94f6510aad 100644
--- a/app/rec/rec_core/src/recorder.cpp
+++ b/app/rec/rec_core/src/recorder.cpp
@@ -21,7 +21,7 @@
 
 #include "rec_core/ecal_rec_logger.h"
 
-#include <EcalUtils/Path.h>
+#include <ecal_utils/filesystem.h>
 
 #include <algorithm>
 
@@ -742,7 +742,7 @@ namespace eCAL
     {
       if (main_recorder_thread_
         && main_recorder_thread_->GetState().recording_
-        && EcalUtils::Path::IsEqual(path, main_recorder_thread_->GetCompleteMeasurementPath()))
+        && EcalUtils::Filesystem::IsEqual(path, main_recorder_thread_->GetCompleteMeasurementPath()))
       {
         return true;
       }
@@ -751,7 +751,7 @@ namespace eCAL
       {
         if (buffer_writer
           && buffer_writer->GetState().recording_
-          && EcalUtils::Path::IsEqual(path, buffer_writer->GetCompleteMeasurementPath()))
+          && EcalUtils::Filesystem::IsEqual(path, buffer_writer->GetCompleteMeasurementPath()))
         {
           return true;
         }
diff --git a/app/rec/rec_core/src/recorder.h b/app/rec/rec_core/src/recorder.h
index 3165cf816a..74fae860eb 100644
--- a/app/rec/rec_core/src/recorder.h
+++ b/app/rec/rec_core/src/recorder.h
@@ -29,7 +29,7 @@
 #include <set>
 #include <thread>
 
-#include <EcalUtils/EcalUtils.h>
+#include <ecal_utils/ecal_utils.h>
 
 #include "rec_core/recorder_state.h"
 #include "rec_core/topic_info.h"
diff --git a/app/rec/rec_gui/CMakeLists.txt b/app/rec/rec_gui/CMakeLists.txt
index d4d7cf5b7a..58b5f0412f 100644
--- a/app/rec/rec_gui/CMakeLists.txt
+++ b/app/rec/rec_gui/CMakeLists.txt
@@ -150,7 +150,7 @@ target_link_libraries (${PROJECT_NAME}
     eCAL::rec_server_core
     Qt5::Widgets
     CustomQt
-    EcalUtils
+    eCAL::utils
     EcalParser
     QEcalParser
     ThreadingUtils
diff --git a/app/rec/rec_gui/src/ecalrec_service.cpp b/app/rec/rec_gui/src/ecalrec_service.cpp
index 818100627c..31ea7f9e00 100644
--- a/app/rec/rec_gui/src/ecalrec_service.cpp
+++ b/app/rec/rec_gui/src/ecalrec_service.cpp
@@ -23,7 +23,7 @@
 #include <clocale>
 #include <locale>
 
-#include <EcalUtils/EcalUtils.h>
+#include <ecal_utils/ecal_utils.h>
 
 #include <QMetaObject>
 
diff --git a/app/rec/rec_gui/src/models/recorder_model.cpp b/app/rec/rec_gui/src/models/recorder_model.cpp
index 6a84933acf..b8142248c7 100644
--- a/app/rec/rec_gui/src/models/recorder_model.cpp
+++ b/app/rec/rec_gui/src/models/recorder_model.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include <ecal/ecal.h>
-#include "EcalUtils/String.h"
+#include "ecal_utils/string.h"
 #include "item_data_roles.h"
 
 //////////////////////////////////////////////////////
diff --git a/app/rec/rec_gui/src/monitoring_thread.cpp b/app/rec/rec_gui/src/monitoring_thread.cpp
index 267dccd69e..a451d071c1 100644
--- a/app/rec/rec_gui/src/monitoring_thread.cpp
+++ b/app/rec/rec_gui/src/monitoring_thread.cpp
@@ -21,7 +21,7 @@
 
 #include <ecal/ecal.h>
 
-#include <EcalUtils/EcalUtils.h>
+#include <ecal_utils/ecal_utils.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/app/rec/rec_server_core/CMakeLists.txt b/app/rec/rec_server_core/CMakeLists.txt
index 63fea6cf55..39ebe1df1e 100644
--- a/app/rec/rec_server_core/CMakeLists.txt
+++ b/app/rec/rec_server_core/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries(${PROJECT_NAME}
     eCAL::pb
     ThreadingUtils
     Threads::Threads
-    EcalUtils
+    eCAL::utils
     EcalParser
 )
 
diff --git a/app/rec/rec_server_core/src/rec_server.cpp b/app/rec/rec_server_core/src/rec_server.cpp
index 4e88c8521f..fd1ed77165 100644
--- a/app/rec/rec_server_core/src/rec_server.cpp
+++ b/app/rec/rec_server_core/src/rec_server.cpp
@@ -26,7 +26,7 @@
 #include "recorder/remote_recorder.h"
 #include "recorder/local_recorder.h"
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 #include <EcalParser/EcalParser.h>
 
 #include <rec_core/ecal_rec_logger.h>
diff --git a/app/rec/rec_server_core/src/recorder/remote_recorder.cpp b/app/rec/rec_server_core/src/recorder/remote_recorder.cpp
index 8d63ebc4a8..77666d9afc 100644
--- a/app/rec/rec_server_core/src/recorder/remote_recorder.cpp
+++ b/app/rec/rec_server_core/src/recorder/remote_recorder.cpp
@@ -21,7 +21,7 @@
 
 #include <rec_core/ecal_rec_logger.h>
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 #include <algorithm>
 
diff --git a/app/util/launcher/src/about_dialog.ui b/app/util/launcher/src/about_dialog.ui
index 3026fbf938..fb4d6f8671 100644
--- a/app/util/launcher/src/about_dialog.ui
+++ b/app/util/launcher/src/about_dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>326</width>
-    <height>228</height>
+    <height>262</height>
    </rect>
   </property>
   <property name="font">
@@ -110,7 +110,7 @@ Developed by Mihai Muraru
   </layout>
  </widget>
  <resources>
-  <include location="../resources/gfx.qrc"/>
+  <include location="../resources/resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/app/util/launcher/src/main_window.cpp b/app/util/launcher/src/main_window.cpp
index ee7cfb921a..e11cf26173 100644
--- a/app/util/launcher/src/main_window.cpp
+++ b/app/util/launcher/src/main_window.cpp
@@ -79,7 +79,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 
 void MainWindow::on_pushButton_monitor_clicked()
 {
-  QProcess::startDetached(eCAL::Apps::MON);
+  QProcess::startDetached(eCAL::Apps::MON_GUI);
 }
 
 void MainWindow::on_pushButton_play_clicked()
diff --git a/app/util/launcher/src/main_window.ui b/app/util/launcher/src/main_window.ui
index 121d446fdc..0cb98c9f10 100644
--- a/app/util/launcher/src/main_window.ui
+++ b/app/util/launcher/src/main_window.ui
@@ -47,8 +47,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../resources/resources.qrc">
-    <normaloff>:/ecallauncher/APP_ICON</normaloff>:/ecallauncher/APP_ICON
-   </iconset>
+    <normaloff>:/ecallauncher/APP_ICON</normaloff>:/ecallauncher/APP_ICON</iconset>
   </property>
   <property name="iconSize">
    <size>
@@ -583,7 +582,7 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}</string>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../resources/gfx.qrc"/>
+  <include location="../resources/resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/build_win/Readme.txt b/build_win/Readme.txt
index 2016b12e63..5467c9c032 100644
--- a/build_win/Readme.txt
+++ b/build_win/Readme.txt
@@ -1,4 +1,4 @@
-If you want to build complete eCAL setup for windows then simply call
+If you want to build complete eCAL setup for windows then simply call. The default Visual Studio Version is 2019.
 
 win_make_all.bat
 
@@ -16,6 +16,11 @@ for Visual Studio 2017:
     win_make_cmake.bat v141
     win_make_build.bat
 
+for Visual Studio 2019:
+
+    win_make_cmake.bat v142
+    win_make_build.bat
+
 To create a windows setup finally call:
 
     win_make_setup.bat
diff --git a/build_win/win_set_vars.bat b/build_win/win_set_vars.bat
index 3cca176d40..016e494142 100644
--- a/build_win/win_set_vars.bat
+++ b/build_win/win_set_vars.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if ["%~1"]==[""] (
-  set VERSION=v140
+  set VERSION=v142
   ) else (
   set VERSION=%1
   )
diff --git a/cmake/helper_functions/ecal_add_functions.cmake b/cmake/helper_functions/ecal_add_functions.cmake
index c3416cb097..54512477a5 100644
--- a/cmake/helper_functions/ecal_add_functions.cmake
+++ b/cmake/helper_functions/ecal_add_functions.cmake
@@ -75,8 +75,8 @@ function(ecal_add_mon_plugin TARGET_NAME)
   )
   add_library(${TARGET_NAME} MODULE ${MON_PLUGIN_SOURCES} ${MON_PLUGIN_METADATA})
   set_target_properties(${TARGET_NAME} PROPERTIES
-    VERSION ${${TARGET_NAME}_VERSION}
-    SOVERSION ${${TARGET_NAME}_VERSION_MAJOR}
+    VERSION $<NOT:$<CXX_COMPILER_ID:Clang,AppleClang>:${${TARGET_NAME}_VERSION}>>
+    SOVERSION $<NOT:$<CXX_COMPILER_ID:Clang,AppleClang>:${${TARGET_NAME}_VERSION_MAJOR}>>
     LIBRARY_OUTPUT_DIRECTORY $<IF:$<BOOL:${WIN32}>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/ecalmon_plugins,${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ecal/plugins/mon>
   )
     
diff --git a/conanfile.txt b/conanfile.txt
index 0f750541ff..b787ec7beb 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,7 +1,7 @@
 [requires]
 Qt/5.12.4@kwc_bintray/stable
-protobuf/3.5.1@bincrafters/stable
-protoc_installer/3.5.1@bincrafters/stable
+protobuf/3.11.4@bincrafters/stable
+protoc_installer/3.11.4@bincrafters/stable
 spdlog/0.16.3@kwc_bintray/stable
 
 tclap/1.2.2@kwc_bintray/stable
diff --git a/contrib/ecalhdf5/src/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt
similarity index 77%
rename from contrib/ecalhdf5/src/CMakeLists.txt
rename to contrib/ecalhdf5/CMakeLists.txt
index fb74b31aea..44ce001d98 100644
--- a/contrib/ecalhdf5/src/CMakeLists.txt
+++ b/contrib/ecalhdf5/CMakeLists.txt
@@ -21,30 +21,30 @@ project(hdf5)
 find_package(HDF5 COMPONENTS C REQUIRED)
 
 set(ecalhdf5_src
-  eh5_meas.cpp
-  eh5_meas_dir.cpp
-  eh5_meas_file_v1.cpp
-  eh5_meas_file_v2.cpp
-  eh5_meas_file_v3.cpp
-  eh5_meas_file_v4.cpp
-  eh5_meas_file_v5.cpp
+  src/eh5_meas.cpp
+  src/eh5_meas_dir.cpp
+  src/eh5_meas_file_v1.cpp
+  src/eh5_meas_file_v2.cpp
+  src/eh5_meas_file_v3.cpp
+  src/eh5_meas_file_v4.cpp
+  src/eh5_meas_file_v5.cpp
 )
 
 set(ecalhdf5_header_base
-    ../include/ecal/measurement/imeasurement.h
-    ../include/ecal/measurement/omeasurement.h
-    ../include/ecalhdf5/eh5_defs.h
-    ../include/ecalhdf5/eh5_meas.h
-    ../include/ecalhdf5/eh5_types.h    
+    include/ecal/measurement/imeasurement.h
+    include/ecal/measurement/omeasurement.h
+    include/ecalhdf5/eh5_defs.h
+    include/ecalhdf5/eh5_meas.h
+    include/ecalhdf5/eh5_types.h    
 )
 
 ecal_add_library(${PROJECT_NAME} ${ecalhdf5_src} ${ecalhdf5_header_base})
 add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_include_directories(${PROJECT_NAME}
-  PRIVATE .
+  PRIVATE src
   PUBLIC 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>
 )
 
@@ -69,7 +69,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC eCAL::message)
 
 ecal_install_library(${PROJECT_NAME})
 install(DIRECTORY
-   "../include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
+   "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
     FILES_MATCHING PATTERN "*.h")
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER contrib)
diff --git a/contrib/ecalhdf5/src/eh5_meas_dir.cpp b/contrib/ecalhdf5/src/eh5_meas_dir.cpp
index fbd2d21f64..588b34ba5e 100644
--- a/contrib/ecalhdf5/src/eh5_meas_dir.cpp
+++ b/contrib/ecalhdf5/src/eh5_meas_dir.cpp
@@ -23,14 +23,11 @@
 
 #include "eh5_meas_dir.h"
 
-#ifdef __linux__
-#include <dirent.h>
-#endif  // __linux__
-
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
-#endif // _WIN32
-
+#else
+#include <dirent.h>
+#endif //WIN32
 
 #include <string.h>
 #include <string>
@@ -375,7 +372,7 @@ void eCAL::eh5::HDF5MeasDir::DisconnectPreSplitCallback()
 std::list<std::string> eCAL::eh5::HDF5MeasDir::GetHdfFiles(const std::string& path) const
 {
   std::list<std::string> paths;
-#ifdef _WIN32
+#ifdef WIN32
   std::string dpath = path + "/*.*";
 
   WIN32_FIND_DATAA fd;
@@ -402,8 +399,7 @@ std::list<std::string> eCAL::eh5::HDF5MeasDir::GetHdfFiles(const std::string& pa
     } while (::FindNextFileA(hFind, &fd));
     ::FindClose(hFind);
   }
-#endif  // __WIN32
-#ifdef __linux__
+#else
   struct dirent* de = nullptr;
   DIR* dir = nullptr;
 
@@ -431,7 +427,7 @@ std::list<std::string> eCAL::eh5::HDF5MeasDir::GetHdfFiles(const std::string& pa
     }
     closedir(dir);
 }
-#endif  //  __linux__
+#endif  //  WIN32
   return paths;
 }
 
diff --git a/contrib/ecalhdf5/src/eh5_util.h b/contrib/ecalhdf5/src/eh5_util.h
index 2872d17877..00903cb5ff 100644
--- a/contrib/ecalhdf5/src/eh5_util.h
+++ b/contrib/ecalhdf5/src/eh5_util.h
@@ -27,19 +27,17 @@
 #include <regex>
 #include <list>
 
-#ifdef _WIN32
+#ifdef WIN32
 #if defined(_MSC_VER) && defined(__clang__) && !defined(CINTERFACE)
 #define CINTERFACE
 #endif
 #include <windows.h>
 #include <direct.h>
-#endif  // _WIN32
-
-#ifdef __linux__
+#else
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#endif  // __linux__
+#endif  // WIN32
 
 namespace Utility
 {
@@ -55,7 +53,7 @@ namespace Utility
     inline eType GetType(const std::string& path)
     {
       eType type = eType::unknown;
-#ifdef _WIN32
+#ifdef WIN32
       DWORD attribs = ::GetFileAttributesA(path.c_str());
       if (attribs == INVALID_FILE_ATTRIBUTES)
         type = eType::unknown;
@@ -63,8 +61,7 @@ namespace Utility
         type = eType::directory;
       else
         type = eType::file;
-
-#elif __linux__
+#else
       struct stat s;
       if (stat(path.c_str(), &s) == 0)
       {
@@ -73,7 +70,7 @@ namespace Utility
         else if (s.st_mode & S_IFREG)
           type = eType::file;
       }
-#endif  //  __linux__
+#endif  // WIN32
 
       return type;
     }
@@ -90,19 +87,19 @@ namespace Utility
     **/
     inline bool Exists(const std::string& path)
     {
-#ifdef _WIN32
+#ifdef ECAL_OS_WINDOWS
       DWORD attribs = ::GetFileAttributesA(path.c_str());
       if (attribs == INVALID_FILE_ATTRIBUTES)
         return false;
 
       return (attribs & FILE_ATTRIBUTE_DIRECTORY) != 0;
-#elif __linux__
+#else
       struct stat st;
       if (stat(path.c_str(), &st) == 0)
         if ((st.st_mode & S_IFDIR) != 0)
           return true;
       return false;
-#endif  //  __linux__
+#endif  //  ECAL_OS_WINDOWS
     }
 
     /**
@@ -130,11 +127,11 @@ namespace Utility
         pre = position;
         if (directory.size() == 0)
           continue;
-#ifdef _WIN32
+#ifdef WIN32
         _mkdir(directory.c_str());
-#elif __linux__
+#else
         mkdir(directory.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-#endif  //  __linux__
+#endif  //  WIN32
       }
       return Exists(path);
     }
diff --git a/contrib/ecalproto/src/CMakeLists.txt b/contrib/ecalproto/CMakeLists.txt
similarity index 71%
rename from contrib/ecalproto/src/CMakeLists.txt
rename to contrib/ecalproto/CMakeLists.txt
index 09570dadce..dd3658c695 100644
--- a/contrib/ecalproto/src/CMakeLists.txt
+++ b/contrib/ecalproto/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Protobuf REQUIRED)
 project(proto)
 
 set(ecal_protobuf_src
-    ecal_proto_decoder.cpp
-    ecal_proto_dyn.cpp
-    ecal_proto_maximum_array_dimensions.cpp
-    ecal_proto_message_filter.cpp
-    ecal_proto_visitor.cpp
+    src/ecal_proto_decoder.cpp
+    src/ecal_proto_dyn.cpp
+    src/ecal_proto_maximum_array_dimensions.cpp
+    src/ecal_proto_message_filter.cpp
+    src/ecal_proto_visitor.cpp
 )
 
 set(ecal_protobuf_header
-    ../include/ecal/protobuf/ecal_proto_decoder.h
-    ../include/ecal/protobuf/ecal_proto_dyn.h
-    ../include/ecal/protobuf/ecal_proto_hlp.h
-    ../include/ecal/protobuf/ecal_proto_maximum_array_dimensions.h
-    ../include/ecal/protobuf/ecal_proto_message_filter.h
-    ../include/ecal/protobuf/ecal_proto_visitor.h
+    include/ecal/protobuf/ecal_proto_decoder.h
+    include/ecal/protobuf/ecal_proto_dyn.h
+    include/ecal/protobuf/ecal_proto_hlp.h
+    include/ecal/protobuf/ecal_proto_maximum_array_dimensions.h
+    include/ecal/protobuf/ecal_proto_message_filter.h
+    include/ecal/protobuf/ecal_proto_visitor.h
 )
 
 ecal_add_library(${PROJECT_NAME} ${ecal_protobuf_src} ${ecal_protobuf_header})
 add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 target_include_directories(${PROJECT_NAME} PUBLIC 
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
 )
 
diff --git a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_decoder.h b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_decoder.h
index 9805d46175..68cce5a685 100644
--- a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_decoder.h
+++ b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_decoder.h
@@ -25,7 +25,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4127 4244 4267 4512 4996)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/message.h>
 #ifdef _MSC_VER
diff --git a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_dyn.h b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_dyn.h
index b03656462a..d539c92118 100644
--- a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_dyn.h
+++ b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_dyn.h
@@ -27,9 +27,9 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
-#if defined(__linux__)
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
@@ -42,7 +42,7 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#if defined(__linux__)
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_hlp.h b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_hlp.h
index aeffa2ea18..eb6835c27a 100644
--- a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_hlp.h
+++ b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_hlp.h
@@ -30,7 +30,7 @@
 // protobuf includes
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/descriptor.pb.h>
 #ifdef _MSC_VER
diff --git a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_visitor.h b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_visitor.h
index bba759270c..e4a8576ddf 100644
--- a/contrib/ecalproto/include/ecal/protobuf/ecal_proto_visitor.h
+++ b/contrib/ecalproto/include/ecal/protobuf/ecal_proto_visitor.h
@@ -21,7 +21,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4127 4244 4267 4512 4996)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/message.h>
 #ifdef _MSC_VER
diff --git a/contrib/ecaltime/CMakeLists.txt b/contrib/ecaltime/CMakeLists.txt
index be47b2f02f..c635d58c79 100644
--- a/contrib/ecaltime/CMakeLists.txt
+++ b/contrib/ecaltime/CMakeLists.txt
@@ -16,9 +16,9 @@
 #
 # ========================= eCAL LICENSE =================================
 
-if(UNIX)
-  add_subdirectory(linuxptp/src)
+if(UNIX AND NOT APPLE)
+  add_subdirectory(linuxptp)
 endif()
 
-add_subdirectory(localtime/src)
-add_subdirectory(simtime/src)
+add_subdirectory(localtime)
+add_subdirectory(simtime)
diff --git a/contrib/ecaltime/linuxptp/src/CMakeLists.txt b/contrib/ecaltime/linuxptp/CMakeLists.txt
similarity index 85%
rename from contrib/ecaltime/linuxptp/src/CMakeLists.txt
rename to contrib/ecaltime/linuxptp/CMakeLists.txt
index 0fb6a13003..fe7bfb06d7 100644
--- a/contrib/ecaltime/linuxptp/src/CMakeLists.txt
+++ b/contrib/ecaltime/linuxptp/CMakeLists.txt
@@ -21,15 +21,15 @@ project(ecaltime-linuxptp)
 find_package(simpleini REQUIRED)
 
 set(ecal_time_linuxptp_src
-  ecal_time_linuxptp.cpp
-  ecaltime.cpp
-  convert_utf.cpp
+  src/ecal_time_linuxptp.cpp
+  src/ecaltime.cpp
+  src/convert_utf.cpp
 ) 
 
 set(ecal_time_linuxptp_header
-  ../../include/ecaltime.h
-  ecal_time_linuxptp.h
-  config/config.h
+  ../include/ecaltime.h
+  src/ecal_time_linuxptp.h
+  src/config/config.h
 )
 
 if(UNIX)
@@ -43,13 +43,13 @@ target_link_libraries(${PROJECT_NAME} eCAL::core simpleini::simpleini)
 target_include_directories(${PROJECT_NAME} 
   PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
 
 ecal_install_time_plugin(${PROJECT_NAME})
 
 set(ECALTIME_CONFIG_FILES
   ${ECALTIME_CONFIG_FILES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/config/ecaltime.ini
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/config/ecaltime.ini
   PARENT_SCOPE)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
diff --git a/contrib/ecaltime/localtime/src/CMakeLists.txt b/contrib/ecaltime/localtime/CMakeLists.txt
similarity index 89%
rename from contrib/ecaltime/localtime/src/CMakeLists.txt
rename to contrib/ecaltime/localtime/CMakeLists.txt
index 1b0167d97f..0476183b3b 100644
--- a/contrib/ecaltime/localtime/src/CMakeLists.txt
+++ b/contrib/ecaltime/localtime/CMakeLists.txt
@@ -21,17 +21,17 @@ project(ecaltime-localtime)
 find_package(Threads REQUIRED)
 
 set(ecal_time_localtime_src
-  ecaltime.cpp
+  src/ecaltime.cpp
 ) 
 
 if(WIN32)
   set(ecal_time_localtime_dll_src
-    dllmain.cpp
+    src/dllmain.cpp
   )
 endif()
 
 set(ecal_time_localtime_header
-  ../../include/ecaltime.h
+  ../include/ecaltime.h
 )
 
 ecal_add_time_plugin(${PROJECT_NAME} SHARED ${ecal_time_localtime_src} ${ecal_time_localtime_header} ${ecal_time_localtime_dll_src})
@@ -41,11 +41,12 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ECAL_TIME_PLUGIN_API_EXPORT)
 target_include_directories(${PROJECT_NAME} 
   PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
 
 target_link_libraries(${PROJECT_NAME}
   Threads::Threads
-  $<$<BOOL:${UNIX}>:rt>)
+  $<$<AND:$<BOOL:${UNIX}>,$<NOT:$<BOOL:${APPLE}>>>:rt>
+  )
 
 ecal_install_time_plugin(${PROJECT_NAME})
 
diff --git a/contrib/ecaltime/simtime/src/CMakeLists.txt b/contrib/ecaltime/simtime/CMakeLists.txt
similarity index 87%
rename from contrib/ecaltime/simtime/src/CMakeLists.txt
rename to contrib/ecaltime/simtime/CMakeLists.txt
index e009137df3..6da8b32562 100644
--- a/contrib/ecaltime/simtime/src/CMakeLists.txt
+++ b/contrib/ecaltime/simtime/CMakeLists.txt
@@ -21,23 +21,23 @@ project(ecaltime-simtime)
 find_package(Protobuf REQUIRED)
 
 set(ecal_time_simtime_src
-    ecal_time_simtime.cpp
-    ecaltime.cpp
+  src/ecal_time_simtime.cpp
+  src/ecaltime.cpp
 ) 
 
 set(ecal_time_simtime_header
-  ../../include/dynamic_sleeper.h
-  ../../include/ecaltime.h
-  ecal_time_simtime.h
+  ../include/dynamic_sleeper.h
+  ../include/ecaltime.h
+  src/ecal_time_simtime.h
 )
 
 include_directories(${PROJECT_NAME}
-  ../../include
+  ../include
 )
 
 if(WIN32)
   set(ecal_time_simtime_dll_src
-      dllmain.cpp
+    src/dllmain.cpp
   )
 endif()
 
@@ -49,7 +49,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::core)
 target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::pb)
 
 target_include_directories(${PROJECT_NAME} PRIVATE .)
-target_include_directories(${PROJECT_NAME} PRIVATE  ../../include)
+target_include_directories(${PROJECT_NAME} PRIVATE  ../include)
 
 ecal_install_time_plugin(${PROJECT_NAME})
 
diff --git a/contrib/ecaltime/simtime/src/ecal_time_simtime.h b/contrib/ecaltime/simtime/src/ecal_time_simtime.h
index 39bca9bc09..9a4752ebe7 100644
--- a/contrib/ecaltime/simtime/src/ecal_time_simtime.h
+++ b/contrib/ecaltime/simtime/src/ecal_time_simtime.h
@@ -31,7 +31,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4127 4244 4267 4512)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/sim_time.pb.h"
 #ifdef _MSC_VER
diff --git a/contrib/message/include/ecal/msg/proto/message.h b/contrib/message/include/ecal/msg/proto/message.h
index 551f39cd4c..e266081bb6 100644
--- a/contrib/message/include/ecal/msg/proto/message.h
+++ b/contrib/message/include/ecal/msg/proto/message.h
@@ -19,7 +19,15 @@
 
 #pragma once
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
+#endif
 #include <google/protobuf/message.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include <ecal/protobuf/ecal_proto_hlp.h>
 #include <ecal/msg/message.h>
 
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
new file mode 100644
index 0000000000..a27b980d23
--- /dev/null
+++ b/ecal/core/CMakeLists.txt
@@ -0,0 +1,485 @@
+# ========================= eCAL LICENSE =================================
+#
+# Copyright (C) 2016 - 2019 Continental Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ========================= eCAL LICENSE =================================
+
+project(core VERSION ${eCAL_VERSION_STRING})
+
+find_package(Threads      REQUIRED)
+find_package(asio         REQUIRED)
+find_package(tclap        REQUIRED)
+find_package(simpleini    REQUIRED)
+
+if (ECAL_JOIN_MULTICAST_TWICE)
+  message(STATUS "eCAL ${PROJECT_NAME}: Enabling Specific Multicast Network Bug Workaround")
+  add_definitions(-DECAL_JOIN_MULTICAST_TWICE)
+endif(ECAL_JOIN_MULTICAST_TWICE)
+
+# If we're currently doing a build within a git repository, we will configure the header files.
+# Else, (e.g. for source packages such as debian source packages) we will use a preconfigured file.
+# If there is really no information available, it will generate a dummy version file 0.0.0
+if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
+  configure_file(src/ecal_defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h" @ONLY)
+endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
+
+set(ecal_io_cpp_src
+    src/io/rcv_sample.cpp
+    src/io/snd_raw_buffer.cpp
+    src/io/snd_sample.cpp
+    src/io/udp_init.cpp
+    src/io/udp_receiver.cpp
+    src/io/udp_sender.cpp
+)
+
+if(NOT ECAL_LAYER_ICEORYX)
+  set(ecal_io_mem_cpp_src
+      src/io/ecal_memfile.cpp
+      src/io/ecal_memfile_pool.cpp
+  )
+  if(UNIX)
+    set(ecal_io_mem_cpp_linux_src
+        src/io/linux/ecal_memfile_linux.cpp
+    )
+  endif()
+
+  if(WIN32)
+    set(ecal_io_mem_cpp_win_src
+       src/io/win32/ecal_memfile_win32.cpp
+    )
+  endif()
+endif(NOT ECAL_LAYER_ICEORYX)
+
+set(ecal_mon_cpp_src
+    src/mon/ecal_monitoring_def.cpp
+    src/mon/ecal_monitoring_impl.cpp
+    src/mon/ecal_monitoring_threads.cpp
+)
+
+set(ecal_pubsub_cpp_src
+    src/pubsub/ecal_proto_dyn_json_sub.cpp
+    src/pubsub/ecal_pubgate.cpp
+    src/pubsub/ecal_publisher.cpp
+    src/pubsub/ecal_subgate.cpp
+    src/pubsub/ecal_subscriber.cpp
+)
+
+set(ecal_readwrite_cpp_src
+    src/readwrite/ecal_reader.cpp
+    src/readwrite/ecal_reader_inproc.cpp
+    src/readwrite/ecal_reader_udp.cpp
+    src/readwrite/ecal_reader_udp_mc.cpp
+    src/readwrite/ecal_writer.cpp
+    src/readwrite/ecal_writer_inproc.cpp
+    src/readwrite/ecal_writer_udp_mc.cpp
+)
+
+if(ECAL_LAYER_ICEORYX)
+  set(ecal_readwrite_shm_cpp_src
+    src/readwrite/ecal_reader_iceoryx.cpp
+    src/readwrite/ecal_writer_iceoryx.cpp
+  )
+else(ECAL_LAYER_ICEORYX)
+  set(ecal_readwrite_shm_cpp_src
+    src/readwrite/ecal_reader_shm.cpp
+    src/readwrite/ecal_writer_shm.cpp
+  )
+endif(ECAL_LAYER_ICEORYX)
+
+set(ecal_service_cpp_src
+    src/service/ecal_service_client.cpp
+    src/service/ecal_service_client_impl.cpp
+    src/service/ecal_service_server.cpp
+    src/service/ecal_service_server_impl.cpp
+    src/service/ecal_tcpclient.cpp
+    src/service/ecal_tcpserver.cpp
+)
+
+set(ecal_cmn_cpp_src
+    src/convert_utf.cpp
+    src/ecal.cpp
+    src/ecal_clang.cpp
+    src/ecal_config.cpp
+    src/ecal_descgate.cpp
+    src/ecal_event.cpp
+    src/ecal_global_accessors.cpp
+    src/ecal_globals.cpp
+    src/ecal_log.cpp
+    src/ecal_log_impl.cpp
+    src/ecal_process.cpp
+    src/ecal_reggate.cpp
+    src/ecal_register.cpp
+    src/ecal_servgate.cpp
+    src/ecal_thread.cpp
+    src/ecal_time.cpp
+    src/ecal_timegate.cpp
+    src/ecal_timer.cpp
+    src/ecal_util.cpp
+    src/ecalc.cpp
+    src/sys_usage.cpp
+)
+
+set(ecal_io_header_src
+    src/io/ecal_message.h
+    src/io/ecal_receiver.h
+    src/io/ecal_sender.h
+    src/io/msg_type.h
+    src/io/rcv_sample.h
+    src/io/snd_raw_buffer.h
+    src/io/snd_sample.h
+    src/io/udp_init.h
+    src/io/udp_receiver.h
+    src/io/udp_sender.h
+)
+
+if(NOT ECAL_LAYER_ICEORYX)
+  set(ecal_io_mem_header_src
+      src/io/ecal_memfile.h
+      src/io/ecal_memfile_mtx.h
+      src/io/ecal_memfile_pool.h
+  )
+
+  if(WIN32)
+    set(ecal_io_mem_header_win_src
+        src/io/win32/ecal_memfile_mtx.h
+    )
+  endif()
+
+  if(UNIX)
+    set(ecal_io_mem_header_linux_src
+        src/io/linux/ecal_memfile_mtx.h
+  )
+  endif()
+endif(NOT ECAL_LAYER_ICEORYX)
+
+set(ecal_mon_header_src
+    src/mon/ecal_monitoring_def.h
+    src/mon/ecal_monitoring_impl.h
+    src/mon/ecal_monitoring_threads.h
+)
+
+set(ecal_pubsub_header_src
+    src/pubsub/ecal_pubgate.h
+    src/pubsub/ecal_subgate.h
+)
+
+set(ecal_readwrite_header_src
+    src/readwrite/ecal_reader.h
+    src/readwrite/ecal_reader_inproc.h
+    src/readwrite/ecal_reader_udp.h
+    src/readwrite/ecal_reader_udp_mc.h
+    src/readwrite/ecal_writer.h
+    src/readwrite/ecal_writer_base.h
+    src/readwrite/ecal_writer_inproc.h
+    src/readwrite/ecal_writer_udp_mc.h
+)
+
+if(ECAL_LAYER_ICEORYX)
+  set(ecal_readwrite_shm_header_src
+      src/readwrite/ecal_reader_iceoryx.h
+      src/readwrite/ecal_writer_iceoryx.h
+  )
+else(ECAL_LAYER_ICEORYX)
+  set(ecal_readwrite_shm_header_src
+      src/readwrite/ecal_reader_shm.h
+      src/readwrite/ecal_writer_shm.h
+  )
+endif(ECAL_LAYER_ICEORYX)
+
+set(ecal_service_header_src
+    src/service/asio_server.h
+    src/service/ecal_service_client_impl.h
+    src/service/ecal_service_server_impl.h
+    src/service/ecal_tcpclient.h
+    src/service/ecal_tcpserver.h
+)
+
+set(ecal_cmn_header_src
+    src/convert_utf.h
+    src/ecal_config.h
+    src/ecal_config_hlp.h
+    src/ecal_def.h
+    src/ecal_def_ini.h
+    src/ecal_descgate.h
+    src/ecal_expmap.h
+    src/ecal_global_accessors.h
+    src/ecal_globals.h
+    src/ecal_log_impl.h
+    src/ecal_reggate.h
+    src/ecal_register.h
+    src/ecal_servgate.h
+    src/ecal_thread.h
+    src/ecal_timegate.h
+    src/ecal_win_main.h
+    src/ecal_win_socket.h
+    src/getenvvar.h
+    src/sys_usage.h
+    src/topic2mcast.h
+)
+
+set(ecal_c_src
+    src/ecalc.cpp
+)
+
+if(WIN32)
+  set(ecal_c_win_src
+      src/win32/dll/dllmain.cpp
+      src/win32/dll/ecal.rc
+  )
+endif()
+
+set(ecal_header_cmn
+    include/ecal/ecal.h
+    include/ecal/ecal_callback.h
+    include/ecal/ecal_clang.h
+    include/ecal/ecal_client.h
+    include/ecal/ecal_core.h
+    include/ecal/ecal_event.h
+    include/ecal/ecal_eventhandle.h
+    include/ecal/ecal_init.h
+    include/ecal/ecal_log.h
+    include/ecal/ecal_log_level.h
+    include/ecal/ecal_monitoring.h
+    include/ecal/ecal_os.h
+    include/ecal/ecal_process.h
+    include/ecal/ecal_process_mode.h
+    include/ecal/ecal_process_severity.h
+    include/ecal/ecal_publisher.h
+    include/ecal/ecal_qos.h
+    include/ecal/ecal_server.h
+    include/ecal/ecal_service.h
+    include/ecal/ecal_service_info.h
+    include/ecal/ecal_subscriber.h
+    include/ecal/ecal_time.h
+    include/ecal/ecal_timed_cb.h
+    include/ecal/ecal_timer.h
+    include/ecal/ecal_tlayer.h
+    include/ecal/ecal_util.h
+    include/ecal/ecalc.h
+)
+
+set(ecal_header_cimpl
+    include/ecal/cimpl/ecal_callback_cimpl.h
+    include/ecal/cimpl/ecal_core_cimpl.h
+    include/ecal/cimpl/ecal_event_cimpl.h
+    include/ecal/cimpl/ecal_init_cimpl.h
+    include/ecal/cimpl/ecal_log_cimpl.h
+    include/ecal/cimpl/ecal_monitoring_cimpl.h
+    include/ecal/cimpl/ecal_process_cimpl.h
+    include/ecal/cimpl/ecal_proto_dyn_json_subscriber_cimpl.h
+    include/ecal/cimpl/ecal_publisher_cimpl.h
+    include/ecal/cimpl/ecal_qos_cimpl.h
+    include/ecal/cimpl/ecal_service_cimpl.h
+    include/ecal/cimpl/ecal_service_info_cimpl.h
+    include/ecal/cimpl/ecal_subscriber_cimpl.h
+    include/ecal/cimpl/ecal_time_cimpl.h
+    include/ecal/cimpl/ecal_timer_cimpl.h
+    include/ecal/cimpl/ecal_tlayer_cimpl.h
+    include/ecal/cimpl/ecal_util_cimpl.h
+)
+
+set(ecal_header_msg
+    include/ecal/msg/capnproto/dynamic.h
+    include/ecal/msg/capnproto/helper.h
+    include/ecal/msg/capnproto/publisher.h
+    include/ecal/msg/capnproto/subscriber.h
+    include/ecal/msg/flatbuffers/publisher.h
+    include/ecal/msg/flatbuffers/subscriber.h
+    include/ecal/msg/messagepack/publisher.h
+    include/ecal/msg/messagepack/subscriber.h
+    include/ecal/msg/protobuf/client.h
+    include/ecal/msg/protobuf/dynamic_json_subscriber.h
+    include/ecal/msg/protobuf/dynamic_subscriber.h
+    include/ecal/msg/protobuf/publisher.h
+    include/ecal/msg/protobuf/server.h
+    include/ecal/msg/protobuf/subscriber.h
+    include/ecal/msg/string/publisher.h
+    include/ecal/msg/string/subscriber.h
+    include/ecal/msg/dynamic.h
+    include/ecal/msg/publisher.h
+    include/ecal/msg/subscriber.h
+)
+
+set(ecal_header_base
+    ${ecal_header_cmn}
+    ${ecal_header_cimpl}
+    ${ecal_header_msg}
+)
+
+ecal_add_ecal_shared_library(${PROJECT_NAME} 
+    ${ecal_io_cpp_src} 
+    ${ecal_io_mem_cpp_src} 
+    ${ecal_io_mem_cpp_win_src} 
+    ${ecal_io_mem_cpp_linux_src} 
+    ${ecal_mon_cpp_src} 
+    ${ecal_pubsub_cpp_src} 
+    ${ecal_readwrite_cpp_src} 
+    ${ecal_readwrite_shm_cpp_src}
+    ${ecal_service_cpp_src}
+    ${ecal_cmn_cpp_src}
+
+    ${ecal_cmn_header_src}
+    ${ecal_io_header_src}
+    ${ecal_io_mem_header_src} 
+    ${ecal_io_mem_header_win_src} 
+    ${ecal_io_mem_header_linux_src} 
+    ${ecal_mon_header_src}
+    ${ecal_pubsub_header_src}
+    ${ecal_readwrite_header_src}
+    ${ecal_readwrite_shm_header_src}
+    ${ecal_service_header_src}
+
+    ${ecal_header_base}
+    ${ecal_header_cimpl}
+    ${ecal_header_msg}
+    
+    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h
+)
+
+if(UNIX)
+  set_source_files_properties(convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
+endif()
+
+ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
+
+add_library(eCAL::${PROJECT_NAME}   ALIAS ${PROJECT_NAME})
+add_library(eCAL::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c)
+
+target_link_libraries(${PROJECT_NAME}_c ${PROJECT_NAME})
+
+target_compile_definitions(${PROJECT_NAME}_c
+  INTERFACE ECAL_C_DLL
+  PUBLIC ASIO_STANDALONE
+  PRIVATE eCAL_EXPORTS)
+
+target_compile_definitions(${PROJECT_NAME}
+  PUBLIC ASIO_STANDALONE
+  PRIVATE eCAL_EXPORTS)
+
+if(ECAL_LAYER_ICEORYX)
+  if(UNIX)
+    find_package(iceoryx_posh REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE iceoryx_posh::iceoryx_posh)
+  endif()
+    target_compile_definitions(${PROJECT_NAME} PUBLIC ECAL_LAYER_ICEORYX)
+endif()
+
+if(ECAL_NPCAP_SUPPORT)
+  add_definitions(-DECAL_NPCAP_SUPPORT)
+  target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+      udpcap
+  )
+ endif(ECAL_NPCAP_SUPPORT)
+
+target_include_directories(${PROJECT_NAME}
+  PRIVATE 
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/>
+    $<INSTALL_INTERFACE:include>
+)
+
+target_link_libraries(${PROJECT_NAME} 
+  PUBLIC
+    eCAL::proto
+  PRIVATE
+    $<$<BOOL:${UNIX}>:dl>
+    $<$<AND:$<BOOL:${UNIX}>,$<NOT:$<BOOL:${APPLE}>>>:rt>
+    $<$<BOOL:${WIN32}>:iphlpapi>
+    $<$<BOOL:${WIN32}>:psapi> 
+    $<$<BOOL:${WIN32}>:shlwapi.lib> 
+    $<$<BOOL:${WIN32}>:winmm> 
+    $<$<BOOL:${WIN32}>:ws2_32> 
+    $<$<BOOL:${WIN32}>:wsock32>
+    asio::asio
+    tclap::tclap
+    CustomTclap
+    simpleini::simpleini
+    eCAL::pb
+    Threads::Threads
+    eCAL::apps
+    eCAL::utils
+)
+
+set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
+set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
+
+ecal_install_ecal_shared_library(${PROJECT_NAME}_c)
+ecal_install_ecal_shared_library(${PROJECT_NAME})
+
+install(DIRECTORY
+   "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
+    FILES_MATCHING PATTERN "*.h")
+
+#Install generated ecal_defs.h file    
+install(DIRECTORY
+   "${CMAKE_CURRENT_BINARY_DIR}/include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
+    FILES_MATCHING PATTERN "*.h")
+    
+
+if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES 
+    ${ecal_io_cpp_src}
+    ${ecal_io_mem_cpp_src}
+    ${ecal_io_mem_cpp_linux_src} 
+    ${ecal_io_mem_cpp_win_src} 
+    ${ecal_io_cpp_linux_src}
+    ${ecal_io_cpp_win32_src}
+    ${ecal_mon_cpp_src}
+    ${ecal_pubsub_cpp_src}
+    ${ecal_readwrite_cpp_src}
+    ${ecal_readwrite_shm_cpp_src}
+    ${ecal_service_cpp_src}
+    ${ecal_cmn_cpp_src}
+    ${ecal_c_src}
+    ${ecal_c_win_src}
+  )
+  
+  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Header Files\\internal" FILES 
+    ${ecal_cmn_header_src}
+    ${ecal_io_header_src}
+    ${ecal_io_mem_header_src}
+    ${ecal_io_mem_header_win_src}
+    ${ecal_io_header_linux_src}
+    ${ecal_io_header_win_src}
+    ${ecal_mon_header_src}
+    ${ecal_pubsub_header_src}
+    ${ecal_readwrite_header_src}
+    ${ecal_readwrite_shm_header_src}
+    ${ecal_service_header_src}
+  )
+  
+  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/include" PREFIX "Header Files\\public" FILES 
+    ${ecal_header_cmn}
+    ${ecal_header_cimpl}
+    ${ecal_header_msg}
+  )
+endif()
+
+# eCAL Process stub
+if(UNIX)
+    set(PROJECT_NAME_PROCESS_STUB process_stub)
+
+    ecal_add_app_console(${PROJECT_NAME_PROCESS_STUB}
+        src/ecal_process_stub.cpp
+        src/ecal_process_stub.h
+    )
+
+    ecal_install_app(${PROJECT_NAME_PROCESS_STUB})
+
+    set_property(TARGET ${PROJECT_NAME_PROCESS_STUB} PROPERTY FOLDER ecal/core)
+endif(UNIX)
diff --git a/ecal/core/include/ecal/ecal_os.h b/ecal/core/include/ecal/ecal_os.h
index 49b51bdaf6..a91954094f 100644
--- a/ecal/core/include/ecal/ecal_os.h
+++ b/ecal/core/include/ecal/ecal_os.h
@@ -32,6 +32,12 @@
 #define ECAL_OS_LINUX
 #endif
 
+#if defined(__APPLE__)
+#define ECAL_OS_LINUX // macOS does not differ that much from linux
+#define ECAL_OS_MACOS
+#endif
+
+
 #ifdef _MSC_VER
   #ifdef eCAL_EXPORTS
     #define ECALC_API __declspec(dllexport)
diff --git a/ecal/core/include/ecal/msg/protobuf/client.h b/ecal/core/include/ecal/msg/protobuf/client.h
index 0391a4fb3c..865072a8a3 100644
--- a/ecal/core/include/ecal/msg/protobuf/client.h
+++ b/ecal/core/include/ecal/msg/protobuf/client.h
@@ -30,7 +30,7 @@
 // protobuf includes
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/descriptor.pb.h>
 #ifdef _MSC_VER
diff --git a/ecal/core/include/ecal/msg/protobuf/dynamic_json_subscriber.h b/ecal/core/include/ecal/msg/protobuf/dynamic_json_subscriber.h
index 9407e81259..fd1d4dab48 100644
--- a/ecal/core/include/ecal/msg/protobuf/dynamic_json_subscriber.h
+++ b/ecal/core/include/ecal/msg/protobuf/dynamic_json_subscriber.h
@@ -27,7 +27,6 @@
 #ifndef ECAL_C_DLL
 
 #include <ecal/ecal.h>
-#include <ecal/msg/protobuf/dynamic_subscriber.h>
 
 namespace eCAL
 {
@@ -104,8 +103,8 @@ namespace eCAL
 
     private:
       // this object must not be copied.
-      CDynamicJSONSubscriber(const CDynamicSubscriber&);
-      CDynamicJSONSubscriber& operator=(const CDynamicSubscriber&);
+      CDynamicJSONSubscriber(const CDynamicJSONSubscriber&);
+      CDynamicJSONSubscriber& operator=(const CDynamicJSONSubscriber&);
     };
     /** @example proto_dyn_json.cpp
     * This is an example how to use CDynamicJSONSubscriber to receive dynamic google::protobuf data as a JSON string with eCAL.
diff --git a/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h b/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h
index 2b0b42ecfe..b30f6cfc55 100644
--- a/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h
+++ b/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h
@@ -32,7 +32,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/message.h>
 #ifdef _MSC_VER
diff --git a/ecal/core/include/ecal/msg/protobuf/publisher.h b/ecal/core/include/ecal/msg/protobuf/publisher.h
index e138127899..f55c549012 100644
--- a/ecal/core/include/ecal/msg/protobuf/publisher.h
+++ b/ecal/core/include/ecal/msg/protobuf/publisher.h
@@ -30,7 +30,7 @@
 // protobuf includes
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/descriptor.pb.h>
 #ifdef _MSC_VER
@@ -136,7 +136,11 @@ namespace eCAL
       **/
       size_t GetSize(const T& msg_) const
       {
+#if GOOGLE_PROTOBUF_VERSION >= 3001000
+        return((size_t)msg_.ByteSizeLong());
+#else
         return((size_t)msg_.ByteSize());
+#endif
       }
 
       /**
diff --git a/ecal/core/include/ecal/msg/protobuf/server.h b/ecal/core/include/ecal/msg/protobuf/server.h
index 5ced37cd91..cb2e5cf6a6 100644
--- a/ecal/core/include/ecal/msg/protobuf/server.h
+++ b/ecal/core/include/ecal/msg/protobuf/server.h
@@ -30,7 +30,7 @@
 // protobuf includes
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/descriptor.pb.h>
 #ifdef _MSC_VER
diff --git a/ecal/core/include/ecal/msg/protobuf/subscriber.h b/ecal/core/include/ecal/msg/protobuf/subscriber.h
index 3a1fe09aad..41e9e642c2 100644
--- a/ecal/core/include/ecal/msg/protobuf/subscriber.h
+++ b/ecal/core/include/ecal/msg/protobuf/subscriber.h
@@ -30,7 +30,7 @@
 // protobuf includes
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include <google/protobuf/descriptor.pb.h>
 #ifdef _MSC_VER
diff --git a/ecal/core/src/CMakeLists.txt b/ecal/core/src/CMakeLists.txt
deleted file mode 100644
index 5621a37863..0000000000
--- a/ecal/core/src/CMakeLists.txt
+++ /dev/null
@@ -1,479 +0,0 @@
-# ========================= eCAL LICENSE =================================
-#
-# Copyright (C) 2016 - 2019 Continental Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ========================= eCAL LICENSE =================================
-
-project(core VERSION ${eCAL_VERSION_STRING})
-
-find_package(Threads      REQUIRED)
-find_package(asio         REQUIRED)
-find_package(tclap        REQUIRED)
-find_package(simpleini    REQUIRED)
-
-if (ECAL_JOIN_MULTICAST_TWICE)
-  message(STATUS "eCAL ${PROJECT_NAME}: Enabling Specific Multicast Network Bug Workaround")
-  add_definitions(-DECAL_JOIN_MULTICAST_TWICE)
-endif(ECAL_JOIN_MULTICAST_TWICE)
-
-# If we're currently doing a build within a git repository, we will configure the header files.
-# Else, (e.g. for source packages such as debian source packages) we will use a preconfigured file.
-# If there is really no information available, it will generate a dummy version file 0.0.0
-if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../include/ecal/ecal_defs.h")
-  configure_file(ecal_defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h" @ONLY)
-endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../include/ecal/ecal_defs.h")
-
-set(ecal_io_cpp_src
-    io/rcv_sample.cpp
-    io/snd_raw_buffer.cpp
-    io/snd_sample.cpp
-    io/udp_init.cpp
-    io/udp_receiver.cpp
-    io/udp_sender.cpp
-)
-
-if(NOT ECAL_LAYER_ICEORYX)
-  set(ecal_io_mem_cpp_src
-      io/ecal_memfile.cpp
-      io/ecal_memfile_pool.cpp
-  )
-  if(UNIX)
-    set(ecal_io_mem_cpp_linux_src
-        io/linux/ecal_memfile_linux.cpp
-    )
-  endif()
-
-  if(WIN32)
-    set(ecal_io_mem_cpp_win_src
-       io/win32/ecal_memfile_win32.cpp
-    )
-  endif()
-endif(NOT ECAL_LAYER_ICEORYX)
-
-set(ecal_mon_cpp_src
-    mon/ecal_monitoring_def.cpp
-    mon/ecal_monitoring_impl.cpp
-    mon/ecal_monitoring_threads.cpp
-)
-
-set(ecal_pubsub_cpp_src
-    pubsub/ecal_proto_dyn_json_sub.cpp
-    pubsub/ecal_pubgate.cpp
-    pubsub/ecal_publisher.cpp
-    pubsub/ecal_subgate.cpp
-    pubsub/ecal_subscriber.cpp
-)
-
-set(ecal_readwrite_cpp_src
-    readwrite/ecal_reader.cpp
-    readwrite/ecal_reader_inproc.cpp
-    readwrite/ecal_reader_udp.cpp
-    readwrite/ecal_reader_udp_mc.cpp
-    readwrite/ecal_writer.cpp
-    readwrite/ecal_writer_inproc.cpp
-    readwrite/ecal_writer_udp_mc.cpp
-)
-
-if(ECAL_LAYER_ICEORYX)
-  set(ecal_readwrite_shm_cpp_src
-    readwrite/ecal_reader_iceoryx.cpp
-    readwrite/ecal_writer_iceoryx.cpp
-  )
-else(ECAL_LAYER_ICEORYX)
-  set(ecal_readwrite_shm_cpp_src
-    readwrite/ecal_reader_shm.cpp
-    readwrite/ecal_writer_shm.cpp
-  )
-endif(ECAL_LAYER_ICEORYX)
-
-set(ecal_service_cpp_src
-    service/ecal_service_client.cpp
-    service/ecal_service_client_impl.cpp
-    service/ecal_service_server.cpp
-    service/ecal_service_server_impl.cpp
-    service/ecal_tcpclient.cpp
-    service/ecal_tcpserver.cpp
-)
-
-set(ecal_cmn_cpp_src
-    convert_utf.cpp
-    ecal.cpp
-    ecal_clang.cpp
-    ecal_config.cpp
-    ecal_descgate.cpp
-    ecal_event.cpp
-    ecal_global_accessors.cpp
-    ecal_globals.cpp
-    ecal_log.cpp
-    ecal_log_impl.cpp
-    ecal_process.cpp
-    ecal_reggate.cpp
-    ecal_register.cpp
-    ecal_servgate.cpp
-    ecal_thread.cpp
-    ecal_time.cpp
-    ecal_timegate.cpp
-    ecal_timer.cpp
-    ecal_util.cpp
-    ecalc.cpp
-    sys_usage.cpp
-)
-
-set(ecal_io_header_src
-    io/ecal_message.h
-    io/ecal_receiver.h
-    io/ecal_sender.h
-    io/msg_type.h
-    io/rcv_sample.h
-    io/snd_raw_buffer.h
-    io/snd_sample.h
-    io/udp_init.h
-    io/udp_receiver.h
-    io/udp_sender.h
-)
-
-if(NOT ECAL_LAYER_ICEORYX)
-  set(ecal_io_mem_header_src
-      io/ecal_memfile.h
-      io/ecal_memfile_mtx.h
-      io/ecal_memfile_pool.h
-  )
-
-  if(WIN32)
-    set(ecal_io_mem_header_win_src
-        io/win32/ecal_memfile_mtx.h
-    )
-  endif()
-
-  if(UNIX)
-    set(ecal_io_mem_header_linux_src
-        io/linux/ecal_memfile_mtx.h
-  )
-  endif()
-endif(NOT ECAL_LAYER_ICEORYX)
-
-set(ecal_mon_header_src
-    mon/ecal_monitoring_def.h
-    mon/ecal_monitoring_impl.h
-    mon/ecal_monitoring_threads.h
-)
-
-set(ecal_pubsub_header_src
-    pubsub/ecal_pubgate.h
-    pubsub/ecal_subgate.h
-)
-
-set(ecal_readwrite_header_src
-    readwrite/ecal_reader.h
-    readwrite/ecal_reader_inproc.h
-    readwrite/ecal_reader_udp.h
-    readwrite/ecal_reader_udp_mc.h
-    readwrite/ecal_writer.h
-    readwrite/ecal_writer_base.h
-    readwrite/ecal_writer_inproc.h
-    readwrite/ecal_writer_udp_mc.h
-)
-
-if(ECAL_LAYER_ICEORYX)
-  set(ecal_readwrite_shm_header_src
-      readwrite/ecal_reader_iceoryx.h
-      readwrite/ecal_writer_iceoryx.h
-  )
-else(ECAL_LAYER_ICEORYX)
-  set(ecal_readwrite_shm_header_src
-      readwrite/ecal_reader_shm.h
-      readwrite/ecal_writer_shm.h
-  )
-endif(ECAL_LAYER_ICEORYX)
-
-set(ecal_service_header_src
-    service/asio_server.h
-    service/ecal_service_client_impl.h
-    service/ecal_service_server_impl.h
-    service/ecal_tcpclient.h
-    service/ecal_tcpserver.h
-)
-
-set(ecal_cmn_header_src
-    convert_utf.h
-    ecal_config.h
-    ecal_config_hlp.h
-    ecal_def.h
-    ecal_def_ini.h
-    ecal_descgate.h
-    ecal_expmap.h
-    ecal_global_accessors.h
-    ecal_globals.h
-    ecal_log_impl.h
-    ecal_reggate.h
-    ecal_register.h
-    ecal_servgate.h
-    ecal_thread.h
-    ecal_timegate.h
-    ecal_win_main.h
-    ecal_win_socket.h
-    getenvvar.h
-    sys_usage.h
-    topic2mcast.h
-)
-
-set(ecal_c_src
-    ecalc.cpp
-)
-
-if(WIN32)
-  set(ecal_c_win_src
-      win32/dll/dllmain.cpp
-      win32/dll/ecal.rc
-  )
-endif()
-
-set(ecal_header_cmn
-    ../include/ecal/ecal.h
-    ../include/ecal/ecal_callback.h
-    ../include/ecal/ecal_clang.h
-    ../include/ecal/ecal_client.h
-    ../include/ecal/ecal_core.h
-    ../include/ecal/ecal_event.h
-    ../include/ecal/ecal_eventhandle.h
-    ../include/ecal/ecal_init.h
-    ../include/ecal/ecal_log.h
-    ../include/ecal/ecal_log_level.h
-    ../include/ecal/ecal_monitoring.h
-    ../include/ecal/ecal_os.h
-    ../include/ecal/ecal_process.h
-    ../include/ecal/ecal_process_mode.h
-    ../include/ecal/ecal_process_severity.h
-    ../include/ecal/ecal_publisher.h
-    ../include/ecal/ecal_qos.h
-    ../include/ecal/ecal_server.h
-    ../include/ecal/ecal_service.h
-    ../include/ecal/ecal_service_info.h
-    ../include/ecal/ecal_subscriber.h
-    ../include/ecal/ecal_time.h
-    ../include/ecal/ecal_timed_cb.h
-    ../include/ecal/ecal_timer.h
-    ../include/ecal/ecal_tlayer.h
-    ../include/ecal/ecal_util.h
-    ../include/ecal/ecalc.h
-)
-
-set(ecal_header_cimpl
-    ../include/ecal/cimpl/ecal_callback_cimpl.h
-    ../include/ecal/cimpl/ecal_core_cimpl.h
-    ../include/ecal/cimpl/ecal_event_cimpl.h
-    ../include/ecal/cimpl/ecal_init_cimpl.h
-    ../include/ecal/cimpl/ecal_log_cimpl.h
-    ../include/ecal/cimpl/ecal_monitoring_cimpl.h
-    ../include/ecal/cimpl/ecal_process_cimpl.h
-    ../include/ecal/cimpl/ecal_proto_dyn_json_subscriber_cimpl.h
-    ../include/ecal/cimpl/ecal_publisher_cimpl.h
-    ../include/ecal/cimpl/ecal_qos_cimpl.h
-    ../include/ecal/cimpl/ecal_service_cimpl.h
-    ../include/ecal/cimpl/ecal_service_info_cimpl.h
-    ../include/ecal/cimpl/ecal_subscriber_cimpl.h
-    ../include/ecal/cimpl/ecal_time_cimpl.h
-    ../include/ecal/cimpl/ecal_timer_cimpl.h
-    ../include/ecal/cimpl/ecal_tlayer_cimpl.h
-    ../include/ecal/cimpl/ecal_util_cimpl.h
-)
-
-set(ecal_header_msg
-    ../include/ecal/msg/capnproto/dynamic.h
-    ../include/ecal/msg/capnproto/helper.h
-    ../include/ecal/msg/capnproto/publisher.h
-    ../include/ecal/msg/capnproto/subscriber.h
-    ../include/ecal/msg/flatbuffers/publisher.h
-    ../include/ecal/msg/flatbuffers/subscriber.h
-    ../include/ecal/msg/messagepack/publisher.h
-    ../include/ecal/msg/messagepack/subscriber.h
-    ../include/ecal/msg/protobuf/client.h
-    ../include/ecal/msg/protobuf/dynamic_json_subscriber.h
-    ../include/ecal/msg/protobuf/dynamic_subscriber.h
-    ../include/ecal/msg/protobuf/publisher.h
-    ../include/ecal/msg/protobuf/server.h
-    ../include/ecal/msg/protobuf/subscriber.h
-    ../include/ecal/msg/string/publisher.h
-    ../include/ecal/msg/string/subscriber.h
-    ../include/ecal/msg/dynamic.h
-    ../include/ecal/msg/publisher.h
-    ../include/ecal/msg/subscriber.h
-)
-
-set(ecal_header_base
-    ${ecal_header_cmn}
-    ${ecal_header_cimpl}
-    ${ecal_header_msg}
-)
-
-ecal_add_ecal_shared_library(${PROJECT_NAME} 
-    ${ecal_io_cpp_src} 
-    ${ecal_io_mem_cpp_src} 
-    ${ecal_io_mem_cpp_win_src} 
-    ${ecal_io_mem_cpp_linux_src} 
-    ${ecal_mon_cpp_src} 
-    ${ecal_pubsub_cpp_src} 
-    ${ecal_readwrite_cpp_src} 
-    ${ecal_readwrite_shm_cpp_src}
-    ${ecal_service_cpp_src}
-    ${ecal_cmn_cpp_src}
-
-    ${ecal_cmn_header_src}
-    ${ecal_io_header_src}
-    ${ecal_io_mem_header_src} 
-    ${ecal_io_mem_header_win_src} 
-    ${ecal_io_mem_header_linux_src} 
-    ${ecal_mon_header_src}
-    ${ecal_pubsub_header_src}
-    ${ecal_readwrite_header_src}
-    ${ecal_readwrite_shm_header_src}
-    ${ecal_service_header_src}
-
-    ${ecal_header_base}
-    ${ecal_header_cimpl}
-    ${ecal_header_msg}
-    
-    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h
-)
-
-if(UNIX)
-  set_source_files_properties(convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
-endif()
-
-ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
-
-add_library(eCAL::${PROJECT_NAME}   ALIAS ${PROJECT_NAME})
-add_library(eCAL::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c)
-
-target_link_libraries(${PROJECT_NAME}_c ${PROJECT_NAME})
-
-target_compile_definitions(${PROJECT_NAME}_c
-  INTERFACE ECAL_C_DLL
-  PUBLIC ASIO_STANDALONE
-  PRIVATE eCAL_EXPORTS)
-
-target_compile_definitions(${PROJECT_NAME}
-  PUBLIC ASIO_STANDALONE
-  PRIVATE eCAL_EXPORTS)
-
-if(ECAL_LAYER_ICEORYX)
-  if(UNIX)
-    find_package(iceoryx_posh REQUIRED)
-    target_link_libraries(${PROJECT_NAME} PRIVATE iceoryx_posh::iceoryx_posh)
-  endif()
-    target_compile_definitions(${PROJECT_NAME} PUBLIC ECAL_LAYER_ICEORYX)
-endif()
-
-if(ECAL_NPCAP_SUPPORT)
-  add_definitions(-DECAL_NPCAP_SUPPORT)
-  target_link_libraries(${PROJECT_NAME}
-    PRIVATE
-      udpcap
-  )
- endif(ECAL_NPCAP_SUPPORT)
-
-target_include_directories(${PROJECT_NAME}
-  PRIVATE 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/>
-    $<INSTALL_INTERFACE:include>
-)
-
-target_link_libraries(${PROJECT_NAME} 
-  PUBLIC
-    eCAL::proto
-  PRIVATE
-    $<$<BOOL:${UNIX}>:rt>
-    $<$<BOOL:${UNIX}>:dl>
-    $<$<BOOL:${WIN32}>:iphlpapi>
-    $<$<BOOL:${WIN32}>:psapi> 
-    $<$<BOOL:${WIN32}>:shlwapi.lib> 
-    $<$<BOOL:${WIN32}>:winmm> 
-    $<$<BOOL:${WIN32}>:ws2_32> 
-    $<$<BOOL:${WIN32}>:wsock32>
-    asio::asio
-    tclap::tclap
-    CustomTclap
-    simpleini::simpleini
-    eCAL::pb
-    Threads::Threads
-    eCAL::apps
-    EcalUtils
-)
-
-set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
-set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
-
-ecal_install_ecal_shared_library(${PROJECT_NAME}_c)
-ecal_install_ecal_shared_library(${PROJECT_NAME})
-
-install(DIRECTORY
-   "../include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
-    FILES_MATCHING PATTERN "*.h")
-
-#Install generated ecal_defs.h file    
-install(DIRECTORY
-   "${CMAKE_CURRENT_BINARY_DIR}/include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
-    FILES_MATCHING PATTERN "*.h")
-    
-
-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0") 
-  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES 
-    ${ecal_io_cpp_src}
-    ${ecal_io_mem_cpp_src}
-    ${ecal_io_cpp_linux_src}
-    ${ecal_io_cpp_win32_src}
-    ${ecal_mon_cpp_src}
-    ${ecal_pubsub_cpp_src}
-    ${ecal_readwrite_cpp_src}
-    ${ecal_readwrite_shm_cpp_src}
-    ${ecal_service_cpp_src}
-  )
-  
-  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Header Files\\internal" FILES 
-    ${ecal_cmn_header_src}
-    ${ecal_io_header_src}
-    ${ecal_io_mem_header_src}
-    ${ecal_io_header_linux_src}
-    ${ecal_io_header_win_src}
-    ${ecal_mon_header_src}
-    ${ecal_pubsub_header_src}
-    ${ecal_readwrite_header_src}
-    ${ecal_readwrite_shm_header_src}
-    ${ecal_service_header_src}
-  )
-  
-  source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/../include" PREFIX "Header Files\\public" FILES 
-    ${ecal_header_cmn}
-    ${ecal_header_cimpl}
-    ${ecal_header_msg}
-  )
-endif()
-
-# eCAL Process stub
-if(UNIX)
-    set(PROJECT_NAME_PROCESS_STUB process_stub)
-
-    ecal_add_app_console(${PROJECT_NAME_PROCESS_STUB}
-        ecal_process_stub.cpp
-        ecal_process_stub.h
-    )
-
-    ecal_install_app(${PROJECT_NAME_PROCESS_STUB})
-
-    set_property(TARGET ${PROJECT_NAME_PROCESS_STUB} PROPERTY FOLDER ecal/core)
-endif(UNIX)
diff --git a/ecal/core/src/ecal_event.cpp b/ecal/core/src/ecal_event.cpp
index b87be012e1..74dc35454c 100644
--- a/ecal/core/src/ecal_event.cpp
+++ b/ecal/core/src/ecal_event.cpp
@@ -140,7 +140,9 @@ namespace
     pthread_condattr_t  shattr;
     pthread_condattr_init(&shattr);
     pthread_condattr_setpshared(&shattr, PTHREAD_PROCESS_SHARED);
+#ifndef ECAL_OS_MACOS
     pthread_condattr_setclock(&shattr, CLOCK_MONOTONIC);
+#endif // ECAL_OS_MACOS
     named_event_t* evt = static_cast<named_event_t*>(mmap(nullptr, sizeof(named_event_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));
     ::close(fd);
 
@@ -216,7 +218,11 @@ namespace
         // wait with timeout for unlock signal
         if (ts_)
         {
-          ret = pthread_cond_timedwait(&evt_->cvar, &evt_->mtx, ts_);
+#ifndef ECAL_OS_MACOS
+            ret = pthread_cond_timedwait(&evt_->cvar, &evt_->mtx, ts_);
+#else
+            ret = pthread_cond_timedwait_relative_np(&evt_->cvar, &evt_->mtx, ts_);
+#endif
         }
         // blocking wait for unlock signal
         else
diff --git a/ecal/core/src/ecal_log_impl.cpp b/ecal/core/src/ecal_log_impl.cpp
index 01cafae7de..12ce61e53f 100644
--- a/ecal/core/src/ecal_log_impl.cpp
+++ b/ecal/core/src/ecal_log_impl.cpp
@@ -47,7 +47,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/ecal_process.cpp b/ecal/core/src/ecal_process.cpp
index 95120573cc..633612f92a 100644
--- a/ecal/core/src/ecal_process.cpp
+++ b/ecal/core/src/ecal_process.cpp
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
+#include <memory>
 
 #include "sys_usage.h"
 
@@ -62,10 +63,15 @@
 #include <netinet/in.h>
 
 #include "ecal_process_stub.h"
-#include "EcalUtils/EcalUtils.h"
+#include <ecal_utils/ecal_utils.h>
 
 #endif /* ECAL_OS_LINUX */
 
+#ifdef ECAL_OS_MACOS
+#include <mach-o/dyld.h>
+#include <sys/sysctl.h>
+#endif // ECAL_OS_MACOS
+
 #ifdef ECAL_NPCAP_SUPPORT
 #include <udpcap/npcap_helpers.h>
 #endif // ECAL_NPCAP_SUPPORT
@@ -150,54 +156,7 @@ namespace
 #ifdef ECAL_OS_LINUX
   std::pair<bool, int> get_host_id()
   {
-    int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-    if (sock == -1) { /* handle error*/ };
-
-    struct ifconf ifc;
-    char          buf[1024];
-    ifc.ifc_len = sizeof(buf);
-    ifc.ifc_buf = buf;
-    if (ioctl(sock, SIOCGIFCONF, &ifc) == -1) { /* handle error */ }
-
-    struct ifreq* it = ifc.ifc_req;
-    const struct ifreq* const end = it + (ifc.ifc_len / sizeof(struct ifreq));
-
-    int success(0);
-    struct ifreq ifr;
-    for (; it != end; ++it)
-    {
-      strcpy(ifr.ifr_name, it->ifr_name); // get name
-      if (ioctl(sock, SIOCGIFFLAGS, &ifr) == 0)
-      {
-        if (!(ifr.ifr_flags & IFF_LOOPBACK)) // skip loopback
-        { 
-          if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0) // get hw address
-          {
-            success = 1;
-            break;
-          }
-        }
-      }
-      else { /* handle error */ }
-    }
-
-    // close socket
-    close(sock);
-
-    // create hash
-    if (success)
-    {
-      int hash(0);
-      for (auto i = 0; i < 6; ++i)
-      {
-        hash += (ifr.ifr_hwaddr.sa_data[i] << ((i & 1) * 8));
-      }
-      // return success
-      return std::make_pair(true, hash);
-    }
-
-    // return failure
-    return std::make_pair(false, 0);
+    return std::make_pair(true, static_cast<int>(gethostid()));
   }
 #endif /* ECAL_OS_LINUX */
 }
@@ -239,7 +198,7 @@ namespace eCAL
       }
 
       sstream << "------------------------- CONFIGURATION --------------------------" << std::endl;
-      sstream << "Default INI              : " << g_default_ini_file << std::endl;
+      sstream << "Default INI              : " << g_default_ini_file << std::endl; // WARNING: The eCAL Recorder relies on the identifier "Default INI" to obtain the ecal.ini path (It parses the output of this function)
       sstream << std::endl;
 
       sstream << "------------------------- NETWORK --------------------------------" << std::endl;
@@ -836,11 +795,20 @@ namespace eCAL
     *
     * @return the process path
     */
+
     std::string GetProcessName()
     {
       if (g_process_name.empty()) {
         // Read the link to our own executable
         char buf[PATH_MAX] = { 0 };
+#ifdef ECAL_OS_MACOS
+        uint32_t length = PATH_MAX;
+        if (_NSGetExecutablePath(buf, &length) != 0)
+        {
+          // Buffer size is too small.
+          return "";
+        }
+#else // ECAL_OS_MACOS
         ssize_t length = readlink("/proc/self/exe", buf, PATH_MAX);
 
         if (length < 0)
@@ -848,27 +816,147 @@ namespace eCAL
           std::cerr << "Unable to get process name: " << strerror(errno) << std::endl;
           return "";
         }
-
+#endif // ECAL_OS_MACOS
         // Copy the binary name to a std::string
         g_process_name = std::string(buf, length);
+
       }
       return g_process_name;
     }
-
     std::string GetProcessParameter()
     {
       if (g_process_par.empty())
       {
+#ifdef ECAL_OS_MACOS
+        int pid = getpid();
+
+        int    mib[3], argmax, argc;
+        size_t    size;
+
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_ARGMAX;
+
+        size = sizeof(argmax);
+        if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1)
+        {
+          return "";
+        }
+
+        /* Allocate space for the arguments. */
+        std::vector<char> procargs(argmax);
+
+        /*
+         * Make a sysctl() call to get the raw argument space of the process.
+         * The layout is documented in start.s, which is part of the Csu
+         * project.  In summary, it looks like:
+         *
+         * /---------------\ 0x00000000
+         * :               :
+         * :               :
+         * |---------------|
+         * | argc          |
+         * |---------------|
+         * | arg[0]        |
+         * |---------------|
+         * :               :
+         * :               :
+         * |---------------|
+         * | arg[argc - 1] |
+         * |---------------|
+         * | 0             |
+         * |---------------|
+         * | env[0]        |
+         * |---------------|
+         * :               :
+         * :               :
+         * |---------------|
+         * | env[n]        |
+         * |---------------|
+         * | 0             |
+         * |---------------| <-- Beginning of data returned by sysctl() is here.
+         * | argc          |
+         * |---------------|
+         * | exec_path     |
+         * |:::::::::::::::|
+         * |               |
+         * | String area.  |
+         * |               |
+         * |---------------| <-- Top of stack.
+         * :               :
+         * :               :
+         * \---------------/ 0xffffffff
+         */
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROCARGS2;
+        mib[2] = pid;
+
+        size = (size_t)argmax;
+        if (sysctl(mib, 3, procargs.data(), &size, NULL, 0) == -1)
+        {
+          return "";
+        }
+
+        // First few bytes are the argc
+        memcpy(&argc, procargs.data(), sizeof(argc));
+        size_t pos = sizeof(argc);
+
+        if (argc == 0)
+          return "";
+
+        // Skip the saved exec_path
+        for (; pos <= procargs.size(); pos++)
+        {
+          if (procargs[pos] == '\0')
+          {
+            // End of exec_path reached
+            break;
+          }
+        }
+        if (pos >= procargs.size())
+          return "";
+
+        // Skip trailing '\0' characters
+        for (; pos <= procargs.size(); pos++)
+        {
+          if (procargs[pos] != '\0') {
+            // Beginning of first argument reached
+            break;
+          }
+        }
+        if (pos >= procargs.size())
+          return "";
+
+        // Save where the argv[0] string starts
+        size_t pos_argv0 = pos;
+
+        // Iterate through the '\0' terminated strings and convert '\0' to ' '
+        size_t current_arg = 0;
+        for (size_t i = pos_argv0; i < procargs.size(); ++i)
+        {
+          if ((int)current_arg == (argc - 1))
+            break;
+
+          if (procargs[i] == '\0')
+          {
+            current_arg++;
+            procargs[i] = ' ';
+          }
+        }
+
+        // Copy to the string
+        g_process_par = &procargs[pos_argv0];
+
+#else // ECAL_OS_MACOS
         FILE* f;
         char cmdline[1024] = { 0 };
 
         f = fopen("/proc/self/cmdline", "r");
-        if (f == nullptr) return(0);
+        if (f == nullptr) return "";
 
         char* p = cmdline;
         char* res = fgets(cmdline, sizeof(cmdline) / sizeof(*cmdline), f);
         fclose(f);
-        if (res == nullptr) return(0);
+        if (res == nullptr) return "";
 
         while (*p)
         {
@@ -894,6 +982,7 @@ namespace eCAL
         }
 
         g_process_par = par_s;
+#endif // ECAL_OS_MACOS
       }
       return(g_process_par);
     }
@@ -1274,7 +1363,7 @@ namespace eCAL
             close(fifo_fd);
           }
 
-          delete c_argv;
+          delete[] c_argv;
           STD_COUT_DEBUG("[PID " << getpid() << "]: " << "Process will now exit" << std::endl);
           exit(0);
         }
diff --git a/ecal/core/src/ecal_register.cpp b/ecal/core/src/ecal_register.cpp
index 89f2b94a5c..73dd1773c1 100644
--- a/ecal/core/src/ecal_register.cpp
+++ b/ecal/core/src/ecal_register.cpp
@@ -39,7 +39,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/ecal_register.h b/ecal/core/src/ecal_register.h
index 58f507016b..4616700adc 100644
--- a/ecal/core/src/ecal_register.h
+++ b/ecal/core/src/ecal_register.h
@@ -38,7 +38,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/service.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/ecal_servgate.h b/ecal/core/src/ecal_servgate.h
index fb66f6c70f..b298b6e71d 100644
--- a/ecal/core/src/ecal_servgate.h
+++ b/ecal/core/src/ecal_servgate.h
@@ -28,7 +28,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/ecal_timegate.h b/ecal/core/src/ecal_timegate.h
index e8e8e418b8..01615b6504 100644
--- a/ecal/core/src/ecal_timegate.h
+++ b/ecal/core/src/ecal_timegate.h
@@ -111,12 +111,11 @@ namespace eCAL
       {
       }
 
-#ifdef _WIN32
+#ifdef ECAL_OS_WINDOWS
       HINSTANCE                   module_handle;
-#endif //_WIN32
-#ifdef __linux__
+#else // ECAL_OS_WINDOWS
       void*                       module_handle;
-#endif //__linux__
+#endif // ECAL_OS_WINDOWS
 
       std::string                 module_name;
       etime_initialize            etime_initialize_ptr;
diff --git a/ecal/core/src/io/linux/ecal_memfile_mtx.h b/ecal/core/src/io/linux/ecal_memfile_mtx.h
index 5edadbc06c..559c76eb18 100644
--- a/ecal/core/src/io/linux/ecal_memfile_mtx.h
+++ b/ecal/core/src/io/linux/ecal_memfile_mtx.h
@@ -65,7 +65,10 @@ namespace
     pthread_condattr_t shattr;
     pthread_condattr_init(&shattr);
     pthread_condattr_setpshared(&shattr, PTHREAD_PROCESS_SHARED);
+#ifndef ECAL_OS_MACOS
     pthread_condattr_setclock(&shattr, CLOCK_MONOTONIC);
+#endif // ECAL_OS_MACOS
+
 
     // map them into shared memory
     named_mutex_t* mtx = static_cast<named_mutex_t*>(mmap(nullptr, sizeof(named_mutex_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));
@@ -133,7 +136,11 @@ namespace
         // wait with timeout for unlock signal
         if (ts_)
         {
+#ifndef ECAL_OS_MACOS
           ret = pthread_cond_timedwait(&mtx_->cvar, &mtx_->mtx, ts_);
+#else
+          ret = pthread_cond_timedwait_relative_np(&mtx_->cvar, &mtx_->mtx, ts_);
+#endif
         }
         // blocking wait for unlock signal
         else
diff --git a/ecal/core/src/io/rcv_sample.h b/ecal/core/src/io/rcv_sample.h
index 10225ed783..09012f6398 100644
--- a/ecal/core/src/io/rcv_sample.h
+++ b/ecal/core/src/io/rcv_sample.h
@@ -35,7 +35,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/io/snd_raw_buffer.cpp b/ecal/core/src/io/snd_raw_buffer.cpp
index 1dba3f1713..f62b2528cf 100644
--- a/ecal/core/src/io/snd_raw_buffer.cpp
+++ b/ecal/core/src/io/snd_raw_buffer.cpp
@@ -50,7 +50,11 @@ namespace eCAL
   size_t CreateSampleBuffer(const std::string& sample_name_, const eCAL::pb::Sample& ecal_sample_, std::vector<char>& payload_)
   {
     unsigned short sample_name_size = (unsigned short)sample_name_.size() + 1;
+#if GOOGLE_PROTOBUF_VERSION >= 3001000
+    size_t         sample_size = ecal_sample_.ByteSizeLong();
+#else
     size_t         sample_size = ecal_sample_.ByteSize();
+#endif
     size_t         data_size = sizeof(sample_name_size) + sample_name_size + sample_size;
 
     // create payload buffer with reserved space for first message head
diff --git a/ecal/core/src/io/snd_raw_buffer.h b/ecal/core/src/io/snd_raw_buffer.h
index 2483c96827..c7f7e891d4 100644
--- a/ecal/core/src/io/snd_raw_buffer.h
+++ b/ecal/core/src/io/snd_raw_buffer.h
@@ -26,7 +26,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/io/snd_sample.h b/ecal/core/src/io/snd_sample.h
index 4bcc5d8485..6b87b3405c 100644
--- a/ecal/core/src/io/snd_sample.h
+++ b/ecal/core/src/io/snd_sample.h
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/mon/ecal_monitoring_def.h b/ecal/core/src/mon/ecal_monitoring_def.h
index c57fe97330..878726bd95 100644
--- a/ecal/core/src/mon/ecal_monitoring_def.h
+++ b/ecal/core/src/mon/ecal_monitoring_def.h
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #include "ecal/pb/monitoring.pb.h"
diff --git a/ecal/core/src/mon/ecal_monitoring_threads.h b/ecal/core/src/mon/ecal_monitoring_threads.h
index 253d818070..62b9f3f0c0 100644
--- a/ecal/core/src/mon/ecal_monitoring_threads.h
+++ b/ecal/core/src/mon/ecal_monitoring_threads.h
@@ -31,7 +31,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp b/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp
index 0b73d23e75..b0e4229623 100644
--- a/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp
+++ b/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp
@@ -23,27 +23,28 @@
 
 #include <ecal/ecal_os.h>
 #include <ecal/msg/protobuf/dynamic_json_subscriber.h>
+#include <ecal/msg/protobuf/dynamic_subscriber.h>
 
 #include <stdio.h>
 #include <iostream>
 #include <sstream>
 #include <fstream>
 
-#ifdef ECAL_OS_WINDOWS
+#ifdef _MSVC_VER
 #pragma warning(push)
-#pragma warning(disable: 4100 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
-#ifdef ECAL_OS_LINUX
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/type_resolver_util.h>
 #include <google/protobuf/util/type_resolver.h>
-#ifdef ECAL_OS_WINDOWS
+#ifdef _MSVC_VER
 #pragma warning(pop)
 #endif
-#ifdef ECAL_OS_LINUX
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ecal/core/src/readwrite/ecal_reader.h b/ecal/core/src/readwrite/ecal_reader.h
index 656e2e121f..b2740efdb5 100644
--- a/ecal/core/src/readwrite/ecal_reader.h
+++ b/ecal/core/src/readwrite/ecal_reader.h
@@ -28,7 +28,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/readwrite/ecal_reader_layer.h b/ecal/core/src/readwrite/ecal_reader_layer.h
index 1c784bfd4f..3acc33676b 100644
--- a/ecal/core/src/readwrite/ecal_reader_layer.h
+++ b/ecal/core/src/readwrite/ecal_reader_layer.h
@@ -48,6 +48,8 @@ namespace eCAL
   public:
     CReaderLayer() {};
 
+    virtual ~CReaderLayer() {}
+
     virtual void InitializeLayer() = 0;
 
     virtual void StartLayer(std::string& topic_name_, QOS::SReaderQOS qos_) = 0;
diff --git a/ecal/core/src/readwrite/ecal_writer_inproc.h b/ecal/core/src/readwrite/ecal_writer_inproc.h
index ddd7ed2da3..2af2e62fa0 100644
--- a/ecal/core/src/readwrite/ecal_writer_inproc.h
+++ b/ecal/core/src/readwrite/ecal_writer_inproc.h
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/readwrite/ecal_writer_shm.h b/ecal/core/src/readwrite/ecal_writer_shm.h
index cabf8844c0..e3aaeae64d 100644
--- a/ecal/core/src/readwrite/ecal_writer_shm.h
+++ b/ecal/core/src/readwrite/ecal_writer_shm.h
@@ -56,7 +56,7 @@ namespace eCAL
     bool AddLocConnection(const std::string& process_id_, const std::string& conn_par_) override;
     bool RemLocConnection(const std::string& process_id_) override;
 
-    std::string GetConectionPar();
+    std::string GetConectionPar() override;
 
   protected:
     void SignalMemFileWritten();
diff --git a/ecal/core/src/readwrite/ecal_writer_udp_mc.h b/ecal/core/src/readwrite/ecal_writer_udp_mc.h
index 88c36e3370..450a5fcd7e 100644
--- a/ecal/core/src/readwrite/ecal_writer_udp_mc.h
+++ b/ecal/core/src/readwrite/ecal_writer_udp_mc.h
@@ -27,7 +27,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/core/src/service/ecal_service_server_impl.cpp b/ecal/core/src/service/ecal_service_server_impl.cpp
index 70db08feaa..89bd8fd8f6 100644
--- a/ecal/core/src/service/ecal_service_server_impl.cpp
+++ b/ecal/core/src/service/ecal_service_server_impl.cpp
@@ -28,7 +28,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #include "ecal/pb/service.pb.h"
diff --git a/ecal/core/src/service/ecal_service_server_impl.h b/ecal/core/src/service/ecal_service_server_impl.h
index 5f84c0abc7..af988df0cf 100644
--- a/ecal/core/src/service/ecal_service_server_impl.h
+++ b/ecal/core/src/service/ecal_service_server_impl.h
@@ -28,7 +28,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/service.pb.h"
 #ifdef _MSC_VER
diff --git a/ecal/pb/src/CMakeLists.txt b/ecal/pb/CMakeLists.txt
similarity index 59%
rename from ecal/pb/src/CMakeLists.txt
rename to ecal/pb/CMakeLists.txt
index f62df76d7d..10058afcd9 100644
--- a/ecal/pb/src/CMakeLists.txt
+++ b/ecal/pb/CMakeLists.txt
@@ -21,24 +21,24 @@ project(pb)
 find_package(Protobuf REQUIRED)
 
 set(ProtoFiles
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/ecal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/host.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/monitoring.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/play/service.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/play/state.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/process.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/rec/control.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/rec/service.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/rec/state.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/service.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/sim_time.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/ecal/pb/topic.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/ecal.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/host.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/monitoring.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/play/service.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/play/state.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/process.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/rec/control.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/rec/service.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/rec/state.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/service.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/sim_time.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ecal/pb/topic.proto
 )
 
-ecal_add_static_library(${PROJECT_NAME} ecalpb.cpp)
+ecal_add_static_library(${PROJECT_NAME} src/ecalpb.cpp)
 add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-protobuf_target_cpp(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} INSTALL_FOLDER include ${ProtoFiles})
+protobuf_target_cpp(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src INSTALL_FOLDER include ${ProtoFiles})
 
 target_compile_options(${PROJECT_NAME}
   PRIVATE
diff --git a/gfx/configuration/npcap_ecalmon.png b/gfx/configuration/npcap_ecalmon.png
new file mode 100644
index 0000000000..48676c0e12
Binary files /dev/null and b/gfx/configuration/npcap_ecalmon.png differ
diff --git a/gfx/configuration/npcap_installer.png b/gfx/configuration/npcap_installer.png
new file mode 100644
index 0000000000..c8b9f73791
Binary files /dev/null and b/gfx/configuration/npcap_installer.png differ
diff --git a/gfx/configuration/npcap_settings.png b/gfx/configuration/npcap_settings.png
new file mode 100644
index 0000000000..93646312ea
Binary files /dev/null and b/gfx/configuration/npcap_settings.png differ
diff --git a/lang/csharp/Continental/eCAL/Core/CMakeLists.txt b/lang/csharp/Continental/eCAL/Core/CMakeLists.txt
index 2e1f256c31..15782e0d04 100644
--- a/lang/csharp/Continental/eCAL/Core/CMakeLists.txt
+++ b/lang/csharp/Continental/eCAL/Core/CMakeLists.txt
@@ -19,26 +19,27 @@
 project(Continental.eCAL.Core)
 
 set(ecal_clr_src
-  AssemblyInfo.cpp
-  ecal_clr.h
-  ecal_clr.cpp
+    AssemblyInfo.cpp
+    ecal_clr.h
+    ecal_clr.cpp
 ) 
 
 add_library(${PROJECT_NAME} SHARED ${ecal_clr_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE  .)
+target_include_directories(${PROJECT_NAME} PRIVATE .)
 target_link_libraries(${PROJECT_NAME} PRIVATE eCAL::core)
 set_target_properties(${PROJECT_NAME} PROPERTIES
-  COMMON_LANGUAGE_RUNTIME ""
+    COMMON_LANGUAGE_RUNTIME ""
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 install(TARGETS ${PROJECT_NAME}
-  # IMPORTANT: Add the library to the "export-set"
-  EXPORT eCALTargets
-  RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT sdk
-  PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/ecal" COMPONENT sdk)
+    # IMPORTANT: Add the library to the "export-set"
+    EXPORT eCALTargets
+    RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT sdk
+    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/ecal" COMPONENT sdk
+)
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lang/csharp)
diff --git a/lang/csharp/Continental/eCAL/Core/ecal_clr.cpp b/lang/csharp/Continental/eCAL/Core/ecal_clr.cpp
index 822e778d22..b36bd965c8 100644
--- a/lang/csharp/Continental/eCAL/Core/ecal_clr.cpp
+++ b/lang/csharp/Continental/eCAL/Core/ecal_clr.cpp
@@ -300,7 +300,7 @@ System::String^ Subscriber::Dump()
 
 void Subscriber::OnReceive(const char* topic_name_, const ::eCAL::SReceiveCallbackData* data_)
 {
-  std::string received_bytes = std::string(static_cast<const char*>(data_->buf), data_->size);
+  std::string received_bytes = std::string(static_cast<const char*>(data_->buf), static_cast<size_t>(data_->size));
   ReceiveCallbackData^ data = gcnew ReceiveCallbackData();
   data->data    = StlStringToString(received_bytes);
   data->id      = data_->id;
@@ -311,6 +311,90 @@ void Subscriber::OnReceive(const char* topic_name_, const ::eCAL::SReceiveCallba
 }
 
 
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// JSONProtobufSubscriber
+/////////////////////////////////////////////////////////////////////////////
+JSONProtobufSubscriber::JSONProtobufSubscriber() : m_sub(new ::eCAL::protobuf::CDynamicJSONSubscriber())
+{
+}
+
+JSONProtobufSubscriber::JSONProtobufSubscriber(System::String^ topic_name_)
+{
+  m_sub = new ::eCAL::protobuf::CDynamicJSONSubscriber(StringToStlString(topic_name_));
+}
+
+JSONProtobufSubscriber::~JSONProtobufSubscriber()
+{
+  if(m_sub == nullptr) return;
+  delete m_sub;
+}
+
+void JSONProtobufSubscriber::Create(System::String^ topic_name_)
+{
+  if(m_sub == nullptr) return;
+  m_sub->Create(StringToStlString(topic_name_));
+}
+
+void JSONProtobufSubscriber::Destroy()
+{
+  if(m_sub == nullptr) return;
+  m_sub->Destroy();
+}
+
+
+bool JSONProtobufSubscriber::AddReceiveCallback(ReceiverCallback^ callback_)
+{
+  if(m_sub == nullptr) return(false);
+
+  if (m_callbacks == nullptr)
+  {
+    m_sub_callback = gcnew subCallback(this, &JSONProtobufSubscriber::OnReceive);
+    m_gch = GCHandle::Alloc(m_sub_callback);
+    IntPtr ip = Marshal::GetFunctionPointerForDelegate(m_sub_callback);
+    m_sub->AddReceiveCallback(static_cast<stdcall_eCAL_ReceiveCallbackT>(ip.ToPointer()));
+  }
+  m_callbacks += callback_;
+  return(true);
+}
+
+bool JSONProtobufSubscriber::RemReceiveCallback(ReceiverCallback^ callback_)
+{
+  if(m_sub == nullptr) return(false);
+
+  if (m_callbacks == callback_)
+  {
+    m_sub->RemReceiveCallback();
+    m_gch.Free();
+  }
+  m_callbacks -= callback_;
+
+  return(false);
+}
+
+bool JSONProtobufSubscriber::IsCreated()
+{
+  if(m_sub == nullptr) return(false);
+  return(m_sub->IsCreated());
+}
+
+void JSONProtobufSubscriber::OnReceive(const char* topic_name_, const ::eCAL::SReceiveCallbackData* data_)
+{
+  std::string received_bytes = std::string(static_cast<const char*>(data_->buf), static_cast<size_t>(data_->size));
+  ReceiveCallbackData^ data = gcnew ReceiveCallbackData();
+  data->data    = StlStringToString(received_bytes);
+  data->id      = data_->id;
+  data->time    = data_->time;
+  data->clock   = data_->clock;
+  std::string topic_name = std::string(topic_name_);
+  m_callbacks(StlStringToString(topic_name), data);
+}
+
+
+
+
 /////////////////////////////////////////////////////////////////////////////
 // Monitoring
 /////////////////////////////////////////////////////////////////////////////
diff --git a/lang/csharp/Continental/eCAL/Core/ecal_clr.h b/lang/csharp/Continental/eCAL/Core/ecal_clr.h
index 1a40df30df..0dc95ffad0 100644
--- a/lang/csharp/Continental/eCAL/Core/ecal_clr.h
+++ b/lang/csharp/Continental/eCAL/Core/ecal_clr.h
@@ -24,6 +24,7 @@
 
 #pragma once
 #include <ecal/ecal.h>
+#include <ecal/msg/protobuf/dynamic_json_subscriber.h>
 
 using namespace System;
 using namespace System::Runtime::InteropServices;
@@ -363,6 +364,114 @@ namespace Continental
         typedef void(__stdcall * stdcall_eCAL_ReceiveCallbackT)(const char*, const ::eCAL::SReceiveCallbackData*);
       };
 
+      /**
+       * @brief eCAL protobuf json subscriber class.
+       *
+       * The CSubscriber class is used to receive topics from matching eCAL publishers.
+       *
+      **/
+      public ref class JSONProtobufSubscriber
+      {
+      public:
+        /**
+         * @brief Constructor.
+        **/
+        JSONProtobufSubscriber();
+
+        /**
+         * @brief Constructor.
+         *
+         * @param topic_name_   Unique topic name.
+        **/
+        JSONProtobufSubscriber(System::String^ topic_name_);
+
+        /**
+         * @brief Destructor.
+        **/
+        ~JSONProtobufSubscriber();
+
+        /**
+         * @brief structure which contains the data for callback functions
+        **/
+        ref struct ReceiveCallbackData
+        {
+          System::String^ data;  /*!< Message payload     */
+          long long id;          /*!< Message id          */
+          long long time;        /*!< Message time stamp  */
+          long long clock;       /*!< Message write clock */
+        };
+
+        /**
+         * @brief delegate definition for callback functions
+        **/
+        delegate void ReceiverCallback(String^ str, ReceiveCallbackData^ data);
+
+        /**
+         * @brief Creates this object.
+         *
+         * @param topic_name_   Unique topic name.
+        **/
+        void Create(System::String^ topic_name_);
+
+        /**
+         * @brief Destroys this object.
+        **/
+        void Destroy();
+
+
+        /**
+         * @brief Add callback function for incoming receives.
+         *
+         * @param callback_  The callback function set to connect.
+         *
+         * @return  True if succeeded, false if not.
+        **/
+        bool AddReceiveCallback(ReceiverCallback^ callback_);
+
+        /**
+         * @brief Remove callback function for incoming receives.
+         *
+         * @param callback_  The callback function set to disconnect.
+         *
+         * @return  True if succeeded, false if not.
+        **/
+        bool RemReceiveCallback(ReceiverCallback^ callback_);
+
+        /**
+         * @brief Query if this object is created.
+         *
+         * @return  true if created, false if not.
+        **/
+        bool IsCreated();
+
+      private:
+        ::eCAL::protobuf::CDynamicJSONSubscriber* m_sub;
+        /**
+         * @brief managed callbacks that will get executed on during the eCAL topic callback
+        **/
+        ReceiverCallback^ m_callbacks;
+
+        /**
+         * @brief private member which holds the the pointer to OnReceive, to avoid function relocation
+        **/
+        GCHandle m_gch;
+
+        /**
+         * @brief The callback of the subscriber, that is registered with the unmanaged code
+        **/
+        delegate void subCallback(const char* topic_name_, const ::eCAL::SReceiveCallbackData* data_);
+        subCallback^ m_sub_callback;
+        void OnReceive(const char* topic_name_, const ::eCAL::SReceiveCallbackData* data_);
+
+        /**
+         * @brief stdcall function pointer definition of eCAL::ReceiveCallbackT
+        **/
+        typedef void(__stdcall * stdcall_eCAL_ReceiveCallbackT)(const char*, const ::eCAL::SReceiveCallbackData*);
+      };
+
+
+
+
 
       /**
        * @brief eCAL monitoring class.
diff --git a/lang/csharp/Continental/eCAL/Protobuf/CMakeLists.txt b/lang/csharp/Continental/eCAL/Protobuf/CMakeLists.txt
index c9c0b77631..34729b6192 100644
--- a/lang/csharp/Continental/eCAL/Protobuf/CMakeLists.txt
+++ b/lang/csharp/Continental/eCAL/Protobuf/CMakeLists.txt
@@ -30,11 +30,40 @@ add_library(${PROJECT_NAME} SHARED ${core_cs_src})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC Continental.eCAL.Core)
 
+# version of the nuget Google.Protobuf package
+set(google_protobuf_version 3.11.4)
+
+# find nuget (install the latest CLI here: https://www.nuget.org/downloads).
+find_program(NUGET nuget HINTS $ENV{NUGET_DIR})
+if(NOT NUGET)
+  message(FATAL_ERROR "CMake could not find the nuget command line tool. Please install it! (https://www.nuget.org/downloads)")
+else()
+  message(STATUS "Found nuget in ${NUGET}")
+  # install google protobuf nuget package
+  add_custom_command(TARGET ${PROJECT_NAME}
+    PRE_BUILD
+    COMMAND ${NUGET} install Google.Protobuf -Version ${google_protobuf_version}
+  )
+endif()
+
+set(nuget_package_path
+  "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}"
+)
+set(nuget_package_google
+  "${nuget_package_path}/Google.Protobuf.${google_protobuf_version}/lib/net45/Google.Protobuf.dll"
+)
 set_target_properties(${PROJECT_NAME} PROPERTIES
   VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System.Buffers;System.Memory;System.Runtime.CompilerServices.Unsafe;Google.Protobuf"
+  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+  VS_DOTNET_REFERENCE_Google.Protobuf ${nuget_package_google}
+)
+
+install(TARGETS ${PROJECT_NAME}
+    # IMPORTANT: Add the library to the "export-set"
+    EXPORT eCALTargets
+    RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT sdk
+    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/ecal" COMPONENT sdk
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lang/csharp)
diff --git a/lang/csharp/Continental/eCAL/Protobuf/packages.config.in b/lang/csharp/Continental/eCAL/Protobuf/packages.config.in
index c04349cc02..debc1b605d 100644
--- a/lang/csharp/Continental/eCAL/Protobuf/packages.config.in
+++ b/lang/csharp/Continental/eCAL/Protobuf/packages.config.in
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Google.Protobuf" version="3.5.1" targetFramework="net45" />
+  <package id="Google.Protobuf" version="3.11.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/lang/python/core/src/ecal_wrap.cxx b/lang/python/core/src/ecal_wrap.cxx
index f650e0e175..3a0d5851ed 100644
--- a/lang/python/core/src/ecal_wrap.cxx
+++ b/lang/python/core/src/ecal_wrap.cxx
@@ -33,7 +33,14 @@
 #include "Python.h"
 #include "modsupport.h"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
+#endif
 #include "ecal/pb/monitoring.pb.h"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 
 /****************************************/
diff --git a/lib/CustomQt/CMakeLists.txt b/lib/CustomQt/CMakeLists.txt
index 68b6a09c71..a07ffb9a9a 100644
--- a/lib/CustomQt/CMakeLists.txt
+++ b/lib/CustomQt/CMakeLists.txt
@@ -97,4 +97,4 @@ if(MSVC)
   )
 endif()
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib/CustomQt)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib)
diff --git a/lib/CustomQt/include/CustomQt/QAdvancedTreeView.h b/lib/CustomQt/include/CustomQt/QAdvancedTreeView.h
index 2cb0b83c42..74ad0281a6 100644
--- a/lib/CustomQt/include/CustomQt/QAdvancedTreeView.h
+++ b/lib/CustomQt/include/CustomQt/QAdvancedTreeView.h
@@ -86,7 +86,7 @@ class QAdvancedTreeView : public QTreeView
    */
   bool isForced(int column);
 
-  void setModel(QAbstractItemModel *model); // Not virtual, but needs to be overridden
+  void setModel(QAbstractItemModel *model) override; // Not virtual, but needs to be overridden
 
   /**
    * @brief Sets the maximum depth that the tree view will expand a node to, if children are added
@@ -155,8 +155,10 @@ class QAdvancedTreeView : public QTreeView
    */
   bool restoreState(const QByteArray& state, int32_t version = 0);
 
+  QStyleOptionViewItem viewOptions() const override;
+
 protected:
-  void keyPressEvent(QKeyEvent* key_event);
+  void keyPressEvent(QKeyEvent* key_event) override;
 
 signals:
   void keySequenceDeletePressed();
diff --git a/lib/CustomQt/include/CustomQt/QCheckboxHeaderView.h b/lib/CustomQt/include/CustomQt/QCheckboxHeaderView.h
index 71098937f7..56cd7d1bd7 100644
--- a/lib/CustomQt/include/CustomQt/QCheckboxHeaderView.h
+++ b/lib/CustomQt/include/CustomQt/QCheckboxHeaderView.h
@@ -52,8 +52,6 @@ class QCheckboxHeaderView : public QHeaderView
   void mousePressEvent(QMouseEvent *event);
 
 private:
-  bool isOn = true;
-
   std::map<int, std::tuple<bool, bool, Qt::CheckState>> checkbox_data_;         /** (checkable, enabled, state) */
   QSize default_checkbox_size;
 };
diff --git a/lib/CustomQt/include/CustomQt/QGroupByProxyModel.h b/lib/CustomQt/include/CustomQt/QGroupByProxyModel.h
deleted file mode 100644
index 2539c99a8a..0000000000
--- a/lib/CustomQt/include/CustomQt/QGroupByProxyModel.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ========================= eCAL LICENSE =================================
- *
- * Copyright (C) 2016 - 2019 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= eCAL LICENSE =================================
-*/
-
-#pragma once
-
-#include <QObject>
-#include <QAbstractProxyModel>
-
-#include <QMap>
-#include <QVariant>
-#include <QModelIndex>
-
-class QGroupByProxyModel : public QAbstractProxyModel
-{
-  Q_OBJECT
-
-public:
-  QGroupByProxyModel(QObject* parent = NULL);
-  ~QGroupByProxyModel();
-
-  void setGroupRole(int role);
-
-  int groupRole() const;
-
-  void setSourceModel(QAbstractItemModel *model);
-
-  void setGroupBy(int column);
-  QString whichGroup(int row) const;
-
-  QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex parent(const QModelIndex &index) const;
-  QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
-  QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
-  QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const;
-  QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
-  int columnCount(const QModelIndex &parent = QModelIndex()) const;
-  int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-  QString groupFromValue(QString header_string, QString value_string) const;
-
-  void setGroups();
-  void clearGroups();
-
-private:
-  int group_role_;
-
-  //TODO: make more generic
-  int group_by_column_ = 1;
-
-  QList<QString> groups_;
-  QList<QModelIndex> group_indices_;
-  QMap<QString, QVector<int>*> group_row_to_source_row_;
-  QVector<int> source_row_to_group_row_;
-};
diff --git a/lib/CustomQt/src/QAdvancedTreeView.cpp b/lib/CustomQt/src/QAdvancedTreeView.cpp
index 6a582c4b69..950b94594b 100644
--- a/lib/CustomQt/src/QAdvancedTreeView.cpp
+++ b/lib/CustomQt/src/QAdvancedTreeView.cpp
@@ -238,6 +238,12 @@ bool QAdvancedTreeView::restoreState(const QByteArray& state, int32_t version)
   int32_t column_count;
   state_stream >> column_count;
 
+  // Abort when the state binary aparently does not describe the column count of the current treeview
+  if (column_count != model()->columnCount())
+  {
+    return false;
+  }
+
   // Measure how many bytes a ColumnState actually occupies in a QByteArray. This is most likely NOT the same as sizeof(ColumnState)
   QByteArray temp_array;
   QDataStream temp_stream(&temp_array, QIODevice::WriteOnly);
@@ -245,6 +251,7 @@ bool QAdvancedTreeView::restoreState(const QByteArray& state, int32_t version)
   temp_stream << temp_state;
   int size_of_column_state = temp_array.size();
 
+  // Abort when the state binary data contains too few / too much elements to describe all columns
   if (state.size() != (2 * (int)sizeof(int32_t) + (column_count * size_of_column_state)))
   {
     return false;
@@ -274,3 +281,8 @@ bool QAdvancedTreeView::restoreState(const QByteArray& state, int32_t version)
 
   return true;
 }
+
+QStyleOptionViewItem QAdvancedTreeView::viewOptions() const
+{
+  return QTreeView::viewOptions();
+}
\ No newline at end of file
diff --git a/lib/EcalParser/CMakeLists.txt b/lib/EcalParser/CMakeLists.txt
index fcd1f1b000..e986ddea2b 100644
--- a/lib/EcalParser/CMakeLists.txt
+++ b/lib/EcalParser/CMakeLists.txt
@@ -52,7 +52,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE src/)
 
 target_link_libraries (${PROJECT_NAME}
     PRIVATE
-    EcalUtils
+    eCAL::utils
 )
 
 if(WIN32)
@@ -66,4 +66,4 @@ if(MSVC)
 endif()
 
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib/EcalUtils)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib)
diff --git a/lib/EcalParser/src/EcalParser.cpp b/lib/EcalParser/src/EcalParser.cpp
index a7ff35db31..1c2a2afbdc 100644
--- a/lib/EcalParser/src/EcalParser.cpp
+++ b/lib/EcalParser/src/EcalParser.cpp
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <list>
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 #include "functions/env.h"
 #include "functions/hostname.h"
diff --git a/lib/EcalParser/src/functions/env.cpp b/lib/EcalParser/src/functions/env.cpp
index 55bea40455..781514d7f2 100644
--- a/lib/EcalParser/src/functions/env.cpp
+++ b/lib/EcalParser/src/functions/env.cpp
@@ -19,7 +19,7 @@
 
 #include "env.h"
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 namespace EcalParser
 {
diff --git a/lib/EcalParser/src/functions/hostname.cpp b/lib/EcalParser/src/functions/hostname.cpp
index 3fa3593401..9598b134ce 100644
--- a/lib/EcalParser/src/functions/hostname.cpp
+++ b/lib/EcalParser/src/functions/hostname.cpp
@@ -24,9 +24,9 @@
 #define NOMINMAX
 #include <Windows.h>
 #include <WinSock2.h>
-#elif __linux__
+#else // WIN32
 #include <unistd.h>
-#endif
+#endif // WIN32
 
 namespace EcalParser
 {
diff --git a/lib/EcalParser/src/functions/os.cpp b/lib/EcalParser/src/functions/os.cpp
index 2d371ef17c..2a88f70fc1 100644
--- a/lib/EcalParser/src/functions/os.cpp
+++ b/lib/EcalParser/src/functions/os.cpp
@@ -19,7 +19,7 @@
 
 #include "os.h"
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 namespace EcalParser
 {
diff --git a/lib/EcalParser/src/functions/osselect.cpp b/lib/EcalParser/src/functions/osselect.cpp
index 1b6cbe98d4..c259f35bf3 100644
--- a/lib/EcalParser/src/functions/osselect.cpp
+++ b/lib/EcalParser/src/functions/osselect.cpp
@@ -20,7 +20,7 @@
 #include "osselect.h"
 
 #include <vector>
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 namespace EcalParser
 {
diff --git a/lib/EcalParser/src/functions/time.cpp b/lib/EcalParser/src/functions/time.cpp
index 03ba92c660..03cd20b2a2 100644
--- a/lib/EcalParser/src/functions/time.cpp
+++ b/lib/EcalParser/src/functions/time.cpp
@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include <EcalUtils/String.h>
+#include <ecal_utils/string.h>
 
 namespace EcalParser
 {
diff --git a/lib/QEcalParser/CMakeLists.txt b/lib/QEcalParser/CMakeLists.txt
index 641ef58833..0635075433 100644
--- a/lib/QEcalParser/CMakeLists.txt
+++ b/lib/QEcalParser/CMakeLists.txt
@@ -108,4 +108,4 @@ if(MSVC)
   )
 endif()
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib/EcalUtils)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib)
diff --git a/lib/QEcalParser/include/QEcalParser/ecal_parser_lineedit/ecal_parser_lineedit.h b/lib/QEcalParser/include/QEcalParser/ecal_parser_lineedit/ecal_parser_lineedit.h
index 336805f868..264b27ad25 100644
--- a/lib/QEcalParser/include/QEcalParser/ecal_parser_lineedit/ecal_parser_lineedit.h
+++ b/lib/QEcalParser/include/QEcalParser/ecal_parser_lineedit/ecal_parser_lineedit.h
@@ -39,5 +39,5 @@ private slots:
 
 
 private:
-  QAction* open_dialog_action;
+  QAction* open_dialog_action_;
 };
diff --git a/lib/QEcalParser/include/QEcalParser/ecal_parser_textedit/ecal_parser_textedit.h b/lib/QEcalParser/include/QEcalParser/ecal_parser_textedit/ecal_parser_textedit.h
index 221537fcfb..73e75100f9 100644
--- a/lib/QEcalParser/include/QEcalParser/ecal_parser_textedit/ecal_parser_textedit.h
+++ b/lib/QEcalParser/include/QEcalParser/ecal_parser_textedit/ecal_parser_textedit.h
@@ -21,6 +21,8 @@
 
 #include <QTextEdit>
 
+class QToolButton;
+
 class QEcalParserTextEdit : public QTextEdit
 {
   Q_OBJECT
@@ -32,12 +34,15 @@ class QEcalParserTextEdit : public QTextEdit
   ~QEcalParserTextEdit();
 
 protected:
-  void contextMenuEvent(QContextMenuEvent *event) override;
+  void contextMenuEvent(QContextMenuEvent* event) override;
+  void resizeEvent(QResizeEvent* event) override;
+  void showEvent(QShowEvent *event) override;
 
 private slots:
   void openDialog();
-
+  void moveOverlayButton();
 
 private:
-  QAction* open_dialog_action;
+  QAction* open_dialog_action_;
+  QToolButton* overlay_button_;
 };
diff --git a/lib/QEcalParser/resources/qecalparser.docx b/lib/QEcalParser/resources/qecalparser.docx
deleted file mode 100644
index 23629ee8c0..0000000000
Binary files a/lib/QEcalParser/resources/qecalparser.docx and /dev/null differ
diff --git a/lib/QEcalParser/resources/show_dialog.svg b/lib/QEcalParser/resources/show_dialog.svg
index cd49d87840..34ffab0cfe 100644
--- a/lib/QEcalParser/resources/show_dialog.svg
+++ b/lib/QEcalParser/resources/show_dialog.svg
@@ -7,317 +7,24 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="512"
    height="512"
-   viewBox="0 0 135.46666 135.46667"
+   viewBox="0 0 135.46666 135.46666"
    version="1.1"
    id="svg8"
    sodipodi:docname="show_dialog.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
   <defs
      id="defs2">
     <clipPath
-       id="clipPath4534"
+       id="clipEmfPath1"
        clipPathUnits="userSpaceOnUse">
       <path
-         style="clip-rule:evenodd"
          inkscape:connector-curvature="0"
-         id="path4532"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4542"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path4540"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4554"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path4552"
-         d="M -2.995e-6,1.2207e-4 H 595.32 V 841.92012 H -2.995e-6 Z" />
-    </clipPath>
-    <mask
-       id="mask4558"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       maskUnits="userSpaceOnUse">
-      <image
-         id="image4560"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJ8AAAFgCAAAAACAw/REAAAAAXNCSVQI5gpbmQAAAE1JREFUeJztwTEBAAAAwqD1T20JT6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgZ9wAAAFQJa7kAAAAAElFTkSuQmCC"
-         preserveAspectRatio="none"
-         style="image-rendering:optimizeSpeed"
-         height="1"
-         width="1" />
-    </mask>
-    <clipPath
-       id="clipPath4570"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path4568"
-         d="m 130.32,608.28 h 57.48 v 127.2 h -57.48 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4582"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path4580"
-         d="m 130.32,608.28 h 57.48 v 127.2 h -57.48 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath856"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path854"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath864"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path862"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath876"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path874"
-         d="M -2.995e-6,1.2207e-4 H 595.32 V 841.92012 H -2.995e-6 Z" />
-    </clipPath>
-    <mask
-       id="mask880"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       maskUnits="userSpaceOnUse">
-      <image
-         id="image882"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJgAAAFhCAAAAACpQzyYAAAAAXNCSVQI5gpbmQAAAEtJREFUeJztwTEBAAAAwqD1T20KP6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuBjS+QABQy4V9AAAAABJRU5ErkJggg=="
-         preserveAspectRatio="none"
-         style="image-rendering:optimizeSpeed"
-         height="1"
-         width="1" />
-    </mask>
-    <clipPath
-       id="clipPath892"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path890"
-         d="M 130.32,615.12 H 185.4 V 742.56 H 130.32 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath904"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path902"
-         d="M 130.32,615.12 H 185.4 V 742.56 H 130.32 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath977"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path975"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath985"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path983"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath997"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path995"
-         d="M -2.995e-6,1.2207e-4 H 595.32 V 841.92012 H -2.995e-6 Z" />
-    </clipPath>
-    <mask
-       id="mask1001"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       maskUnits="userSpaceOnUse">
-      <image
-         id="image1003"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALcAAAF1CAAAAACPUiRIAAAAAXNCSVQI5gpbmQAAAFdJREFUeJztwQEBAAAAgJD+r+4ICgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGoMJwABDZWJPQAAAABJRU5ErkJggg=="
-         preserveAspectRatio="none"
-         style="image-rendering:optimizeSpeed"
-         height="1"
-         width="1" />
-    </mask>
-    <clipPath
-       id="clipPath1013"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1011"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1025"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1023"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1092"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1090"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1100"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1098"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1112"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1110"
-         d="M -2.995e-6,1.2207e-4 H 595.32 V 841.92012 H -2.995e-6 Z" />
-    </clipPath>
-    <mask
-       id="mask1116"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       maskUnits="userSpaceOnUse">
-      <image
-         id="image1118"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALcAAAF1CAAAAACPUiRIAAAAAXNCSVQI5gpbmQAAAFdJREFUeJztwQEBAAAAgJD+r+4ICgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGoMJwABDZWJPQAAAABJRU5ErkJggg=="
-         preserveAspectRatio="none"
-         style="image-rendering:optimizeSpeed"
-         height="1"
-         width="1" />
-    </mask>
-    <clipPath
-       id="clipPath1128"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1126"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1140"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1138"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1190"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1188"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1198"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1196"
-         d="M 8.871e-6,0 H 595.32001 V 841.92 H 8.871e-6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1210"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1208"
-         d="M -2.995e-6,1.2207e-4 H 595.32 V 841.92012 H -2.995e-6 Z" />
-    </clipPath>
-    <mask
-       id="mask1214"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       maskUnits="userSpaceOnUse">
-      <image
-         id="image1216"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALcAAAF1CAAAAACPUiRIAAAAAXNCSVQI5gpbmQAAAFdJREFUeJztwQEBAAAAgJD+r+4ICgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGoMJwABDZWJPQAAAABJRU5ErkJggg=="
-         preserveAspectRatio="none"
-         style="image-rendering:optimizeSpeed"
-         height="1"
-         width="1" />
-    </mask>
-    <clipPath
-       id="clipPath1226"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1224"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath1238"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path1236"
-         d="m 120.6,615.24 h 66.12 V 749.76 H 120.6 Z" />
+         id="path5723"
+         d="M -89.199339,-108.0792 H 704.55478 V 1014.4725 H -89.199339" />
     </clipPath>
   </defs>
   <sodipodi:namedview
@@ -327,18 +34,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.90509668"
-     inkscape:cx="457.05677"
-     inkscape:cy="362.82016"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="72.640091"
+     inkscape:cy="423.33858"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
+     units="px"
      inkscape:window-width="1920"
      inkscape:window-height="1137"
-     inkscape:window-x="1912"
+     inkscape:window-x="1272"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     units="px" />
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -347,7 +62,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -355,97 +70,32 @@
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-161.53332)">
-    <g
-       id="g850"
-       transform="matrix(0.95210651,0,0,-0.95399061,-87.830873,876.71146)">
-      <g
-         id="g852"
-         clip-path="url(#clipPath856)" />
-    </g>
-    <g
-       id="g858"
-       transform="matrix(0.95210651,0,0,-0.95399061,-87.830873,876.71146)">
-      <g
-         id="g860"
-         clip-path="url(#clipPath864)" />
-    </g>
-    <g
-       id="g898"
-       transform="matrix(0.95210651,0,0,-0.95399061,-87.830873,876.71146)">
-      <g
-         id="g900"
-         clip-path="url(#clipPath904)" />
-    </g>
-    <g
-       id="g971"
-       transform="matrix(0.95399061,0,0,-0.95399061,-88.138715,876.71146)">
-      <g
-         id="g973"
-         clip-path="url(#clipPath977)" />
-    </g>
-    <g
-       id="g979"
-       transform="matrix(0.95399061,0,0,-0.95399061,-88.138715,876.71146)">
-      <g
-         id="g981"
-         clip-path="url(#clipPath985)" />
-    </g>
-    <g
-       id="g1019"
-       transform="matrix(0.95399061,0,0,-0.95399061,-88.138715,876.71146)">
-      <g
-         id="g1021"
-         clip-path="url(#clipPath1025)" />
-    </g>
-    <g
-       id="g1184"
-       transform="matrix(0.95210651,0,0,-0.95210651,-87.830873,875.43278)">
-      <g
-         id="g1186"
-         clip-path="url(#clipPath1190)" />
-    </g>
-    <g
-       id="g1192"
-       transform="matrix(0.95210651,0,0,-0.95210651,-87.830873,875.43278)">
-      <g
-         id="g1194"
-         clip-path="url(#clipPath1198)" />
-    </g>
+     transform="translate(0,-161.53336)">
     <path
-       d="m 98.477329,206.13047 34.809011,-34.24727 -8.01673,-8.15004 -34.809018,34.24727 z m 34.228231,-7.61686 2.76111,-36.78939 -36.837004,2.15176 c -3.141952,0.1809 -5.550781,2.88488 -5.369881,6.03636 0.190422,3.15147 2.894404,5.55078 6.036355,5.36988 l 30.31507,-1.77092 -6.02683,-6.13157 -2.26602,30.27699 c -0.23802,3.15147 2.1232,5.89354 5.26515,6.12204 3.15148,0.23803 5.89354,-2.12319 6.12205,-5.26515 z"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95210654"
-       id="path1202"
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 97.366663,165.7667 h 33.866667 v 33.86666"
+       id="path823"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 131.23333,165.7667 97.366663,199.63336"
+       id="path825"
        inkscape:connector-curvature="0" />
     <g
-       id="g1220"
-       transform="matrix(0.95210651,0,0,-0.95210651,-89.947541,876.49112)">
-      <g
-         id="g1222"
-         clip-path="url(#clipPath1226)">
-        <g
-           aria-label="$"
-           transform="matrix(1,0,0,-1,120.62,639.22)"
-           style="font-variant:normal;font-weight:bold;font-size:120.01999664px;font-family:Consolas;-inkscape-font-specification:Consolas-Bold;writing-mode:lr-tb;fill:#0070c0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="text1230">
-          <path
-             d="m 33.345399,-12.365341 q 3.16459,-0.351622 5.391524,-1.172071 2.226933,-0.820449 3.574814,-1.992519 1.406484,-1.230674 2.051123,-2.695762 0.644639,-1.465088 0.644639,-3.16459 0,-3.3404 -2.16833,-5.391523 -2.109727,-2.051123 -6.856611,-3.574814 z m 4.922696,-32.876572 q 3.926435,1.406485 7.852871,3.105986 3.985038,1.640899 7.149628,4.102246 3.223193,2.461348 5.215713,5.977559 1.992519,3.457607 1.992519,8.438906 0,5.684541 -2.226933,9.962597 -2.16833,4.2194532 -6.036162,7.1496289 -3.867832,2.8715722 -9.142148,4.4538671 -5.274316,1.58229489 -11.486289,1.93391597 L 29.418964,14.533671 H 19.104746 L 21.214472,-0.23441406 Q 13.00998,-0.76184568 5.2743163,-2.8715722 V -16.584794 q 4.1608495,1.34788 8.7319237,2.519951 4.629677,1.113466 9.024941,1.582295 l 3.105986,-21.214473 q -3.809228,-1.289277 -7.559853,-2.930175 -3.692021,-1.699502 -6.622197,-4.102246 -2.9301758,-2.461348 -4.7468848,-5.918955 -1.8167089,-3.516211 -1.8167089,-8.438906 0,-4.102246 1.5822949,-7.794268 1.5822948,-3.692021 4.8640918,-6.563593 3.3404,-2.930176 8.438906,-4.805488 5.157109,-1.875313 12.248134,-2.226934 l 1.816709,-11.955117 h 10.314219 l -1.816709,12.482549 q 3.105986,0.293017 6.094765,0.761846 3.047383,0.468828 5.801748,1.113466 v 12.599756 q -3.16459,-0.99626 -6.739404,-1.758106 -3.516211,-0.761845 -6.973818,-1.113466 z m -7.559854,-19.221952 q -5.567334,0.586035 -7.852871,2.754365 -2.226933,2.109726 -2.226933,5.391523 0,2.637158 1.992519,4.453867 1.99252,1.816709 5.801748,3.281797 z"
-             style=""
-             id="path1302" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g1232"
-       transform="matrix(0.95210651,0,0,-0.95210651,-87.830873,875.43278)">
-      <g
-         id="g1234"
-         clip-path="url(#clipPath1238)" />
+       aria-label="$"
+       transform="rotate(4.0772588)"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       id="text829">
+      <path
+         d="m 81.97736,179.46495 h 8.242391 l -1.477946,11.08459 q 2.955892,0.28422 5.911784,0.73897 3.012736,0.45476 5.570721,1.08004 v 8.75399 q -3.126426,-0.79582 -6.309694,-1.36426 -3.183268,-0.56844 -6.252848,-0.85266 l -3.240112,24.32926 q 3.808552,1.47795 7.560261,3.24012 3.751709,1.70532 6.707601,4.09277 3.012732,2.33061 4.831742,5.57072 1.87586,3.24011 1.87586,7.73079 0,4.77491 -1.9327,8.46977 -1.9327,3.69487 -5.400187,6.25285 -3.467488,2.55798 -8.356079,4.03593 -4.88859,1.4211 -10.74353,1.70532 l -1.875854,13.52889 h -8.299235 l 1.875855,-13.52889 q -4.60437,-0.34106 -8.810832,-0.96635 -4.149617,-0.68213 -7.219197,-1.47794 v -9.43612 q 3.581176,1.25057 7.787638,2.04639 4.263305,0.79581 9.436116,1.08003 l 3.3538,-25.57983 q -3.694864,-1.4211 -7.276041,-3.06958 -3.581177,-1.64848 -6.42338,-3.92224 -2.78536,-2.33061 -4.547526,-5.45703 -1.762167,-3.12643 -1.762167,-7.44658 0,-3.52433 1.477946,-6.93497 1.477946,-3.46749 4.60437,-6.19601 3.126424,-2.78536 7.901327,-4.54752 4.774902,-1.81901 11.368814,-2.16008 z m -2.557983,19.32698 q -7.105509,0.62529 -10.402466,3.3538 -3.240112,2.67167 -3.240112,6.87814 0,3.92224 2.671672,6.48022 2.728515,2.50114 8.071858,4.60437 z m 0.682129,56.78723 q 7.67395,-0.56844 11.141438,-3.41064 3.524333,-2.84221 3.524333,-7.7308 0,-2.04638 -0.738973,-3.63802 -0.738973,-1.64847 -2.216919,-2.95589 -1.477946,-1.30741 -3.694865,-2.44429 -2.160074,-1.13689 -5.115966,-2.27377 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:116.41666412px;font-family:Consolas;-inkscape-font-specification:Consolas;fill:#0056b8;fill-opacity:1;stroke-width:0.26458332"
+         id="path877" />
     </g>
     <path
-       d="m 60.697743,175.28222 -54.2224662,0.20946 c 0.0019,33.43798 0.151385,81.03378 0.1532892,114.47176 H 121.52783 c 0,-21.54617 0.01,-32.50491 0.01,-54.05108"
-       style="fill:none;stroke:#000000;stroke-width:11.42527771;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       id="path1240"
-       inkscape:connector-curvature="0" />
+       id="path867"
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 122.76666,225.03336 v 50.8 c 0,9.35203 -7.58131,16.93334 -16.93334,16.93334 l -84.666654,-1e-5 c -9.352027,0 -16.9333446,-7.58131 -16.9333402,-16.93334 l 7.7e-6,-84.66665 c 1.1e-6,-9.35202 7.5813125,-16.93333 16.9333325,-16.93333 l 50.799997,-1e-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsssscc" />
   </g>
 </svg>
diff --git a/lib/QEcalParser/resources/show_dialog_src.svg b/lib/QEcalParser/resources/show_dialog_src.svg
new file mode 100644
index 0000000000..67159e94c4
--- /dev/null
+++ b/lib/QEcalParser/resources/show_dialog_src.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46666"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="show_dialog_src.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5723"
+         d="M -89.199339,-108.0792 H 704.55478 V 1014.4725 H -89.199339" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="72.640091"
+     inkscape:cy="423.33858"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4518"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53336)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 97.366663,165.7667 h 33.866667 v 33.86666"
+       id="path823"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 131.23333,165.7667 97.366663,199.63336"
+       id="path825"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="48.325668"
+       y="264.44684"
+       id="text829"
+       transform="rotate(4.0772588)"><tspan
+         sodipodi:role="line"
+         id="tspan827"
+         x="48.325668"
+         y="264.44684"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:116.41666412px;font-family:Consolas;-inkscape-font-specification:Consolas;fill:#0056b8;fill-opacity:1;stroke-width:0.26458332">$</tspan></text>
+    <path
+       id="path867"
+       style="fill:none;stroke:#000000;stroke-width:8.46666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 122.76666,225.03336 v 50.8 c 0,9.35203 -7.58131,16.93334 -16.93334,16.93334 l -84.666654,-1e-5 c -9.352027,0 -16.9333446,-7.58131 -16.9333402,-16.93334 l 7.7e-6,-84.66665 c 1.1e-6,-9.35202 7.5813125,-16.93333 16.9333325,-16.93333 l 50.799997,-1e-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsssscc" />
+  </g>
+</svg>
diff --git a/lib/QEcalParser/src/ecal_parser_lineedit/ecal_parser_lineedit.cpp b/lib/QEcalParser/src/ecal_parser_lineedit/ecal_parser_lineedit.cpp
index 8a15d2444e..0517a3440c 100644
--- a/lib/QEcalParser/src/ecal_parser_lineedit/ecal_parser_lineedit.cpp
+++ b/lib/QEcalParser/src/ecal_parser_lineedit/ecal_parser_lineedit.cpp
@@ -36,13 +36,13 @@ QEcalParserLineEdit::QEcalParserLineEdit(QWidget *parent)
 QEcalParserLineEdit::QEcalParserLineEdit(const QString &contents, QWidget *parent)
   : QLineEdit(contents, parent)
 {
-  open_dialog_action = new QAction(this);
-  open_dialog_action->setIcon(QIcon(":/qecalparser/SHOW_DIALOG"));
-  addAction(open_dialog_action, QLineEdit::ActionPosition::TrailingPosition);
-  open_dialog_action->setToolTip(tr("Advanced editor..."));
-  open_dialog_action->setText(tr("Advanced editor..."));
+  open_dialog_action_ = new QAction(this);
+  open_dialog_action_->setIcon(QIcon(":/qecalparser/SHOW_DIALOG"));
+  addAction(open_dialog_action_, QLineEdit::ActionPosition::TrailingPosition);
+  open_dialog_action_->setToolTip(tr("Advanced editor..."));
+  open_dialog_action_->setText(tr("Advanced editor..."));
 
-  connect(open_dialog_action, &QAction::triggered, this, &QEcalParserLineEdit::openDialog);
+  connect(open_dialog_action_, &QAction::triggered, this, &QEcalParserLineEdit::openDialog);
 }
 
 QEcalParserLineEdit::~QEcalParserLineEdit()
@@ -62,7 +62,7 @@ void QEcalParserLineEdit::contextMenuEvent(QContextMenuEvent *event)
   QMenu *menu = createStandardContextMenu();
 
   menu->addSeparator();
-  menu->addAction(open_dialog_action);
+  menu->addAction(open_dialog_action_);
   menu->exec(event->globalPos());
 
   delete menu;
diff --git a/lib/QEcalParser/src/ecal_parser_textedit/ecal_parser_textedit.cpp b/lib/QEcalParser/src/ecal_parser_textedit/ecal_parser_textedit.cpp
index 178c5ba512..ce38cb14a7 100644
--- a/lib/QEcalParser/src/ecal_parser_textedit/ecal_parser_textedit.cpp
+++ b/lib/QEcalParser/src/ecal_parser_textedit/ecal_parser_textedit.cpp
@@ -25,23 +25,40 @@
 #include <QIcon>
 #include <QMenu>
 #include <QContextMenuEvent>
+#include <QToolButton>
+#include <QScrollBar>
+#include <QStyle>
 
 QEcalParserTextEdit::QEcalParserTextEdit(QWidget *parent)
   : QEcalParserTextEdit("", parent)
 {
-  Q_INIT_RESOURCE(qecalparser);
 }
 
 QEcalParserTextEdit::QEcalParserTextEdit(const QString &contents, QWidget *parent)
   : QTextEdit(contents, parent)
 {
-  open_dialog_action = new QAction(this);
-  open_dialog_action->setIcon(QIcon(":/qecalparser/SHOW_DIALOG"));
-  addAction(open_dialog_action);
-  open_dialog_action->setToolTip(tr("Advanced editor..."));
-  open_dialog_action->setText(tr("Advanced editor..."));
+  Q_INIT_RESOURCE(qecalparser);
+
+  open_dialog_action_ = new QAction(this);
+  open_dialog_action_->setIcon(QIcon(":/qecalparser/SHOW_DIALOG"));
+  addAction(open_dialog_action_);
+  open_dialog_action_->setToolTip(tr("Advanced editor..."));
+  open_dialog_action_->setText(tr("Advanced editor..."));
 
-  connect(open_dialog_action, &QAction::triggered, this, &QEcalParserTextEdit::openDialog);
+  connect(open_dialog_action_, &QAction::triggered, this, &QEcalParserTextEdit::openDialog);
+
+  overlay_button_ = new QToolButton(this);
+  overlay_button_->setStyleSheet(
+    R"(
+QToolButton
+{
+  background-color: rgba(255, 255, 255, 80%);
+  border: none;
+}
+)"
+  );
+  overlay_button_->setDefaultAction(open_dialog_action_);
+  overlay_button_->raise();
 }
 
 QEcalParserTextEdit::~QEcalParserTextEdit()
@@ -61,8 +78,31 @@ void QEcalParserTextEdit::contextMenuEvent(QContextMenuEvent *event)
   QMenu *menu = createStandardContextMenu();
 
   menu->addSeparator();
-  menu->addAction(open_dialog_action);
+  menu->addAction(open_dialog_action_);
   menu->exec(event->globalPos());
 
   delete menu;
-}
\ No newline at end of file
+}
+
+void QEcalParserTextEdit::resizeEvent(QResizeEvent* event)
+{
+  QTextEdit::resizeEvent(event);
+  moveOverlayButton();
+}
+
+void QEcalParserTextEdit::showEvent(QShowEvent *event)
+{
+  QTextEdit::showEvent(event);
+  moveOverlayButton();
+}
+
+void QEcalParserTextEdit::moveOverlayButton()
+{
+  int scrollbar_width = 0;
+  if (verticalScrollBar()->isVisible())
+    scrollbar_width = verticalScrollBar()->width();
+
+  int frame_width = style()->pixelMetric(QStyle::PixelMetric::PM_DefaultFrameWidth, nullptr, this);
+
+  overlay_button_->move(QPoint(width() - overlay_button_->width() - scrollbar_width - frame_width, frame_width));
+}
diff --git a/lib/ThreadingUtils/CMakeLists.txt b/lib/ThreadingUtils/CMakeLists.txt
index 57ebf107a3..9c4a70b159 100644
--- a/lib/ThreadingUtils/CMakeLists.txt
+++ b/lib/ThreadingUtils/CMakeLists.txt
@@ -45,4 +45,4 @@ if(MSVC)
     msvc_source_tree(${threading_utils_includes} ${threading_utils_src})
 endif()
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib/ThreadingUtils)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib)
diff --git a/lib/Udpcap/src/udpcap_socket_private.cpp b/lib/Udpcap/src/udpcap_socket_private.cpp
index 49520b73a7..bd8f847ae1 100644
--- a/lib/Udpcap/src/udpcap_socket_private.cpp
+++ b/lib/Udpcap/src/udpcap_socket_private.cpp
@@ -533,6 +533,7 @@ namespace Udpcap
     // TODO: make close thread safe, so one thread can wait for data while another thread closes the socket
     for (auto& pcap_dev : pcap_devices_)
     {
+      LOG_DEBUG(std::string("Closing ") + pcap_dev.device_name_);
       pcap_close(pcap_dev.pcap_handle_);
     }
     pcap_devices_.clear();
@@ -700,7 +701,7 @@ namespace Udpcap
     }
 
 
-    PcapDev pcap_dev(pcap_handle, IsLoopbackDevice(device_name));
+    PcapDev pcap_dev(pcap_handle, IsLoopbackDevice(device_name), device_name);
    
     pcap_devices_.push_back(pcap_dev);
     pcap_win32_handles_.push_back(pcap_getevent(pcap_handle));
diff --git a/lib/Udpcap/src/udpcap_socket_private.h b/lib/Udpcap/src/udpcap_socket_private.h
index 4b2766e3db..833a5b909a 100644
--- a/lib/Udpcap/src/udpcap_socket_private.h
+++ b/lib/Udpcap/src/udpcap_socket_private.h
@@ -52,12 +52,14 @@ namespace Udpcap
   private:
     struct PcapDev
     {
-      PcapDev(pcap_t* pcap_handle, bool is_loopback)
+      PcapDev(pcap_t* pcap_handle, bool is_loopback, const std::string& device_name)
         : pcap_handle_(pcap_handle)
         , is_loopback_   (is_loopback)
+        , device_name_(device_name)
       {}
       pcap_t*      pcap_handle_;
       bool         is_loopback_;
+      std::string  device_name_;
     };
 
     struct CallbackArgsVector
diff --git a/lib/EcalUtils/CMakeLists.txt b/lib/ecal_utils/CMakeLists.txt
similarity index 83%
rename from lib/EcalUtils/CMakeLists.txt
rename to lib/ecal_utils/CMakeLists.txt
index 82e30785cc..2324da946e 100644
--- a/lib/EcalUtils/CMakeLists.txt
+++ b/lib/ecal_utils/CMakeLists.txt
@@ -15,18 +15,18 @@
 # limitations under the License.
 #
 # ========================= eCAL LICENSE =================================
-project(EcalUtils)
+project(utils)
 
 find_package(Threads REQUIRED)
 
 set (ecal_utils_includes
-  include/EcalUtils/Path.h
-  include/EcalUtils/EcalUtils.h
-  include/EcalUtils/String.h
+  include/ecal_utils/filesystem.h
+  include/ecal_utils/ecal_utils.h
+  include/ecal_utils/string.h
 )
 
 set(ecal_utils_src
-    src/Path.cpp
+    src/filesystem.cpp
 )
 
 ecal_add_library (${PROJECT_NAME}
@@ -34,6 +34,8 @@ ecal_add_library (${PROJECT_NAME}
     ${ecal_utils_src}
 )
 
+add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
 target_include_directories(${PROJECT_NAME} PRIVATE src/)
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -47,4 +49,4 @@ endif()
 
 ecal_install_library(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib/EcalUtils)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER lib)
diff --git a/lib/EcalUtils/include/EcalUtils/EcalUtils.h b/lib/ecal_utils/include/ecal_utils/ecal_utils.h
similarity index 99%
rename from lib/EcalUtils/include/EcalUtils/EcalUtils.h
rename to lib/ecal_utils/include/ecal_utils/ecal_utils.h
index bf8b5ecec9..0a807a8acf 100644
--- a/lib/EcalUtils/include/EcalUtils/EcalUtils.h
+++ b/lib/ecal_utils/include/ecal_utils/ecal_utils.h
@@ -38,17 +38,15 @@
 #define NOMINMAX
 #include <windows.h>
 #include <direct.h>
-#endif  // _WIN32
-
-#ifdef __linux__
+#else
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
-#endif  // __linux__
+#endif  // _WIN32
 
-#include "String.h"
+#include "string.h"
 
 namespace EcalUtils
 {
@@ -66,17 +64,17 @@ namespace EcalUtils
 #ifdef _WIN32
       DWORD attribs = ::GetFileAttributesA(path.c_str());
       return (attribs != INVALID_FILE_ATTRIBUTES);
-#elif __linux__
+#else
       struct stat st;
       if (stat(path.c_str(), &st) == 0)
         if ((st.st_mode & S_IFREG) != 0)
           return true;
       return false;
-#endif  //  __linux__
+#endif  //  _WIN32
     }
   }  // namespace File
 
-  namespace Path
+  namespace Filesystem
   {
     /**
     * @brief  Get file extension from path
@@ -205,7 +203,7 @@ namespace EcalUtils
     **/
     inline void MakeAbsolute(std::string& path)
     {
- #ifdef _WIN32
+#ifdef _WIN32
       // make the absolute path to the executable
       char abs_path[MAX_PATH];
       _fullpath(abs_path, path.c_str(), MAX_PATH);
diff --git a/lib/EcalUtils/include/EcalUtils/Path.h b/lib/ecal_utils/include/ecal_utils/filesystem.h
similarity index 90%
rename from lib/EcalUtils/include/EcalUtils/Path.h
rename to lib/ecal_utils/include/ecal_utils/filesystem.h
index d48dac05bb..cc0d01b036 100644
--- a/lib/EcalUtils/include/EcalUtils/Path.h
+++ b/lib/ecal_utils/include/ecal_utils/filesystem.h
@@ -27,7 +27,7 @@
 
 namespace EcalUtils
 {
-  namespace Path
+  namespace Filesystem
   {
     enum OsStyle : int
     {
@@ -66,17 +66,6 @@ namespace EcalUtils
 
       int64_t FileSize() const;
 
-#ifdef WIN32
-      bool PermissionRootRead()     const;
-      bool PermissionRootWrite()    const;
-      bool PermissionRootExecute()  const;
-      bool PermissionGroupRead()    const;
-      bool PermissionGroupWrite()   const;
-      bool PermissionGroupExecute() const;
-      bool PermissionOwnerRead()    const;
-      bool PermissionOwnerWrite()   const;
-      bool PermissionOwnerExecute() const;
-#else // WIN32
       bool PermissionRootRead()     const;
       bool PermissionRootWrite()    const;
       bool PermissionRootExecute()  const;
@@ -86,7 +75,6 @@ namespace EcalUtils
       bool PermissionOwnerRead()    const;
       bool PermissionOwnerWrite()   const;
       bool PermissionOwnerExecute() const;
-#endif // WIN32
 
       bool CanOpenDir() const;
 
@@ -109,6 +97,8 @@ namespace EcalUtils
     bool MkDir(const std::string& path, OsStyle input_path_style = OsStyle::Combined);
     bool MkPath(const std::string& path, OsStyle input_path_style = OsStyle::Combined);
 
+    bool CopyFile(const std::string& source, const std::string& destination, OsStyle input_path_style = OsStyle::Combined);
+
     std::string GetAbsoluteRoot(const std::string& path, OsStyle input_path_style = OsStyle::Combined);
 
     bool IsAbsolute(const std::string& path, OsStyle input_path_style = OsStyle::Combined);
@@ -121,6 +111,7 @@ namespace EcalUtils
     std::string AbsolutePath(const std::string& relative_path, OsStyle input_path_style = OsStyle::Combined);
 
     std::string CurrentWorkingDir();
+    std::string ApplicationDir();
 
     std::string ChangeSeperators(const std::string& path, OsStyle output_path_style, OsStyle input_path_style = OsStyle::Combined);
 
diff --git a/lib/EcalUtils/include/EcalUtils/String.h b/lib/ecal_utils/include/ecal_utils/string.h
similarity index 100%
rename from lib/EcalUtils/include/EcalUtils/String.h
rename to lib/ecal_utils/include/ecal_utils/string.h
diff --git a/lib/EcalUtils/src/Path.cpp b/lib/ecal_utils/src/filesystem.cpp
similarity index 88%
rename from lib/EcalUtils/src/Path.cpp
rename to lib/ecal_utils/src/filesystem.cpp
index e66792de5f..f4c6aa9ee0 100644
--- a/lib/EcalUtils/src/Path.cpp
+++ b/lib/ecal_utils/src/filesystem.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "EcalUtils/Path.h"
+#include <ecal_utils/filesystem.h>
 
 #ifdef _WIN32
   #define WIN32_LEAN_AND_MEAN
@@ -26,6 +26,15 @@
   #include <direct.h>
 #else // _WIN32
   #include <dirent.h>
+  #include <fcntl.h>    // O_RDONLY
+  #include <unistd.h>
+
+  #if defined (__APPLE__) || defined(__FreeBSD__)
+    #include <copyfile.h>
+  #else
+    #include <sys/sendfile.h>
+  #endif //__linux__
+
 #endif  // _WIN32
 
 #include <sys/stat.h> // stat
@@ -35,11 +44,11 @@
 #include <regex>
 #include <iostream>
 
-#include "EcalUtils/EcalUtils.h"
+#include <ecal_utils/ecal_utils.h>
 
 namespace EcalUtils
 {
-  namespace Path
+  namespace Filesystem
   {
     ////////////////////////////////////////
     // FileStatus Class
@@ -186,7 +195,6 @@ namespace EcalUtils
 
       do
       {
-        std::string file_name(ffd.cFileName);
         content.emplace(std::string(ffd.cFileName), FileStatus(clean_path + "\\" + std::string(ffd.cFileName)));
       } while (FindNextFileA(hFind, &ffd) != 0);
       FindClose(hFind);
@@ -267,6 +275,44 @@ namespace EcalUtils
       }
     }
 
+#ifdef CopyFile
+#define CopyFile_4c768dd038fa415ca1399214711e2b9f CopyFile
+#undef CopyFile
+#endif // CopyFile
+    bool CopyFile(const std::string& source, const std::string& destination, OsStyle input_path_style)
+#ifdef CopyFile_4c768dd038fa415ca1399214711e2b9f
+#define CopyFile CopyFile_4c768dd038fa415ca1399214711e2b9f
+#undef CopyFile_4c768dd038fa415ca1399214711e2b9f
+#endif // CopyFile_4c768dd038fa415ca1399214711e2b9f
+    {
+      std::string source_clean      = ToNativeSeperators(CleanPath(source,      input_path_style), input_path_style);
+      std::string destination_clean = ToNativeSeperators(CleanPath(destination, input_path_style), input_path_style);
+
+#if defined WIN32
+      return (CopyFileA(source_clean.c_str(), destination_clean.c_str(), FALSE) != FALSE);
+#else // WIN32
+      int input_fd, output_fd;    
+      if ((input_fd = open(source_clean.c_str(), O_RDONLY)) == -1)
+      {
+        return false;
+      }    
+      if ((output_fd = creat(destination_clean.c_str(), 0660)) == -1)
+      {
+        close(input_fd);
+        return false;
+      }
+#if defined (__APPLE__) || defined(__FreeBSD__)
+      int result = fcopyfile(input_fd, output_fd, 0, COPYFILE_ALL);
+      return (result == 0);
+#else
+      off_t bytesCopied = 0;
+      FileStatus file_status(source_clean, OsStyle::Current);
+      int result = sendfile(output_fd, input_fd, &bytesCopied, file_status.FileSize());
+      return (result != -1);
+#endif
+#endif // WIN32
+    }
+
     std::string GetAbsoluteRoot(const std::string& path, OsStyle input_path_style)
     {
       if ((input_path_style == OsStyle::Windows) || (input_path_style == OsStyle::Combined))
@@ -462,6 +508,20 @@ namespace EcalUtils
 #endif
     }
 
+    std::string ApplicationDir()
+    {
+#ifdef _WIN32
+      char app_path_buffer[MAX_PATH];
+      auto app_path { std::string(app_path_buffer, static_cast<std::size_t>(GetModuleFileName(NULL, app_path_buffer, MAX_PATH))) };
+#else
+      char app_path_buffer[PATH_MAX];
+      ssize_t count { readlink("/proc/self/exe", app_path_buffer, PATH_MAX) };
+      if (count < 0) return {};
+      auto app_path{ std::string(app_path_buffer, static_cast<std::size_t>(count)) };
+#endif
+      return app_path.substr(0, app_path.find_last_of(separator));
+    }
+
     std::string ChangeSeperators(const std::string& path, OsStyle output_path_style, OsStyle input_path_style)
     {
       std::string output;
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 4e6dac9bfb..d72452861a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -27,64 +27,64 @@ endif(HAS_HDF5)
 # --------------------------------------------------------
 # c samples
 # --------------------------------------------------------
-add_subdirectory(c/minimal/minimal_rec/src)
-add_subdirectory(c/minimal/minimal_rec_cb/src)
-add_subdirectory(c/minimal/minimal_snd/src)
-add_subdirectory(c/services/service_client/src)
-add_subdirectory(c/services/service_server/src)
+add_subdirectory(c/minimal/minimal_rec)
+add_subdirectory(c/minimal/minimal_rec_cb)
+add_subdirectory(c/minimal/minimal_snd)
+add_subdirectory(c/services/service_client)
+add_subdirectory(c/services/service_server)
 
 # --------------------------------------------------------
 # cpp samples
 # --------------------------------------------------------
 if(HAS_CAPNPROTO)
-add_subdirectory(cpp/capnp/addressbook_snd/src)
-add_subdirectory(cpp/capnp/addressbook_rec/src)
-add_subdirectory(cpp/capnp/addressbook_rec_cb/src)
-add_subdirectory(cpp/capnp/addressbook_rec_dynamic/src)
+add_subdirectory(cpp/capnp/addressbook_snd)
+add_subdirectory(cpp/capnp/addressbook_rec)
+add_subdirectory(cpp/capnp/addressbook_rec_cb)
+add_subdirectory(cpp/capnp/addressbook_rec_dynamic)
 endif(HAS_CAPNPROTO)
-add_subdirectory(cpp/counter/counter_rec_cb/src)
-add_subdirectory(cpp/counter/counter_snd/src)
+add_subdirectory(cpp/counter/counter_rec_cb)
+add_subdirectory(cpp/counter/counter_snd)
 if(HAS_HDF5)
-add_subdirectory(cpp/measurement/measurement_read/src)
-add_subdirectory(cpp/measurement/measurement_write/src)
+add_subdirectory(cpp/measurement/measurement_read)
+add_subdirectory(cpp/measurement/measurement_write)
 endif(HAS_HDF5)
-add_subdirectory(cpp/event/event_rec/src)
-add_subdirectory(cpp/event/event_snd/src)
-add_subdirectory(cpp/latency/latency_rec/src)
-add_subdirectory(cpp/latency/latency_rec_cb/src)
-add_subdirectory(cpp/latency/latency_snd/src)
-add_subdirectory(cpp/minimal/minimal_rec/src)
-add_subdirectory(cpp/minimal/minimal_snd/src)
-add_subdirectory(cpp/misc/process/src)
-add_subdirectory(cpp/misc/proto_dyn/src)
-add_subdirectory(cpp/misc/proto_dyn_json/src)
-add_subdirectory(cpp/misc/time/src)
-add_subdirectory(cpp/misc/timer/src)
-add_subdirectory(cpp/monitoring/monitoring_rec/src)
-add_subdirectory(cpp/monitoring/monitoring_reg/src)
-add_subdirectory(cpp/multiple/multiple_rec_cb/src)
-add_subdirectory(cpp/multiple/multiple_snd/src)
-add_subdirectory(cpp/performance/dynsize_snd/src)
-add_subdirectory(cpp/performance/performance_rec/src)
-add_subdirectory(cpp/performance/performance_rec_cb/src)
-add_subdirectory(cpp/performance/performance_snd/src)
-add_subdirectory(cpp/performance/pubsub_throughput/src)
-add_subdirectory(cpp/person/person_rec/src)
-add_subdirectory(cpp/person/person_rec_events/src)
-add_subdirectory(cpp/person/person_snd/src)
-add_subdirectory(cpp/person/person_snd_events/src)
-add_subdirectory(cpp/person/person_snd_inproc/src)
-add_subdirectory(cpp/person/person_snd_multicast/src)
-add_subdirectory(cpp/pingpong/ping/src)
-add_subdirectory(cpp/pingpong/pong/src)
-add_subdirectory(cpp/services/ecalplayer_client/src)
+add_subdirectory(cpp/event/event_rec)
+add_subdirectory(cpp/event/event_snd)
+add_subdirectory(cpp/latency/latency_rec)
+add_subdirectory(cpp/latency/latency_rec_cb)
+add_subdirectory(cpp/latency/latency_snd)
+add_subdirectory(cpp/minimal/minimal_rec)
+add_subdirectory(cpp/minimal/minimal_snd)
+add_subdirectory(cpp/misc/process)
+add_subdirectory(cpp/misc/proto_dyn)
+add_subdirectory(cpp/misc/proto_dyn_json)
+add_subdirectory(cpp/misc/time)
+add_subdirectory(cpp/misc/timer)
+add_subdirectory(cpp/monitoring/monitoring_rec)
+add_subdirectory(cpp/monitoring/monitoring_reg)
+add_subdirectory(cpp/multiple/multiple_rec_cb)
+add_subdirectory(cpp/multiple/multiple_snd)
+add_subdirectory(cpp/performance/dynsize_snd)
+add_subdirectory(cpp/performance/performance_rec)
+add_subdirectory(cpp/performance/performance_rec_cb)
+add_subdirectory(cpp/performance/performance_snd)
+add_subdirectory(cpp/performance/pubsub_throughput)
+add_subdirectory(cpp/person/person_rec)
+add_subdirectory(cpp/person/person_rec_events)
+add_subdirectory(cpp/person/person_snd)
+add_subdirectory(cpp/person/person_snd_events)
+add_subdirectory(cpp/person/person_snd_inproc)
+add_subdirectory(cpp/person/person_snd_multicast)
+add_subdirectory(cpp/pingpong/ping)
+add_subdirectory(cpp/pingpong/pong)
+add_subdirectory(cpp/services/ecalplayer_client)
 if(HAS_QT5)
   add_subdirectory(cpp/services/ecalplayer_gui_client)
 endif(HAS_QT5)
-add_subdirectory(cpp/services/math_client/src)
-add_subdirectory(cpp/services/math_server/src)
-add_subdirectory(cpp/services/ping_client/src)
-add_subdirectory(cpp/services/ping_server/src)
+add_subdirectory(cpp/services/math_client)
+add_subdirectory(cpp/services/math_server)
+add_subdirectory(cpp/services/ping_client)
+add_subdirectory(cpp/services/ping_server)
 
 # --------------------------------------------------------
 # python samples
@@ -123,9 +123,10 @@ if(BUILD_CSHARP_BINDING)
   add_subdirectory(csharp/minimal/minimal_rec)
   add_subdirectory(csharp/minimal/minimal_rec_cb)
   add_subdirectory(csharp/minimal/minimal_snd)
-  #add_subdirectory(csharp/person/protobuf)
-  #add_subdirectory(csharp/person/person_rec)
-  #add_subdirectory(csharp/person/person_rec_cb)
-  #add_subdirectory(csharp/person/person_snd)
+  add_subdirectory(csharp/person/protobuf)
+  add_subdirectory(csharp/person/person_rec)
+  add_subdirectory(csharp/person/person_rec_cb)
+  add_subdirectory(csharp/person/person_rec_json_cb)
+  add_subdirectory(csharp/person/person_snd)
   endif()
 endif()
diff --git a/samples/c/minimal/minimal_rec/src/CMakeLists.txt b/samples/c/minimal/minimal_rec/CMakeLists.txt
similarity index 98%
rename from samples/c/minimal/minimal_rec/src/CMakeLists.txt
rename to samples/c/minimal/minimal_rec/CMakeLists.txt
index a7b78c6209..540b7d5b42 100644
--- a/samples/c/minimal/minimal_rec/src/CMakeLists.txt
+++ b/samples/c/minimal/minimal_rec/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(eCAL REQUIRED)
 remove_definitions(-std=c++14)
 
 set(minimal_rec_c_src
-    minimal_rec.c
+    src/minimal_rec.c
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_rec_c_src})
diff --git a/samples/c/minimal/minimal_rec_cb/src/CMakeLists.txt b/samples/c/minimal/minimal_rec_cb/CMakeLists.txt
similarity index 97%
rename from samples/c/minimal/minimal_rec_cb/src/CMakeLists.txt
rename to samples/c/minimal/minimal_rec_cb/CMakeLists.txt
index 95e54614b1..fa358c6b04 100644
--- a/samples/c/minimal/minimal_rec_cb/src/CMakeLists.txt
+++ b/samples/c/minimal/minimal_rec_cb/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(eCAL REQUIRED)
 remove_definitions(-std=c++14)
 
 set(minimal_rec_cb_c_src
-  minimal_rec_cb.c
+    src/minimal_rec_cb.c
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_rec_cb_c_src})
diff --git a/samples/c/minimal/minimal_snd/src/CMakeLists.txt b/samples/c/minimal/minimal_snd/CMakeLists.txt
similarity index 98%
rename from samples/c/minimal/minimal_snd/src/CMakeLists.txt
rename to samples/c/minimal/minimal_snd/CMakeLists.txt
index 7d1c823409..179c90d1fa 100644
--- a/samples/c/minimal/minimal_snd/src/CMakeLists.txt
+++ b/samples/c/minimal/minimal_snd/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(eCAL REQUIRED)
 remove_definitions(-std=c++14)
 
 set(minimal_snd_c_src
-    minimal_snd.c
+    src/minimal_snd.c
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_snd_c_src})
diff --git a/samples/c/services/service_client/src/CMakeLists.txt b/samples/c/services/service_client/CMakeLists.txt
similarity index 97%
rename from samples/c/services/service_client/src/CMakeLists.txt
rename to samples/c/services/service_client/CMakeLists.txt
index 292f9d1dcd..f7594543e7 100644
--- a/samples/c/services/service_client/src/CMakeLists.txt
+++ b/samples/c/services/service_client/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(eCAL REQUIRED)
 remove_definitions(-std=c++14)
 
 set(service_client_c_src
-    service_client_c.c
+    src/service_client_c.c
 )
 
 ecal_add_sample(${PROJECT_NAME} ${service_client_c_src})
diff --git a/samples/c/services/service_server/src/CMakeLists.txt b/samples/c/services/service_server/CMakeLists.txt
similarity index 97%
rename from samples/c/services/service_server/src/CMakeLists.txt
rename to samples/c/services/service_server/CMakeLists.txt
index cd79ca08c2..fc289f11a4 100644
--- a/samples/c/services/service_server/src/CMakeLists.txt
+++ b/samples/c/services/service_server/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(eCAL REQUIRED)
 remove_definitions(-std=c++14)
 
 set(service_server_c_src
-    service_server_c.c
+    src/service_server_c.c
 )
 
 ecal_add_sample(${PROJECT_NAME} ${service_server_c_src})
diff --git a/samples/cpp/capnp/addressbook_rec/src/CMakeLists.txt b/samples/cpp/capnp/addressbook_rec/CMakeLists.txt
similarity index 90%
rename from samples/cpp/capnp/addressbook_rec/src/CMakeLists.txt
rename to samples/cpp/capnp/addressbook_rec/CMakeLists.txt
index eb0b1ed1a8..adec2027f8 100644
--- a/samples/cpp/capnp/addressbook_rec/src/CMakeLists.txt
+++ b/samples/cpp/capnp/addressbook_rec/CMakeLists.txt
@@ -22,9 +22,9 @@ find_package(CapnProto REQUIRED)
 find_package(eCAL REQUIRED)
 
 set(CAPNPC_IMPORT_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS addressbook.capnp)
+capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS src/addressbook.capnp)
 
-ecal_add_sample(${PROJECT_NAME} addressbook_rec.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
+ecal_add_sample(${PROJECT_NAME} src/addressbook_rec.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
 
 set_source_files_properties(${CAPNP_SRCS} PROPERTIES COMPILE_FLAGS $<$<CXX_COMPILER_ID:MSVC>:-W0>)
 
diff --git a/samples/cpp/capnp/addressbook_rec_cb/src/CMakeLists.txt b/samples/cpp/capnp/addressbook_rec_cb/CMakeLists.txt
similarity index 89%
rename from samples/cpp/capnp/addressbook_rec_cb/src/CMakeLists.txt
rename to samples/cpp/capnp/addressbook_rec_cb/CMakeLists.txt
index 292bc81cfa..7bb6d9f381 100644
--- a/samples/cpp/capnp/addressbook_rec_cb/src/CMakeLists.txt
+++ b/samples/cpp/capnp/addressbook_rec_cb/CMakeLists.txt
@@ -22,9 +22,9 @@ find_package(CapnProto REQUIRED)
 find_package(eCAL REQUIRED)
 
 set(CAPNPC_IMPORT_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS addressbook.capnp)
+capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS src/addressbook.capnp)
 
-ecal_add_sample(${PROJECT_NAME} addressbook_rec_cb.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
+ecal_add_sample(${PROJECT_NAME} src/addressbook_rec_cb.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
 
 set_source_files_properties(${CAPNP_SRCS} PROPERTIES COMPILE_FLAGS $<$<CXX_COMPILER_ID:MSVC>:-W0>)
 
diff --git a/samples/cpp/capnp/addressbook_rec_dynamic/src/CMakeLists.txt b/samples/cpp/capnp/addressbook_rec_dynamic/CMakeLists.txt
similarity index 94%
rename from samples/cpp/capnp/addressbook_rec_dynamic/src/CMakeLists.txt
rename to samples/cpp/capnp/addressbook_rec_dynamic/CMakeLists.txt
index f63d807b58..c55cce0b39 100644
--- a/samples/cpp/capnp/addressbook_rec_dynamic/src/CMakeLists.txt
+++ b/samples/cpp/capnp/addressbook_rec_dynamic/CMakeLists.txt
@@ -21,7 +21,7 @@ project(addressbook_rec_dynamic)
 find_package(CapnProto REQUIRED)
 find_package(eCAL REQUIRED)
 
-ecal_add_sample(${PROJECT_NAME} addressbook_rec_dynamic.cpp)
+ecal_add_sample(${PROJECT_NAME} src/addressbook_rec_dynamic.cpp)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/capnp)
 
diff --git a/samples/cpp/capnp/addressbook_snd/src/CMakeLists.txt b/samples/cpp/capnp/addressbook_snd/CMakeLists.txt
similarity index 90%
rename from samples/cpp/capnp/addressbook_snd/src/CMakeLists.txt
rename to samples/cpp/capnp/addressbook_snd/CMakeLists.txt
index 7aaf7ab8d8..6b51a162a2 100644
--- a/samples/cpp/capnp/addressbook_snd/src/CMakeLists.txt
+++ b/samples/cpp/capnp/addressbook_snd/CMakeLists.txt
@@ -22,9 +22,9 @@ find_package(CapnProto REQUIRED)
 find_package(eCAL REQUIRED)
 
 set(CAPNPC_IMPORT_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS addressbook.capnp)
+capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS src/addressbook.capnp)
 
-ecal_add_sample(${PROJECT_NAME} addressbook_snd.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
+ecal_add_sample(${PROJECT_NAME} src/addressbook_snd.cpp ${CAPNP_SRCS} ${CAPNP_HDRS})
 
 set_source_files_properties(${CAPNP_SRCS} PROPERTIES COMPILE_FLAGS $<$<CXX_COMPILER_ID:MSVC>:-W0>)
 
diff --git a/samples/cpp/counter/counter_rec_cb/src/CMakeLists.txt b/samples/cpp/counter/counter_rec_cb/CMakeLists.txt
similarity index 93%
rename from samples/cpp/counter/counter_rec_cb/src/CMakeLists.txt
rename to samples/cpp/counter/counter_rec_cb/CMakeLists.txt
index b330cc226d..6b61c39e34 100644
--- a/samples/cpp/counter/counter_rec_cb/src/CMakeLists.txt
+++ b/samples/cpp/counter/counter_rec_cb/CMakeLists.txt
@@ -21,13 +21,11 @@ project(counter_rec_cb)
 find_package(eCAL REQUIRED)
 
 set(counter_rec_cb_src
-    counter_rec_cb.cpp
+    src/counter_rec_cb.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${counter_rec_cb_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/counter/counter_snd/src/CMakeLists.txt b/samples/cpp/counter/counter_snd/CMakeLists.txt
similarity index 93%
rename from samples/cpp/counter/counter_snd/src/CMakeLists.txt
rename to samples/cpp/counter/counter_snd/CMakeLists.txt
index 70303bd7fa..c43107930e 100644
--- a/samples/cpp/counter/counter_snd/src/CMakeLists.txt
+++ b/samples/cpp/counter/counter_snd/CMakeLists.txt
@@ -21,13 +21,11 @@ project(counter_snd)
 find_package(eCAL REQUIRED)
 
 set(counter_snd_src
-  counter_snd.cpp
+    src/counter_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${counter_snd_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/event/event_rec/src/CMakeLists.txt b/samples/cpp/event/event_rec/CMakeLists.txt
similarity index 93%
rename from samples/cpp/event/event_rec/src/CMakeLists.txt
rename to samples/cpp/event/event_rec/CMakeLists.txt
index 5bbe321407..1113752720 100644
--- a/samples/cpp/event/event_rec/src/CMakeLists.txt
+++ b/samples/cpp/event/event_rec/CMakeLists.txt
@@ -21,13 +21,11 @@ project(event_rec)
 find_package(eCAL REQUIRED)
 
 set(event_rec_src
-    event_rec.cpp
+    src/event_rec.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${event_rec_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/event/event_snd/src/CMakeLists.txt b/samples/cpp/event/event_snd/CMakeLists.txt
similarity index 93%
rename from samples/cpp/event/event_snd/src/CMakeLists.txt
rename to samples/cpp/event/event_snd/CMakeLists.txt
index 5e05698779..13fc5edb82 100644
--- a/samples/cpp/event/event_snd/src/CMakeLists.txt
+++ b/samples/cpp/event/event_snd/CMakeLists.txt
@@ -21,13 +21,11 @@ project(event_snd)
 find_package(eCAL REQUIRED)
 
 set(event_rec_snd
-    event_snd.cpp
+    src/event_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${event_rec_snd})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/latency/latency_rec/src/CMakeLists.txt b/samples/cpp/latency/latency_rec/CMakeLists.txt
similarity index 93%
rename from samples/cpp/latency/latency_rec/src/CMakeLists.txt
rename to samples/cpp/latency/latency_rec/CMakeLists.txt
index 5bb150a844..b64a834faf 100644
--- a/samples/cpp/latency/latency_rec/src/CMakeLists.txt
+++ b/samples/cpp/latency/latency_rec/CMakeLists.txt
@@ -21,13 +21,11 @@ project(latency_rec)
 find_package(eCAL REQUIRED)
 
 set(latency_rec_src
-  latency_rec.cpp
+    src/latency_rec.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${latency_rec_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/latency/latency_rec_cb/src/CMakeLists.txt b/samples/cpp/latency/latency_rec_cb/CMakeLists.txt
similarity index 93%
rename from samples/cpp/latency/latency_rec_cb/src/CMakeLists.txt
rename to samples/cpp/latency/latency_rec_cb/CMakeLists.txt
index 5fbd33aab9..bebe68dad9 100644
--- a/samples/cpp/latency/latency_rec_cb/src/CMakeLists.txt
+++ b/samples/cpp/latency/latency_rec_cb/CMakeLists.txt
@@ -21,13 +21,11 @@ project(latency_rec_cb)
 find_package(eCAL REQUIRED)
 
 set(latency_rec_cb_src
-  latency_rec_cb.cpp
+    src/latency_rec_cb.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${latency_rec_cb_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/latency/latency_snd/src/CMakeLists.txt b/samples/cpp/latency/latency_snd/CMakeLists.txt
similarity index 91%
rename from samples/cpp/latency/latency_snd/src/CMakeLists.txt
rename to samples/cpp/latency/latency_snd/CMakeLists.txt
index a2bbbc806c..df06ac6a76 100644
--- a/samples/cpp/latency/latency_snd/src/CMakeLists.txt
+++ b/samples/cpp/latency/latency_snd/CMakeLists.txt
@@ -22,17 +22,15 @@ find_package(eCAL REQUIRED)
 find_package(tclap REQUIRED)
 
 set(latency_snd_src
-  latency_snd.cpp
+    src/latency_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${latency_snd_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  tclap::tclap)
+    eCAL::core
+    tclap::tclap)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/measurement/measurement_read/src/CMakeLists.txt b/samples/cpp/measurement/measurement_read/CMakeLists.txt
similarity index 83%
rename from samples/cpp/measurement/measurement_read/src/CMakeLists.txt
rename to samples/cpp/measurement/measurement_read/CMakeLists.txt
index 2502671fea..bd18ff2ab2 100644
--- a/samples/cpp/measurement/measurement_read/src/CMakeLists.txt
+++ b/samples/cpp/measurement/measurement_read/CMakeLists.txt
@@ -24,17 +24,17 @@ create_targets_protobuf()
 set(PROJECT_NAME measurement_read)
 
 set(measurement_read_src
-    measurement_read.cpp
+    src/measurement_read.cpp
 )
 
 set(measurement_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${measurement_read_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${measurement_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${measurement_proto})
+#target_include_directories(${PROJECT_NAME} PRIVATE .)
 target_compile_definitions(${PROJECT_NAME} PRIVATE MEASUREMENT_PATH="${SAMPLE_PERSON_MEASUREMENT_PATH}")
 
 target_link_libraries(${PROJECT_NAME} eCAL::hdf5 eCAL::proto)
diff --git a/samples/cpp/measurement/measurement_write/src/CMakeLists.txt b/samples/cpp/measurement/measurement_write/CMakeLists.txt
similarity index 83%
rename from samples/cpp/measurement/measurement_write/src/CMakeLists.txt
rename to samples/cpp/measurement/measurement_write/CMakeLists.txt
index 9a458ff1ed..cdcf8d3781 100644
--- a/samples/cpp/measurement/measurement_write/src/CMakeLists.txt
+++ b/samples/cpp/measurement/measurement_write/CMakeLists.txt
@@ -24,17 +24,17 @@ create_targets_protobuf()
 set(PROJECT_NAME measurement_write)
 
 set(measurement_write_src
-    measurement_write.cpp
+    src/measurement_write.cpp
 )
 
 set(measurement_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${measurement_write_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${measurement_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${measurement_proto})
+#target_include_directories(${PROJECT_NAME} PRIVATE .)
 target_compile_definitions(${PROJECT_NAME} PRIVATE MEASUREMENT_PATH="${SAMPLE_PERSON_MEASUREMENT_PATH}")
 
 target_link_libraries(${PROJECT_NAME} eCAL::hdf5 eCAL::proto)
diff --git a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
index 2deb708fa2..6460ddfbf0 100644
--- a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
+++ b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
@@ -25,7 +25,7 @@
 
 #include "person.pb.h"
 
-#define ONE_SECOND 1000000;
+constexpr auto ONE_SECOND = 1000000;;
 
 int main(int /*argc*/, char** /*argv*/)
 {
diff --git a/samples/cpp/minimal/minimal_rec/src/CMakeLists.txt b/samples/cpp/minimal/minimal_rec/CMakeLists.txt
similarity index 93%
rename from samples/cpp/minimal/minimal_rec/src/CMakeLists.txt
rename to samples/cpp/minimal/minimal_rec/CMakeLists.txt
index e16c73f3b7..fad316db9f 100644
--- a/samples/cpp/minimal/minimal_rec/src/CMakeLists.txt
+++ b/samples/cpp/minimal/minimal_rec/CMakeLists.txt
@@ -21,13 +21,11 @@ project(minimal_rec)
 find_package(eCAL REQUIRED)
 
 set(minimal_rec_src
-    minimal_rec.cpp
+    src/minimal_rec.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_rec_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/minimal/minimal_snd/src/CMakeLists.txt b/samples/cpp/minimal/minimal_snd/CMakeLists.txt
similarity index 93%
rename from samples/cpp/minimal/minimal_snd/src/CMakeLists.txt
rename to samples/cpp/minimal/minimal_snd/CMakeLists.txt
index 7b0651a69c..7377042fdd 100644
--- a/samples/cpp/minimal/minimal_snd/src/CMakeLists.txt
+++ b/samples/cpp/minimal/minimal_snd/CMakeLists.txt
@@ -21,13 +21,11 @@ project(minimal_snd)
 find_package(eCAL REQUIRED)
 
 set(minimal_snd_src
-    minimal_snd.cpp
+    src/minimal_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_snd_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/misc/process/src/CMakeLists.txt b/samples/cpp/misc/process/CMakeLists.txt
similarity index 98%
rename from samples/cpp/misc/process/src/CMakeLists.txt
rename to samples/cpp/misc/process/CMakeLists.txt
index 5aace50881..d6c5daeda6 100644
--- a/samples/cpp/misc/process/src/CMakeLists.txt
+++ b/samples/cpp/misc/process/CMakeLists.txt
@@ -21,7 +21,7 @@ project(process)
 find_package(eCAL REQUIRED)
 
 set(process_src
-    process.cpp
+    src/process.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${process_src})
diff --git a/samples/cpp/misc/proto_dyn/src/CMakeLists.txt b/samples/cpp/misc/proto_dyn/CMakeLists.txt
similarity index 98%
rename from samples/cpp/misc/proto_dyn/src/CMakeLists.txt
rename to samples/cpp/misc/proto_dyn/CMakeLists.txt
index bd29145d55..3ec2595b47 100644
--- a/samples/cpp/misc/proto_dyn/src/CMakeLists.txt
+++ b/samples/cpp/misc/proto_dyn/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(proto_dyn_src
-    proto_dyn.cpp
+    src/proto_dyn.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${proto_dyn_src})
diff --git a/samples/cpp/misc/proto_dyn_json/src/CMakeLists.txt b/samples/cpp/misc/proto_dyn_json/CMakeLists.txt
similarity index 93%
rename from samples/cpp/misc/proto_dyn_json/src/CMakeLists.txt
rename to samples/cpp/misc/proto_dyn_json/CMakeLists.txt
index e3c488e1a6..e96082a27a 100644
--- a/samples/cpp/misc/proto_dyn_json/src/CMakeLists.txt
+++ b/samples/cpp/misc/proto_dyn_json/CMakeLists.txt
@@ -21,13 +21,11 @@ project(proto_dyn_json)
 find_package(eCAL REQUIRED)
 
 set(proto_dyn_json_src
-    proto_dyn_json.cpp
+    src/proto_dyn_json.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${proto_dyn_json_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 find_package(Protobuf REQUIRED)
diff --git a/samples/cpp/misc/time/src/CMakeLists.txt b/samples/cpp/misc/time/CMakeLists.txt
similarity index 93%
rename from samples/cpp/misc/time/src/CMakeLists.txt
rename to samples/cpp/misc/time/CMakeLists.txt
index ff54147596..78c9accdb6 100644
--- a/samples/cpp/misc/time/src/CMakeLists.txt
+++ b/samples/cpp/misc/time/CMakeLists.txt
@@ -21,13 +21,11 @@ project(time)
 find_package(eCAL REQUIRED)
 
 set(time_src
-    time.cpp
+    src/time.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${time_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/misc/timer/src/CMakeLists.txt b/samples/cpp/misc/timer/CMakeLists.txt
similarity index 86%
rename from samples/cpp/misc/timer/src/CMakeLists.txt
rename to samples/cpp/misc/timer/CMakeLists.txt
index cb2b7da496..d101193c8d 100644
--- a/samples/cpp/misc/timer/src/CMakeLists.txt
+++ b/samples/cpp/misc/timer/CMakeLists.txt
@@ -19,19 +19,14 @@
 project(timer)
 
 find_package(eCAL REQUIRED)
-find_package(Protobuf REQUIRED)
 
-create_targets_protobuf()
 set(timer_src
-  timer.cpp
+    src/timer.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${timer_src})
 
-target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf
-)
+target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/monitoring/monitoring_rec/src/CMakeLists.txt b/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt
similarity index 93%
rename from samples/cpp/monitoring/monitoring_rec/src/CMakeLists.txt
rename to samples/cpp/monitoring/monitoring_rec/CMakeLists.txt
index 0db9d0d6c9..0c88fa36b8 100644
--- a/samples/cpp/monitoring/monitoring_rec/src/CMakeLists.txt
+++ b/samples/cpp/monitoring/monitoring_rec/CMakeLists.txt
@@ -21,11 +21,10 @@ project(monitoring_rec)
 find_package(eCAL REQUIRED)
 
 set(monitoring_rec_src
-    monitoring_rec.cpp
+    src/monitoring_rec.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${monitoring_rec_src})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
 
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
diff --git a/samples/cpp/monitoring/monitoring_rec/src/monitoring_rec.cpp b/samples/cpp/monitoring/monitoring_rec/src/monitoring_rec.cpp
index 5a8f494272..e5e1993eaa 100644
--- a/samples/cpp/monitoring/monitoring_rec/src/monitoring_rec.cpp
+++ b/samples/cpp/monitoring/monitoring_rec/src/monitoring_rec.cpp
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/monitoring.pb.h"
 #ifdef _MSC_VER
diff --git a/samples/cpp/monitoring/monitoring_reg/src/CMakeLists.txt b/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt
similarity index 93%
rename from samples/cpp/monitoring/monitoring_reg/src/CMakeLists.txt
rename to samples/cpp/monitoring/monitoring_reg/CMakeLists.txt
index 4a0c08cab3..f23eacfa17 100644
--- a/samples/cpp/monitoring/monitoring_reg/src/CMakeLists.txt
+++ b/samples/cpp/monitoring/monitoring_reg/CMakeLists.txt
@@ -21,13 +21,11 @@ project(monitoring_reg)
 find_package(eCAL REQUIRED)
 
 set(monitoring_reg_src
-    monitoring_reg.cpp
+    src/monitoring_reg.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${monitoring_reg_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 target_link_libraries(${PROJECT_NAME} eCAL::pb)
diff --git a/samples/cpp/monitoring/monitoring_reg/src/monitoring_reg.cpp b/samples/cpp/monitoring/monitoring_reg/src/monitoring_reg.cpp
index 18603ab877..66cbee7e2d 100644
--- a/samples/cpp/monitoring/monitoring_reg/src/monitoring_reg.cpp
+++ b/samples/cpp/monitoring/monitoring_reg/src/monitoring_reg.cpp
@@ -23,7 +23,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4146 4800)
+#pragma warning(disable: 4100 4127 4146 4800) // disable proto warnings
 #endif
 #include "ecal/pb/ecal.pb.h"
 #ifdef _MSC_VER
diff --git a/samples/cpp/multiple/multiple_rec_cb/src/CMakeLists.txt b/samples/cpp/multiple/multiple_rec_cb/CMakeLists.txt
similarity index 71%
rename from samples/cpp/multiple/multiple_rec_cb/src/CMakeLists.txt
rename to samples/cpp/multiple/multiple_rec_cb/CMakeLists.txt
index 4584077b53..21a5dcd370 100644
--- a/samples/cpp/multiple/multiple_rec_cb/src/CMakeLists.txt
+++ b/samples/cpp/multiple/multiple_rec_cb/CMakeLists.txt
@@ -22,32 +22,32 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(multiple_rec_cb_src
-  multiple_rec_cb.cpp
-  multiple_rec_cb_person.cpp
-  multiple_rec_cb_vector.cpp
-  main.cpp
+    src/multiple_rec_cb.cpp
+    src/multiple_rec_cb_person.cpp
+    src/multiple_rec_cb_vector.cpp
+    src/main.cpp
 )
 
 set(multiple_rec_cb_headers
-  multiple_rec_cb.h
-  multiple_rec_cb_person.h
-  multiple_rec_cb_vector.h
-  main.cpp
+    src/multiple_rec_cb.h
+    src/multiple_rec_cb_person.h
+    src/multiple_rec_cb_vector.h
+    src/main.cpp
 )
 
 set(multiple_rec_cb_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto
 )
 
 ecal_add_sample(${PROJECT_NAME} ${multiple_rec_cb_headers} ${multiple_rec_cb_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${multiple_rec_cb_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${multiple_rec_cb_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/multiple/multiple_snd/src/CMakeLists.txt b/samples/cpp/multiple/multiple_snd/CMakeLists.txt
similarity index 73%
rename from samples/cpp/multiple/multiple_snd/src/CMakeLists.txt
rename to samples/cpp/multiple/multiple_snd/CMakeLists.txt
index c91e3ef1ea..8a126c1203 100644
--- a/samples/cpp/multiple/multiple_snd/src/CMakeLists.txt
+++ b/samples/cpp/multiple/multiple_snd/CMakeLists.txt
@@ -22,32 +22,31 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(multiple_snd_src
-  multiple_snd.cpp
-  multiple_snd_person.cpp
-  multiple_snd_vector.cpp
-  main.cpp
+    src/multiple_snd.cpp
+    src/multiple_snd_person.cpp
+    src/multiple_snd_vector.cpp
+    src/main.cpp
 )
 
 set(multiple_snd_headers
-  multiple_snd.h
-  multiple_snd_person.h
-  multiple_snd_vector.h
-  main.cpp
+    src/multiple_snd.h
+    src/multiple_snd_person.h
+    src/multiple_snd_vector.h
+    src/main.cpp
 )
 
 set(multiple_snd_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${multiple_snd_headers} ${multiple_snd_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${multiple_snd_proto})
-
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${multiple_snd_proto})
 
 target_link_libraries(${PROJECT_NAME}
   eCAL::core
-  protobuf::libprotobuf)
+  protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/performance/dynsize_snd/src/CMakeLists.txt b/samples/cpp/performance/dynsize_snd/CMakeLists.txt
similarity index 93%
rename from samples/cpp/performance/dynsize_snd/src/CMakeLists.txt
rename to samples/cpp/performance/dynsize_snd/CMakeLists.txt
index 1886ab91b1..22fbb071de 100644
--- a/samples/cpp/performance/dynsize_snd/src/CMakeLists.txt
+++ b/samples/cpp/performance/dynsize_snd/CMakeLists.txt
@@ -21,13 +21,11 @@ project(dynsize_snd)
 find_package(eCAL REQUIRED)
 
 set(dynsize_snd_src
-    dynsize_snd.cpp
+    src/dynsize_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${dynsize_snd_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/performance/performance_rec/src/CMakeLists.txt b/samples/cpp/performance/performance_rec/CMakeLists.txt
similarity index 93%
rename from samples/cpp/performance/performance_rec/src/CMakeLists.txt
rename to samples/cpp/performance/performance_rec/CMakeLists.txt
index 81af509b31..b2946a6907 100644
--- a/samples/cpp/performance/performance_rec/src/CMakeLists.txt
+++ b/samples/cpp/performance/performance_rec/CMakeLists.txt
@@ -21,11 +21,10 @@ project(performance_rec)
 find_package(eCAL REQUIRED)
 
 set(performance_rec_src
-    performance_rec.cpp
+    src/performance_rec.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${performance_rec_src})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
 
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
diff --git a/samples/cpp/performance/performance_rec_cb/src/CMakeLists.txt b/samples/cpp/performance/performance_rec_cb/CMakeLists.txt
similarity index 92%
rename from samples/cpp/performance/performance_rec_cb/src/CMakeLists.txt
rename to samples/cpp/performance/performance_rec_cb/CMakeLists.txt
index efdf714a2a..4c46ba793b 100644
--- a/samples/cpp/performance/performance_rec_cb/src/CMakeLists.txt
+++ b/samples/cpp/performance/performance_rec_cb/CMakeLists.txt
@@ -21,11 +21,10 @@ project(performance_rec_cb)
 find_package(eCAL REQUIRED)
 
 set(performance_rec_cb_src
-    performance_rec_cb.cpp
+    src/performance_rec_cb.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${performance_rec_cb_src})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
 
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
diff --git a/samples/cpp/performance/performance_snd/src/CMakeLists.txt b/samples/cpp/performance/performance_snd/CMakeLists.txt
similarity index 93%
rename from samples/cpp/performance/performance_snd/src/CMakeLists.txt
rename to samples/cpp/performance/performance_snd/CMakeLists.txt
index d617e68e58..ba92008226 100644
--- a/samples/cpp/performance/performance_snd/src/CMakeLists.txt
+++ b/samples/cpp/performance/performance_snd/CMakeLists.txt
@@ -21,13 +21,11 @@ project(performance_snd)
 find_package(eCAL REQUIRED)
 
 set(performance_snd_src
-    performance_snd.cpp
+    src/performance_snd.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${performance_snd_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/performance/pubsub_throughput/src/CMakeLists.txt b/samples/cpp/performance/pubsub_throughput/CMakeLists.txt
similarity index 92%
rename from samples/cpp/performance/pubsub_throughput/src/CMakeLists.txt
rename to samples/cpp/performance/pubsub_throughput/CMakeLists.txt
index aa4d335ddd..b6196a4fdb 100644
--- a/samples/cpp/performance/pubsub_throughput/src/CMakeLists.txt
+++ b/samples/cpp/performance/pubsub_throughput/CMakeLists.txt
@@ -21,13 +21,11 @@ project(pubsub_throughput)
 find_package(eCAL REQUIRED)
 
 set(pubsub_throughput_src
-    pubsub_throughput.cpp
+    src/pubsub_throughput.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${pubsub_throughput_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/person/person_rec/src/CMakeLists.txt b/samples/cpp/person/person_rec/CMakeLists.txt
similarity index 79%
rename from samples/cpp/person/person_rec/src/CMakeLists.txt
rename to samples/cpp/person/person_rec/CMakeLists.txt
index 780d646c07..790c37361b 100644
--- a/samples/cpp/person/person_rec/src/CMakeLists.txt
+++ b/samples/cpp/person/person_rec/CMakeLists.txt
@@ -22,21 +22,21 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_rec_src
-  person_rec.cpp
+    src/person_rec.cpp
 )
 
 set(person_rec_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${person_rec_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_rec_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_rec_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/person/person_rec_events/src/CMakeLists.txt b/samples/cpp/person/person_rec_events/CMakeLists.txt
similarity index 78%
rename from samples/cpp/person/person_rec_events/src/CMakeLists.txt
rename to samples/cpp/person/person_rec_events/CMakeLists.txt
index 88a911df2b..efa18302c9 100644
--- a/samples/cpp/person/person_rec_events/src/CMakeLists.txt
+++ b/samples/cpp/person/person_rec_events/CMakeLists.txt
@@ -22,21 +22,21 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_rec_events_src
-    person_rec_events.cpp
+    src/person_rec_events.cpp
 )
 
 set(person_rec_events_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${person_rec_events_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_rec_events_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_rec_events_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/person/person_snd/src/CMakeLists.txt b/samples/cpp/person/person_snd/CMakeLists.txt
similarity index 79%
rename from samples/cpp/person/person_snd/src/CMakeLists.txt
rename to samples/cpp/person/person_snd/CMakeLists.txt
index fde8be62f1..5cc3ae1e74 100644
--- a/samples/cpp/person/person_snd/src/CMakeLists.txt
+++ b/samples/cpp/person/person_snd/CMakeLists.txt
@@ -22,21 +22,21 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_snd_src
-  person_snd.cpp
+    src/person_snd.cpp
 )
 
 set(person_snd_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto
 )
 ecal_add_sample(${PROJECT_NAME} ${person_snd_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_snd_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_snd_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/person/person_snd_events/src/CMakeLists.txt b/samples/cpp/person/person_snd_events/CMakeLists.txt
similarity index 79%
rename from samples/cpp/person/person_snd_events/src/CMakeLists.txt
rename to samples/cpp/person/person_snd_events/CMakeLists.txt
index 3ae8503000..cec4f3d921 100644
--- a/samples/cpp/person/person_snd_events/src/CMakeLists.txt
+++ b/samples/cpp/person/person_snd_events/CMakeLists.txt
@@ -22,21 +22,21 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_snd_events_src
-  person_snd_events.cpp
+    src/person_snd_events.cpp
 )
 
 set(person_snd_events_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${person_snd_events_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_snd_events_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_snd_events_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/person/person_snd_inproc/src/CMakeLists.txt b/samples/cpp/person/person_snd_inproc/CMakeLists.txt
similarity index 78%
rename from samples/cpp/person/person_snd_inproc/src/CMakeLists.txt
rename to samples/cpp/person/person_snd_inproc/CMakeLists.txt
index 1ce3526723..8978e5edc6 100644
--- a/samples/cpp/person/person_snd_inproc/src/CMakeLists.txt
+++ b/samples/cpp/person/person_snd_inproc/CMakeLists.txt
@@ -22,22 +22,21 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_snd_inproc_src
-  person_snd_inproc.cpp
+    src/person_snd_inproc.cpp
 )
 
 set(person_snd_inproc_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
 ecal_add_sample(${PROJECT_NAME} ${person_snd_inproc_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_snd_inproc_proto})
-
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_snd_inproc_proto})
 
 target_link_libraries(${PROJECT_NAME} 
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/person/person_snd_multicast/src/CMakeLists.txt b/samples/cpp/person/person_snd_multicast/CMakeLists.txt
similarity index 78%
rename from samples/cpp/person/person_snd_multicast/src/CMakeLists.txt
rename to samples/cpp/person/person_snd_multicast/CMakeLists.txt
index f0a456c401..c866f3b640 100644
--- a/samples/cpp/person/person_snd_multicast/src/CMakeLists.txt
+++ b/samples/cpp/person/person_snd_multicast/CMakeLists.txt
@@ -22,21 +22,22 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(person_snd_multicast_src
-  person_snd_multicast.cpp
+    src/person_snd_multicast.cpp
 )
 
 set(person_snd_multicast_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto    
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto    
 )
+
 ecal_add_sample(${PROJECT_NAME} ${person_snd_multicast_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${person_snd_multicast_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${person_snd_multicast_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/pingpong/ping/src/CMakeLists.txt b/samples/cpp/pingpong/ping/CMakeLists.txt
similarity index 93%
rename from samples/cpp/pingpong/ping/src/CMakeLists.txt
rename to samples/cpp/pingpong/ping/CMakeLists.txt
index ae46e20702..c5054e59aa 100644
--- a/samples/cpp/pingpong/ping/src/CMakeLists.txt
+++ b/samples/cpp/pingpong/ping/CMakeLists.txt
@@ -21,13 +21,11 @@ project(ping)
 find_package(eCAL REQUIRED)
 
 set(ping_src
-  ping.cpp
+    src/ping.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${ping_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/pingpong/pong/src/CMakeLists.txt b/samples/cpp/pingpong/pong/CMakeLists.txt
similarity index 93%
rename from samples/cpp/pingpong/pong/src/CMakeLists.txt
rename to samples/cpp/pingpong/pong/CMakeLists.txt
index 61197fbc07..6d27c504b5 100644
--- a/samples/cpp/pingpong/pong/src/CMakeLists.txt
+++ b/samples/cpp/pingpong/pong/CMakeLists.txt
@@ -21,13 +21,11 @@ project(pong)
 find_package(eCAL REQUIRED)
 
 set(pong_src
-  pong.cpp
+    src/pong.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${pong_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} eCAL::core)
 
 ecal_install_sample(${PROJECT_NAME})
diff --git a/samples/cpp/services/ecalplayer_client/src/CMakeLists.txt b/samples/cpp/services/ecalplayer_client/CMakeLists.txt
similarity index 91%
rename from samples/cpp/services/ecalplayer_client/src/CMakeLists.txt
rename to samples/cpp/services/ecalplayer_client/CMakeLists.txt
index 69e66b2005..e7bb102b58 100644
--- a/samples/cpp/services/ecalplayer_client/src/CMakeLists.txt
+++ b/samples/cpp/services/ecalplayer_client/CMakeLists.txt
@@ -21,16 +21,15 @@ project(ecalplayer_client)
 find_package(eCAL REQUIRED)
 
 set(ecalplayer_client_src
-  ecalplayer_client.cpp
+    src/ecalplayer_client.cpp
 )
 
 ecal_add_sample(${PROJECT_NAME} ${ecalplayer_client_src})
 
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
 target_link_libraries(${PROJECT_NAME} 
-  eCAL::core
-  eCAL::pb)
+    eCAL::core
+    eCAL::pb
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/services/ecalplayer_gui_client/CMakeLists.txt b/samples/cpp/services/ecalplayer_gui_client/CMakeLists.txt
index 9271fd1de1..951f9e182c 100644
--- a/samples/cpp/services/ecalplayer_gui_client/CMakeLists.txt
+++ b/samples/cpp/services/ecalplayer_gui_client/CMakeLists.txt
@@ -31,14 +31,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 
 set(source_files
-	src/EcalplayGuiClient.cpp
-	src/EcalplayGuiClient.h
-	src/main.cpp
+    src/ecalplayer_gui_client.cpp
+    src/ecalplayer_gui_client.h
+    src/main.cpp
 )
 set(qt_resource_files
 )
 set(ui_files
-	src/MainWindow.ui
+   src/main_window.ui
 )
 
 # compile qt resource files and ui files
diff --git a/samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.cpp b/samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.cpp
similarity index 99%
rename from samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.cpp
rename to samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.cpp
index 336d8bfd87..10b1fb3ca9 100644
--- a/samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.cpp
+++ b/samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "EcalplayGuiClient.h"
+#include "ecalplayer_gui_client.h"
 
 #include <QTextStream>
 #include <QMessageBox>
diff --git a/samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.h b/samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.h
similarity index 98%
rename from samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.h
rename to samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.h
index 3b0eb5b1b9..c27931446c 100644
--- a/samples/cpp/services/ecalplayer_gui_client/src/EcalplayGuiClient.h
+++ b/samples/cpp/services/ecalplayer_gui_client/src/ecalplayer_gui_client.h
@@ -33,7 +33,7 @@
 #pragma warning(pop)
 #endif
 
-#include "ui_MainWindow.h"
+#include "ui_main_window.h"
 
 class EcalplayGuiClient : public QMainWindow
 {
@@ -54,11 +54,6 @@ private slots:
 private:
   void onPlayerResponse(const struct eCAL::SServiceInfo& service_info_, const std::string& response_);
 
-
-
-
-
-
 private:
   Ui::EcalplayGuiServiceMainWindow ui_;
 
diff --git a/samples/cpp/services/ecalplayer_gui_client/src/main.cpp b/samples/cpp/services/ecalplayer_gui_client/src/main.cpp
index f6232400a4..8e9411d76c 100644
--- a/samples/cpp/services/ecalplayer_gui_client/src/main.cpp
+++ b/samples/cpp/services/ecalplayer_gui_client/src/main.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "EcalplayGuiClient.h"
+#include "ecalplayer_gui_client.h"
 #include <QtWidgets/QApplication>
 #include <ecal/ecal.h>
 
diff --git a/samples/cpp/services/ecalplayer_gui_client/src/MainWindow.ui b/samples/cpp/services/ecalplayer_gui_client/src/main_window.ui
similarity index 100%
rename from samples/cpp/services/ecalplayer_gui_client/src/MainWindow.ui
rename to samples/cpp/services/ecalplayer_gui_client/src/main_window.ui
diff --git a/samples/cpp/services/math_client/src/CMakeLists.txt b/samples/cpp/services/math_client/CMakeLists.txt
similarity index 85%
rename from samples/cpp/services/math_client/src/CMakeLists.txt
rename to samples/cpp/services/math_client/CMakeLists.txt
index e3786b00ef..dc2ed156eb 100644
--- a/samples/cpp/services/math_client/src/CMakeLists.txt
+++ b/samples/cpp/services/math_client/CMakeLists.txt
@@ -22,20 +22,20 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(math_client_src
-  math_client.cpp
+    src/math_client.cpp
 )
 
 set(math_client_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/math.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/math.proto
 )
 
 ecal_add_sample(${PROJECT_NAME} ${math_client_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${math_client_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${math_client_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/services/math_server/src/CMakeLists.txt b/samples/cpp/services/math_server/CMakeLists.txt
similarity index 85%
rename from samples/cpp/services/math_server/src/CMakeLists.txt
rename to samples/cpp/services/math_server/CMakeLists.txt
index 35c6683bfb..fab5d87c86 100644
--- a/samples/cpp/services/math_server/src/CMakeLists.txt
+++ b/samples/cpp/services/math_server/CMakeLists.txt
@@ -22,20 +22,20 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(math_server_src
-  math_server.cpp
+    src/math_server.cpp
 )
 
 set(math_server_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/math.proto
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/math.proto
 )
 
 ecal_add_sample(${PROJECT_NAME} ${math_server_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${math_server_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${math_server_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/services/ping_client/src/CMakeLists.txt b/samples/cpp/services/ping_client/CMakeLists.txt
similarity index 85%
rename from samples/cpp/services/ping_client/src/CMakeLists.txt
rename to samples/cpp/services/ping_client/CMakeLists.txt
index e719433f2f..7f6b604f9e 100644
--- a/samples/cpp/services/ping_client/src/CMakeLists.txt
+++ b/samples/cpp/services/ping_client/CMakeLists.txt
@@ -22,20 +22,20 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(ping_client_src
-  ping_client.cpp
+    src/ping_client.cpp
 )
 
 set(ping_client_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/ping.proto  
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/ping.proto  
 )
 
 ecal_add_sample(${PROJECT_NAME} ${ping_client_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${ping_client_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${ping_client_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/cpp/services/ping_server/src/CMakeLists.txt b/samples/cpp/services/ping_server/CMakeLists.txt
similarity index 85%
rename from samples/cpp/services/ping_server/src/CMakeLists.txt
rename to samples/cpp/services/ping_server/CMakeLists.txt
index d85cbe46bb..bab066dcb3 100644
--- a/samples/cpp/services/ping_server/src/CMakeLists.txt
+++ b/samples/cpp/services/ping_server/CMakeLists.txt
@@ -22,20 +22,20 @@ find_package(eCAL REQUIRED)
 find_package(Protobuf REQUIRED)
 
 set(ping_server_src
-  ping_server.cpp
+    src/ping_server.cpp
 )
 
 set(ping_server_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/ping.proto  
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/ping.proto  
 )
 
 ecal_add_sample(${PROJECT_NAME} ${ping_server_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${ping_server_proto})
-target_include_directories(${PROJECT_NAME} PRIVATE .)
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${ping_server_proto})
 
 target_link_libraries(${PROJECT_NAME}
-  eCAL::core
-  protobuf::libprotobuf)
+    eCAL::core
+    protobuf::libprotobuf
+)
 
 ecal_install_sample(${PROJECT_NAME})
 
diff --git a/samples/csharp/minimal/minimal_rec/CMakeLists.txt b/samples/csharp/minimal/minimal_rec/CMakeLists.txt
index a31f715ed5..61a0778ef3 100644
--- a/samples/csharp/minimal/minimal_rec/CMakeLists.txt
+++ b/samples/csharp/minimal/minimal_rec/CMakeLists.txt
@@ -22,19 +22,11 @@ project(minimal_rec_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(minimal_rec_cs_src
-  App.config
-  minimal_rec.cs
+    minimal_rec.cs
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_rec_cs_src})
 
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Core)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System"
-)
-
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/minimal)
diff --git a/samples/csharp/minimal/minimal_rec/app.config b/samples/csharp/minimal/minimal_rec/app.config
deleted file mode 100644
index c5e1daefd3..0000000000
--- a/samples/csharp/minimal/minimal_rec/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/samples/csharp/minimal/minimal_rec/minimal_rec.cs b/samples/csharp/minimal/minimal_rec/minimal_rec.cs
index 93282231f2..be5c42f8eb 100644
--- a/samples/csharp/minimal/minimal_rec/minimal_rec.cs
+++ b/samples/csharp/minimal/minimal_rec/minimal_rec.cs
@@ -43,6 +43,9 @@ static void Main()
       if (message != null) System.Console.WriteLine(String.Format("Received:  {0}", message.data));
     }
 
+    // dispose subscriber
+    subscriber.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
diff --git a/samples/csharp/minimal/minimal_rec_cb/CMakeLists.txt b/samples/csharp/minimal/minimal_rec_cb/CMakeLists.txt
index 0f77b2dc33..f4746c9f63 100644
--- a/samples/csharp/minimal/minimal_rec_cb/CMakeLists.txt
+++ b/samples/csharp/minimal/minimal_rec_cb/CMakeLists.txt
@@ -22,7 +22,6 @@ project(minimal_rec_cb_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(minimal_rec_cb_cs_src
-    App.config
     minimal_rec_cb.cs
 )
 
@@ -30,11 +29,4 @@ ecal_add_sample(${PROJECT_NAME} ${minimal_rec_cb_cs_src})
 
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Core)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System"
-)
-
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/minimal)
diff --git a/samples/csharp/minimal/minimal_rec_cb/app.config b/samples/csharp/minimal/minimal_rec_cb/app.config
deleted file mode 100644
index c5e1daefd3..0000000000
--- a/samples/csharp/minimal/minimal_rec_cb/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/samples/csharp/minimal/minimal_rec_cb/minimal_rec_cb.cs b/samples/csharp/minimal/minimal_rec_cb/minimal_rec_cb.cs
index 12c99e933c..3b0dc96475 100644
--- a/samples/csharp/minimal/minimal_rec_cb/minimal_rec_cb.cs
+++ b/samples/csharp/minimal/minimal_rec_cb/minimal_rec_cb.cs
@@ -47,6 +47,9 @@ static void Main()
       System.Threading.Thread.Sleep(100);
     }
 
+    // dispose subscriber
+    subscriber.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
diff --git a/samples/csharp/minimal/minimal_snd/CMakeLists.txt b/samples/csharp/minimal/minimal_snd/CMakeLists.txt
index 2c981f32ad..944e96c519 100644
--- a/samples/csharp/minimal/minimal_snd/CMakeLists.txt
+++ b/samples/csharp/minimal/minimal_snd/CMakeLists.txt
@@ -22,19 +22,11 @@ project(minimal_snd_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(minimal_snd_cs_src
-  App.config
-  minimal_snd.cs
+    minimal_snd.cs
 )
 
 ecal_add_sample(${PROJECT_NAME} ${minimal_snd_cs_src})
 
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Core)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System"
-)
-
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/minimal)
diff --git a/samples/csharp/minimal/minimal_snd/app.config b/samples/csharp/minimal/minimal_snd/app.config
deleted file mode 100644
index c5e1daefd3..0000000000
--- a/samples/csharp/minimal/minimal_snd/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/samples/csharp/minimal/minimal_snd/minimal_snd.cs b/samples/csharp/minimal/minimal_snd/minimal_snd.cs
index 66ac8185c4..0d3cfd293a 100644
--- a/samples/csharp/minimal/minimal_snd/minimal_snd.cs
+++ b/samples/csharp/minimal/minimal_snd/minimal_snd.cs
@@ -50,6 +50,9 @@ static void Main()
       System.Threading.Thread.Sleep(100);
     }
 
+    // dispose publisher
+    publisher.Dispose();
+
     // finalize eCAL API
     Util.Terminate();
   }
diff --git a/samples/csharp/person/person_rec/CMakeLists.txt b/samples/csharp/person/person_rec/CMakeLists.txt
index 4dca2e6352..6fce8fd04a 100644
--- a/samples/csharp/person/person_rec/CMakeLists.txt
+++ b/samples/csharp/person/person_rec/CMakeLists.txt
@@ -22,7 +22,6 @@ project(person_rec_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(person_rec_cs_src
-    App.config
     person_rec.cs
 )
 
@@ -31,10 +30,10 @@ ecal_add_sample(${PROJECT_NAME} ${person_rec_cs_src})
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Protobuf person_protobufs_cs)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System.Buffers;System.Memory;System.Runtime.CompilerServices.Unsafe;Google.Protobuf"
+    VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+    VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+    VS_DOTNET_REFERENCES
+    "Google.Protobuf"
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/person)
diff --git a/samples/csharp/person/person_rec/app.config b/samples/csharp/person/person_rec/app.config
deleted file mode 100644
index 383ba5daaf..0000000000
--- a/samples/csharp/person/person_rec/app.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/samples/csharp/person/person_rec_cb/CMakeLists.txt b/samples/csharp/person/person_rec_cb/CMakeLists.txt
index d1147f198d..023d35facd 100644
--- a/samples/csharp/person/person_rec_cb/CMakeLists.txt
+++ b/samples/csharp/person/person_rec_cb/CMakeLists.txt
@@ -22,7 +22,6 @@ project(person_rec_cb_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(minimal_rec_cb_cs_src
-    App.config
     person_rec_cb.cs
 )
 
@@ -31,10 +30,10 @@ ecal_add_sample(${PROJECT_NAME} ${minimal_rec_cb_cs_src})
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Protobuf person_protobufs_cs)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System.Buffers;System.Memory;System.Runtime.CompilerServices.Unsafe;Google.Protobuf"
+    VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+    VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+    VS_DOTNET_REFERENCES
+    "Google.Protobuf"
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/person)
diff --git a/samples/csharp/person/person_rec_cb/app.config b/samples/csharp/person/person_rec_cb/app.config
deleted file mode 100644
index 03d63a4c5b..0000000000
--- a/samples/csharp/person/person_rec_cb/app.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/samples/csharp/person/person_rec_json_cb/CMakeLists.txt b/samples/csharp/person/person_rec_json_cb/CMakeLists.txt
new file mode 100644
index 0000000000..7be1e51f03
--- /dev/null
+++ b/samples/csharp/person/person_rec_json_cb/CMakeLists.txt
@@ -0,0 +1,39 @@
+# ========================= eCAL LICENSE =================================
+#
+# Copyright (C) 2016 - 2019 Continental Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ========================= eCAL LICENSE =================================
+
+include(CSharpUtilities)
+project(person_rec_json_cb_cs LANGUAGES CSharp)
+
+find_package(eCAL REQUIRED)
+
+set(minimal_rec_json_cb_cs_src
+    person_rec_json_cb.cs
+)
+
+ecal_add_sample(${PROJECT_NAME} ${minimal_rec_json_cb_cs_src})
+
+target_link_libraries(${PROJECT_NAME} Continental.eCAL.Protobuf person_protobufs_cs)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+    VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+    VS_DOTNET_REFERENCES
+    "Google.Protobuf"
+)
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/person)
diff --git a/samples/csharp/person/person_rec_json_cb/person_rec_json_cb.cs b/samples/csharp/person/person_rec_json_cb/person_rec_json_cb.cs
new file mode 100644
index 0000000000..76f37ebec5
--- /dev/null
+++ b/samples/csharp/person/person_rec_json_cb/person_rec_json_cb.cs
@@ -0,0 +1,59 @@
+/* ========================= eCAL LICENSE =================================
+ *
+ * Copyright (C) 2016 - 2019 Continental Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================= eCAL LICENSE =================================
+*/
+
+using System;
+using Continental.eCAL.Core;
+
+
+public class PersonRecJSONCb
+{
+  static void PersonCallback(String topic, JSONProtobufSubscriber.ReceiveCallbackData data)
+  {
+    System.Console.WriteLine("Topic name " + topic);
+    System.Console.WriteLine("Topic content " + data.data);
+  }
+
+  static void Main()
+  {
+    // initialize eCAL API
+    Util.Initialize("Person receive JSON callback");
+
+    // print version info
+    System.Console.WriteLine(String.Format("eCAL {0} ({1})\n", Util.GetVersion(), Util.GetDate()));
+
+    // create a subscriber (topic name "Hello", type "base:std::string")
+    JSONProtobufSubscriber subscriber = new JSONProtobufSubscriber("person");
+    JSONProtobufSubscriber.ReceiverCallback callback = PersonCallback;
+    subscriber.AddReceiveCallback(callback);
+
+    // idle main thread
+    while (Util.Ok())
+    {
+      // receive content with 100 ms timeout
+      System.Threading.Thread.Sleep(100);
+    }
+
+    // dispose subscriber
+    subscriber.Dispose();
+
+    // finalize eCAL API
+    Util.Terminate();
+  }
+}
+
diff --git a/samples/csharp/person/person_snd/CMakeLists.txt b/samples/csharp/person/person_snd/CMakeLists.txt
index 273b3d6034..ac04b53a30 100644
--- a/samples/csharp/person/person_snd/CMakeLists.txt
+++ b/samples/csharp/person/person_snd/CMakeLists.txt
@@ -22,7 +22,6 @@ project(person_snd_cs LANGUAGES CSharp)
 find_package(eCAL REQUIRED)
 
 set(person_snd_cs_src
-    App.config
     person_snd.cs
 )
 
@@ -31,10 +30,10 @@ ecal_add_sample(${PROJECT_NAME} ${person_snd_cs_src})
 target_link_libraries(${PROJECT_NAME} Continental.eCAL.Protobuf person_protobufs_cs)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System.Buffers;System.Memory;System.Runtime.CompilerServices.Unsafe;Google.Protobuf"
+    VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+    VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+    VS_DOTNET_REFERENCES
+    "Google.Protobuf"
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/person)
diff --git a/samples/csharp/person/person_snd/app.config b/samples/csharp/person/person_snd/app.config
deleted file mode 100644
index 383ba5daaf..0000000000
--- a/samples/csharp/person/person_snd/app.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/samples/csharp/person/protobuf/Animal.cs b/samples/csharp/person/protobuf/Animal.cs
index 02b2ec5e93..dc705b3353 100644
--- a/samples/csharp/person/protobuf/Animal.cs
+++ b/samples/csharp/person/protobuf/Animal.cs
@@ -1,5 +1,7 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: animal.proto
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: animal.proto
+// </auto-generated>
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -26,8 +28,8 @@ static AnimalReflection() {
             "CRIOCgZjb2xvdXIYAiABKAliBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.Animal.Dog), global::Pb.Animal.Dog.Parser, new[]{ "Name", "Colour" }, null, null, null)
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.Animal.Dog), global::Pb.Animal.Dog.Parser, new[]{ "Name", "Colour" }, null, null, null, null)
           }));
     }
     #endregion
@@ -36,6 +38,7 @@ static AnimalReflection() {
   #region Messages
   public sealed partial class Dog : pb::IMessage<Dog> {
     private static readonly pb::MessageParser<Dog> _parser = new pb::MessageParser<Dog>(() => new Dog());
+    private pb::UnknownFieldSet _unknownFields;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public static pb::MessageParser<Dog> Parser { get { return _parser; } }
 
@@ -60,6 +63,7 @@ public Dog() {
     public Dog(Dog other) : this() {
       name_ = other.name_;
       colour_ = other.colour_;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -104,7 +108,7 @@ public bool Equals(Dog other) {
       }
       if (Name != other.Name) return false;
       if (Colour != other.Colour) return false;
-      return true;
+      return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -112,6 +116,9 @@ public override int GetHashCode() {
       int hash = 1;
       if (Name.Length != 0) hash ^= Name.GetHashCode();
       if (Colour.Length != 0) hash ^= Colour.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
       return hash;
     }
 
@@ -130,6 +137,9 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(18);
         output.WriteString(Colour);
       }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -141,6 +151,9 @@ public int CalculateSize() {
       if (Colour.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Colour);
       }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
       return size;
     }
 
@@ -155,6 +168,7 @@ public void MergeFrom(Dog other) {
       if (other.Colour.Length != 0) {
         Colour = other.Colour;
       }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -163,7 +177,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       while ((tag = input.ReadTag()) != 0) {
         switch(tag) {
           default:
-            input.SkipLastField();
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 10: {
             Name = input.ReadString();
diff --git a/samples/csharp/person/protobuf/CMakeLists.txt b/samples/csharp/person/protobuf/CMakeLists.txt
index 014d80f209..85405d1c6a 100644
--- a/samples/csharp/person/protobuf/CMakeLists.txt
+++ b/samples/csharp/person/protobuf/CMakeLists.txt
@@ -22,11 +22,13 @@ project(person_protobufs_cs LANGUAGES CSharp)
 
 add_library(${PROJECT_NAME} SHARED Animal.cs House.cs Person.cs)
 
+add_dependencies(${PROJECT_NAME} Continental.eCAL.Protobuf)
+
 set_target_properties(${PROJECT_NAME} PROPERTIES
-  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
-  VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-  VS_DOTNET_REFERENCES
-  "System.Buffers;System.Memory;System.Runtime.CompilerServices.Unsafe;Google.Protobuf"
+    VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+    VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5"
+    VS_DOTNET_REFERENCES
+    "Google.Protobuf"
 )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER samples/csharp/person)
diff --git a/samples/csharp/person/protobuf/House.cs b/samples/csharp/person/protobuf/House.cs
index 7366b9b8d9..3c3c0a0f70 100644
--- a/samples/csharp/person/protobuf/House.cs
+++ b/samples/csharp/person/protobuf/House.cs
@@ -1,5 +1,7 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: house.proto
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: house.proto
+// </auto-generated>
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -26,8 +28,8 @@ static HouseReflection() {
             "bXMYASABKAViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.Environment.House), global::Pb.Environment.House.Parser, new[]{ "Rooms" }, null, null, null)
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.Environment.House), global::Pb.Environment.House.Parser, new[]{ "Rooms" }, null, null, null, null)
           }));
     }
     #endregion
@@ -36,6 +38,7 @@ static HouseReflection() {
   #region Messages
   public sealed partial class House : pb::IMessage<House> {
     private static readonly pb::MessageParser<House> _parser = new pb::MessageParser<House>(() => new House());
+    private pb::UnknownFieldSet _unknownFields;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public static pb::MessageParser<House> Parser { get { return _parser; } }
 
@@ -59,6 +62,7 @@ public House() {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public House(House other) : this() {
       rooms_ = other.rooms_;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -91,13 +95,16 @@ public bool Equals(House other) {
         return true;
       }
       if (Rooms != other.Rooms) return false;
-      return true;
+      return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
       if (Rooms != 0) hash ^= Rooms.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
       return hash;
     }
 
@@ -112,6 +119,9 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(8);
         output.WriteInt32(Rooms);
       }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -120,6 +130,9 @@ public int CalculateSize() {
       if (Rooms != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(Rooms);
       }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
       return size;
     }
 
@@ -131,6 +144,7 @@ public void MergeFrom(House other) {
       if (other.Rooms != 0) {
         Rooms = other.Rooms;
       }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -139,7 +153,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       while ((tag = input.ReadTag()) != 0) {
         switch(tag) {
           default:
-            input.SkipLastField();
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
             Rooms = input.ReadInt32();
diff --git a/samples/csharp/person/protobuf/Person.cs b/samples/csharp/person/protobuf/Person.cs
index c3ad0db555..f7bbd4b080 100644
--- a/samples/csharp/person/protobuf/Person.cs
+++ b/samples/csharp/person/protobuf/Person.cs
@@ -1,5 +1,7 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: person.proto
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: person.proto
+// </auto-generated>
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -30,8 +32,8 @@ static PersonReflection() {
             "QUxFEAASCgoGRkVNQUxFEAFiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Pb.Animal.AnimalReflection.Descriptor, global::Pb.Environment.HouseReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.People.Person), global::Pb.People.Person.Parser, new[]{ "Id", "Name", "Stype", "Email", "Dog", "House" }, null, new[]{ typeof(global::Pb.People.Person.Types.SType) }, null)
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Pb.People.Person), global::Pb.People.Person.Parser, new[]{ "Id", "Name", "Stype", "Email", "Dog", "House" }, null, new[]{ typeof(global::Pb.People.Person.Types.SType) }, null, null)
           }));
     }
     #endregion
@@ -40,6 +42,7 @@ static PersonReflection() {
   #region Messages
   public sealed partial class Person : pb::IMessage<Person> {
     private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person());
+    private pb::UnknownFieldSet _unknownFields;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public static pb::MessageParser<Person> Parser { get { return _parser; } }
 
@@ -66,8 +69,9 @@ public Person(Person other) : this() {
       name_ = other.name_;
       stype_ = other.stype_;
       email_ = other.email_;
-      Dog = other.dog_ != null ? other.Dog.Clone() : null;
-      House = other.house_ != null ? other.House.Clone() : null;
+      dog_ = other.dog_ != null ? other.dog_.Clone() : null;
+      house_ = other.house_ != null ? other.house_.Clone() : null;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -99,7 +103,7 @@ public string Name {
 
     /// <summary>Field number for the "stype" field.</summary>
     public const int StypeFieldNumber = 3;
-    private global::Pb.People.Person.Types.SType stype_ = 0;
+    private global::Pb.People.Person.Types.SType stype_ = global::Pb.People.Person.Types.SType.Male;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public global::Pb.People.Person.Types.SType Stype {
       get { return stype_; }
@@ -160,7 +164,7 @@ public bool Equals(Person other) {
       if (Email != other.Email) return false;
       if (!object.Equals(Dog, other.Dog)) return false;
       if (!object.Equals(House, other.House)) return false;
-      return true;
+      return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -168,10 +172,13 @@ public override int GetHashCode() {
       int hash = 1;
       if (Id != 0) hash ^= Id.GetHashCode();
       if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Stype != 0) hash ^= Stype.GetHashCode();
+      if (Stype != global::Pb.People.Person.Types.SType.Male) hash ^= Stype.GetHashCode();
       if (Email.Length != 0) hash ^= Email.GetHashCode();
       if (dog_ != null) hash ^= Dog.GetHashCode();
       if (house_ != null) hash ^= House.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
       return hash;
     }
 
@@ -190,7 +197,7 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(18);
         output.WriteString(Name);
       }
-      if (Stype != 0) {
+      if (Stype != global::Pb.People.Person.Types.SType.Male) {
         output.WriteRawTag(24);
         output.WriteEnum((int) Stype);
       }
@@ -206,6 +213,9 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(50);
         output.WriteMessage(House);
       }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -217,7 +227,7 @@ public int CalculateSize() {
       if (Name.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (Stype != 0) {
+      if (Stype != global::Pb.People.Person.Types.SType.Male) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Stype);
       }
       if (Email.Length != 0) {
@@ -229,6 +239,9 @@ public int CalculateSize() {
       if (house_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(House);
       }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
       return size;
     }
 
@@ -243,7 +256,7 @@ public void MergeFrom(Person other) {
       if (other.Name.Length != 0) {
         Name = other.Name;
       }
-      if (other.Stype != 0) {
+      if (other.Stype != global::Pb.People.Person.Types.SType.Male) {
         Stype = other.Stype;
       }
       if (other.Email.Length != 0) {
@@ -251,16 +264,17 @@ public void MergeFrom(Person other) {
       }
       if (other.dog_ != null) {
         if (dog_ == null) {
-          dog_ = new global::Pb.Animal.Dog();
+          Dog = new global::Pb.Animal.Dog();
         }
         Dog.MergeFrom(other.Dog);
       }
       if (other.house_ != null) {
         if (house_ == null) {
-          house_ = new global::Pb.Environment.House();
+          House = new global::Pb.Environment.House();
         }
         House.MergeFrom(other.House);
       }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -269,7 +283,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       while ((tag = input.ReadTag()) != 0) {
         switch(tag) {
           default:
-            input.SkipLastField();
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
             Id = input.ReadInt32();
@@ -280,7 +294,7 @@ public void MergeFrom(pb::CodedInputStream input) {
             break;
           }
           case 24: {
-            stype_ = (global::Pb.People.Person.Types.SType) input.ReadEnum();
+            Stype = (global::Pb.People.Person.Types.SType) input.ReadEnum();
             break;
           }
           case 34: {
@@ -289,16 +303,16 @@ public void MergeFrom(pb::CodedInputStream input) {
           }
           case 42: {
             if (dog_ == null) {
-              dog_ = new global::Pb.Animal.Dog();
+              Dog = new global::Pb.Animal.Dog();
             }
-            input.ReadMessage(dog_);
+            input.ReadMessage(Dog);
             break;
           }
           case 50: {
             if (house_ == null) {
-              house_ = new global::Pb.Environment.House();
+              House = new global::Pb.Environment.House();
             }
-            input.ReadMessage(house_);
+            input.ReadMessage(House);
             break;
           }
         }
diff --git a/samples/csharp/person/protobuf/packages.config.in b/samples/csharp/person/protobuf/packages.config.in
index c04349cc02..debc1b605d 100644
--- a/samples/csharp/person/protobuf/packages.config.in
+++ b/samples/csharp/person/protobuf/packages.config.in
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Google.Protobuf" version="3.5.1" targetFramework="net45" />
+  <package id="Google.Protobuf" version="3.11.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/testing/contrib/ecalhdf5/hdf5_test/src/CMakeLists.txt b/testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt
similarity index 98%
rename from testing/contrib/ecalhdf5/hdf5_test/src/CMakeLists.txt
rename to testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt
index 557c48c71d..a4d59a06ae 100644
--- a/testing/contrib/ecalhdf5/hdf5_test/src/CMakeLists.txt
+++ b/testing/contrib/ecalhdf5/hdf5_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(hdf5_test_src
-  hdf5_test.cpp
+  src/hdf5_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${hdf5_test_src})
diff --git a/testing/contrib/ecalproto/dynproto_test/src/CMakeLists.txt b/testing/contrib/ecalproto/dynproto_test/CMakeLists.txt
similarity index 81%
rename from testing/contrib/ecalproto/dynproto_test/src/CMakeLists.txt
rename to testing/contrib/ecalproto/dynproto_test/CMakeLists.txt
index 8836db8773..418676f8c3 100644
--- a/testing/contrib/ecalproto/dynproto_test/src/CMakeLists.txt
+++ b/testing/contrib/ecalproto/dynproto_test/CMakeLists.txt
@@ -25,18 +25,18 @@ find_package(Protobuf REQUIRED)
 create_targets_protobuf()
 
 set(dynproto_test_src
-  dynproto_test.cpp
+  src/dynproto_test.cpp
 )
 
 set(test_dynproto_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/attitude.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/attitude.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${dynproto_test_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${${PROJECT_NAME}_proto})
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${${PROJECT_NAME}_proto})
 
 target_link_libraries(${PROJECT_NAME}
   PRIVATE
diff --git a/testing/contrib/ecalproto/ecal_proto_test/src/CMakeLists.txt b/testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt
similarity index 85%
rename from testing/contrib/ecalproto/ecal_proto_test/src/CMakeLists.txt
rename to testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt
index 181b6fd58c..34adcbd57c 100644
--- a/testing/contrib/ecalproto/ecal_proto_test/src/CMakeLists.txt
+++ b/testing/contrib/ecalproto/ecal_proto_test/CMakeLists.txt
@@ -25,17 +25,17 @@ find_package(Protobuf REQUIRED)
 create_targets_protobuf()
 
 set(ecal_proto_test_src
-  test_filters.cpp
+  src/test_filters.cpp
 )
 
 set(${PROJECT_NAME}_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${ecal_proto_test_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${${PROJECT_NAME}_proto})
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${${PROJECT_NAME}_proto})
 
 target_link_libraries(${PROJECT_NAME}
   PRIVATE
diff --git a/testing/ecal/clientserver_test/src/CMakeLists.txt b/testing/ecal/clientserver_test/CMakeLists.txt
similarity index 88%
rename from testing/ecal/clientserver_test/src/CMakeLists.txt
rename to testing/ecal/clientserver_test/CMakeLists.txt
index 092240a79d..f9115f30e8 100644
--- a/testing/ecal/clientserver_test/src/CMakeLists.txt
+++ b/testing/ecal/clientserver_test/CMakeLists.txt
@@ -25,16 +25,16 @@ find_package(Protobuf REQUIRED)
 create_targets_protobuf()
 
 set(clientserver_test_src
-  clientserver_test.cpp
+  src/clientserver_test.cpp
 )
 
 set(clientserver_test_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/math.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/ping.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/math.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/ping.proto
 )
 
-ecal_add_static_library(clientserver_proto dummy.cpp)
-PROTOBUF_TARGET_CPP(clientserver_proto ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${clientserver_test_proto})
+ecal_add_static_library(clientserver_proto src/dummy.cpp)
+PROTOBUF_TARGET_CPP(clientserver_proto ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${clientserver_test_proto})
 target_link_libraries(clientserver_proto PRIVATE protobuf::libprotobuf)
 set_property(TARGET clientserver_proto PROPERTY FOLDER testing/ecal/service)
 
diff --git a/testing/ecal/core_test/src/CMakeLists.txt b/testing/ecal/core_test/CMakeLists.txt
similarity index 98%
rename from testing/ecal/core_test/src/CMakeLists.txt
rename to testing/ecal/core_test/CMakeLists.txt
index 9b5be6d1c4..a609084965 100644
--- a/testing/ecal/core_test/src/CMakeLists.txt
+++ b/testing/ecal/core_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(core_test_src
-  core_test.cpp
+  src/core_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME}_cpp ${core_test_src})
diff --git a/testing/ecal/event_test/src/CMakeLists.txt b/testing/ecal/event_test/CMakeLists.txt
similarity index 98%
rename from testing/ecal/event_test/src/CMakeLists.txt
rename to testing/ecal/event_test/CMakeLists.txt
index 9927afc985..2b5144e704 100644
--- a/testing/ecal/event_test/src/CMakeLists.txt
+++ b/testing/ecal/event_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(event_test_src
-  event_test.cpp
+  src/event_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${event_test_src})
diff --git a/testing/ecal/expmap_test/src/CMakeLists.txt b/testing/ecal/expmap_test/CMakeLists.txt
similarity index 98%
rename from testing/ecal/expmap_test/src/CMakeLists.txt
rename to testing/ecal/expmap_test/CMakeLists.txt
index 36ec9c173e..357dd81e6b 100644
--- a/testing/ecal/expmap_test/src/CMakeLists.txt
+++ b/testing/ecal/expmap_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(expmap_test_src
-  expmap_test.cpp
+  src/expmap_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${expmap_test_src})
diff --git a/testing/ecal/io_memfile_test/src/CMakeLists.txt b/testing/ecal/io_memfile_test/CMakeLists.txt
similarity index 87%
rename from testing/ecal/io_memfile_test/src/CMakeLists.txt
rename to testing/ecal/io_memfile_test/CMakeLists.txt
index 4742889982..591bee5fe6 100644
--- a/testing/ecal/io_memfile_test/src/CMakeLists.txt
+++ b/testing/ecal/io_memfile_test/CMakeLists.txt
@@ -21,19 +21,19 @@ project(test_memfile)
 find_package(GTest REQUIRED)
 
 set(memfile_test_src
-    memfile_test.cpp
-    ../../../../ecal/core/src/io/ecal_memfile.cpp
+    src/memfile_test.cpp
+    ../../../ecal/core/src/io/ecal_memfile.cpp
 )
 
 if(UNIX)
 set(memfile_test_linux_src
-    ../../../../ecal/core/src/io/linux/ecal_memfile_linux.cpp
+    ../../../ecal/core/src/io/linux/ecal_memfile_linux.cpp
 )
 endif()
 
 if(WIN32)
 set(memfile_test_linux_src
-    ../../../../ecal/core/src/io/win32/ecal_memfile_win32.cpp
+    ../../../ecal/core/src/io/win32/ecal_memfile_win32.cpp
 )
 endif()
 
diff --git a/testing/ecal/pubsub_inproc_test/src/CMakeLists.txt b/testing/ecal/pubsub_inproc_test/CMakeLists.txt
similarity index 98%
rename from testing/ecal/pubsub_inproc_test/src/CMakeLists.txt
rename to testing/ecal/pubsub_inproc_test/CMakeLists.txt
index 9ff34510ac..9d20112e5c 100644
--- a/testing/ecal/pubsub_inproc_test/src/CMakeLists.txt
+++ b/testing/ecal/pubsub_inproc_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(pubsub_inproc_test_src
-  pubsub_inproc_test.cpp
+  src/pubsub_inproc_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME}_cpp ${pubsub_inproc_test_src})
diff --git a/testing/ecal/pubsub_proto_test/src/CMakeLists.txt b/testing/ecal/pubsub_proto_test/CMakeLists.txt
similarity index 82%
rename from testing/ecal/pubsub_proto_test/src/CMakeLists.txt
rename to testing/ecal/pubsub_proto_test/CMakeLists.txt
index 172163d125..a4c9eb208f 100644
--- a/testing/ecal/pubsub_proto_test/src/CMakeLists.txt
+++ b/testing/ecal/pubsub_proto_test/CMakeLists.txt
@@ -25,18 +25,18 @@ find_package(Protobuf REQUIRED)
 create_targets_protobuf()
 
 set(${PROJECT_NAME}_src
-  proto_publisher_test.cpp
-  proto_subscriber_test.cpp
+  src/proto_publisher_test.cpp
+  src/proto_subscriber_test.cpp
 )
 
 set(pubsub_proto_test_proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/animal.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/house.proto
-  ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/person.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/animal.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/house.proto
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf/person.proto
 )
 
 ecal_add_gtest(${PROJECT_NAME} ${${PROJECT_NAME}_src})
-PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/protobuf ${pubsub_proto_test_proto})
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/protobuf ${pubsub_proto_test_proto})
 
 target_link_libraries(${PROJECT_NAME}
   PRIVATE
diff --git a/testing/ecal/pubsub_test/src/CMakeLists.txt b/testing/ecal/pubsub_test/CMakeLists.txt
similarity index 98%
rename from testing/ecal/pubsub_test/src/CMakeLists.txt
rename to testing/ecal/pubsub_test/CMakeLists.txt
index 3307d91137..3c1fbcc8b0 100644
--- a/testing/ecal/pubsub_test/src/CMakeLists.txt
+++ b/testing/ecal/pubsub_test/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
 
 set(pubsub_test_src
-  pubsub_test.cpp
+  src/pubsub_test.cpp
 )
 
 ecal_add_gtest(${PROJECT_NAME}_cpp ${pubsub_test_src})
diff --git a/thirdparty/asio b/thirdparty/asio
index b3d2ab7255..8d4c8c3ce4 160000
--- a/thirdparty/asio
+++ b/thirdparty/asio
@@ -1 +1 @@
-Subproject commit b3d2ab7255fabe46a49b24a584c9fd797c8248e5
+Subproject commit 8d4c8c3ce43c866f609d2eda9a43fe5b334620be
diff --git a/thirdparty/cmake_functions/protoc_functions/protoc_generate_cpp.cmake b/thirdparty/cmake_functions/protoc_functions/protoc_generate_cpp.cmake
index 1d96527821..7d96325461 100644
--- a/thirdparty/cmake_functions/protoc_functions/protoc_generate_cpp.cmake
+++ b/thirdparty/cmake_functions/protoc_functions/protoc_generate_cpp.cmake
@@ -23,9 +23,16 @@ function(PROTOBUF_GENERATE_CPP_EXT SRCS_RET HDRS_RET PROTO_OUT_DIR_RET PROTO_ROO
   endif()
   
   #Backwards compatability
-  if (DEFINED PROTOBUF_PROTOC_EXECUTABLE AND NOT DEFINED Protobuf_PROTOC_EXECUTABLE)
-    set(Protobuf_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
-  endif (DEFINED PROTOBUF_PROTOC_EXECUTABLE AND NOT DEFINED Protobuf_PROTOC_EXECUTABLE)
+  if (NOT TARGET protobuf::protoc)
+    if (Protobuf_PROTOC_EXECUTABLE)
+      ADD_EXECUTABLE(protobuf::protoc IMPORTED)
+      SET_TARGET_PROPERTIES(protobuf::protoc PROPERTIES
+        IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}"
+      )
+    else ()
+      message(FATAL_ERROR "Neither protobuf::protoc not the $(Protobuf_PROTOC_EXECUTABLE) variable is defined. Cannot generate protobuf files.")
+    endif ()     	
+  endif ()
 
   set(PROTO_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf")
   file(MAKE_DIRECTORY ${PROTO_OUT_DIR})  
@@ -45,10 +52,10 @@ function(PROTOBUF_GENERATE_CPP_EXT SRCS_RET HDRS_RET PROTO_OUT_DIR_RET PROTO_ROO
     add_custom_command(
       OUTPUT "${PROTO_OUT_DIR}/${REL_FIL_WE}.pb.cc"
              "${PROTO_OUT_DIR}/${REL_FIL_WE}.pb.h"
-      COMMAND ${Protobuf_PROTOC_EXECUTABLE}
+      COMMAND protobuf::protoc
       ARGS "--proto_path=${PROTO_ROOT}" "--cpp_out=${PROTO_OUT_DIR}" ${ABS_FIL}
-      DEPENDS ${ABS_FIL} ${Protobuf_PROTOC_EXECUTABLE}
-      COMMENT "Running C++ protocol buffer compiler on ${ABS_FIL} ${Protobuf_PROTOC_EXECUTABLE}"
+      DEPENDS ${ABS_FIL} protobuf::protoc
+      COMMENT "Running C++ protocol buffer compiler on ${ABS_FIL}"
       VERBATIM )
 
   endforeach()
diff --git a/thirdparty/protobuf b/thirdparty/protobuf
index 106ffc04be..d0bfd52211 160000
--- a/thirdparty/protobuf
+++ b/thirdparty/protobuf
@@ -1 +1 @@
-Subproject commit 106ffc04be1abf3ff3399f54ccf149815b287dd9
+Subproject commit d0bfd5221182da1a7cc280f3337b5e41a89539cf