From f46f017b425ada9027990cee49cf5a7bf59bcbd3 Mon Sep 17 00:00:00 2001
From: Simon Hoinkis <simon.hoinkis@apex.ai>
Date: Wed, 16 Dec 2020 19:41:28 +0100
Subject: [PATCH 1/5] iox-#356 Fix wrong time for iceoryx developer meetup

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
---
 GOVERNANCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 5c18db5c1a..1dcbd96445 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -18,7 +18,7 @@ You can join by using this Zoom link: https://eclipse.zoom.us/j/95918504483?pwd=
 16:00 GMT
 17:00 CET (GMT + 1)
 21:30 IST (GMT + 5.5)
-23:00 CST (GMT + 7)
+00:00 CST (GMT + 8)
 ```
 
 ### Topics

From bbc917ef4d21a59b15e9ad0f4ca30fe204e8ba3a Mon Sep 17 00:00:00 2001
From: Simon Hoinkis <simon.hoinkis@apex.ai>
Date: Wed, 16 Dec 2020 22:14:22 +0100
Subject: [PATCH 2/5] iox-#356 Move new publisher and subscriber out of
 modern_api directory

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
---
 iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp      | 2 +-
 iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp      | 2 +-
 iceoryx_dds/test/mocks/google_mocks.hpp                     | 4 ++--
 iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp | 2 +-
 .../icedelivery/iox_publisher_untyped_modern.cpp            | 4 ++--
 .../icedelivery/iox_subscriber_typed_modern.cpp             | 6 +++---
 .../icedelivery/iox_subscriber_untyped_modern.cpp           | 2 +-
 iceoryx_examples/iceperf/iceoryx.hpp                        | 4 ++--
 iceoryx_examples/singleprocess/single_process.cpp           | 4 ++--
 iceoryx_examples/waitset/ice_waitset_gateway.cpp            | 2 +-
 iceoryx_examples/waitset/ice_waitset_grouping.cpp           | 2 +-
 iceoryx_examples/waitset/ice_waitset_individual.cpp         | 2 +-
 iceoryx_examples/waitset/ice_waitset_publisher.cpp          | 2 +-
 iceoryx_examples/waitset/ice_waitset_sync.cpp               | 2 +-
 .../internal/popo/{modern_api => }/base_publisher.inl       | 0
 .../internal/popo/{modern_api => }/base_subscriber.inl      | 0
 .../iceoryx_posh/internal/popo/{modern_api => }/sample.inl  | 0
 .../internal/popo/{modern_api => }/typed_publisher.inl      | 0
 .../internal/popo/{modern_api => }/typed_subscriber.inl     | 0
 .../internal/popo/{modern_api => }/untyped_publisher.inl    | 0
 .../internal/popo/{modern_api => }/untyped_subscriber.inl   | 0
 .../iceoryx_posh/popo/{modern_api => }/base_publisher.hpp   | 4 ++--
 .../iceoryx_posh/popo/{modern_api => }/base_subscriber.hpp  | 4 ++--
 .../iceoryx_posh/popo/{modern_api => }/publisher.hpp        | 4 ++--
 .../include/iceoryx_posh/popo/{modern_api => }/sample.hpp   | 2 +-
 .../iceoryx_posh/popo/{modern_api => }/subscriber.hpp       | 4 ++--
 .../iceoryx_posh/popo/{modern_api => }/typed_publisher.hpp  | 6 +++---
 .../iceoryx_posh/popo/{modern_api => }/typed_subscriber.hpp | 4 ++--
 .../popo/{modern_api => }/untyped_publisher.hpp             | 6 +++---
 .../popo/{modern_api => }/untyped_subscriber.hpp            | 4 ++--
 iceoryx_posh/test/mocks/publisher_mock.hpp                  | 4 ++--
 iceoryx_posh/test/mocks/subscriber_mock.hpp                 | 4 ++--
 iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp  | 2 +-
 iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp | 2 +-
 iceoryx_posh/test/moduletests/test_popo_sample.cpp          | 4 ++--
 iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp | 2 +-
 .../test/moduletests/test_popo_typed_subscriber.cpp         | 2 +-
 .../test/moduletests/test_popo_untyped_publisher.cpp        | 2 +-
 .../test/moduletests/test_popo_untyped_subscriber.cpp       | 2 +-
 .../include/iceoryx_introspection/introspection_app.hpp     | 2 +-
 40 files changed, 52 insertions(+), 52 deletions(-)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/base_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/base_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/sample.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/typed_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/typed_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/untyped_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/internal/popo/{modern_api => }/untyped_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/base_publisher.hpp (97%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/base_subscriber.hpp (98%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/publisher.hpp (85%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/sample.hpp (98%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/subscriber.hpp (85%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/typed_publisher.hpp (93%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/typed_subscriber.hpp (94%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/untyped_publisher.hpp (91%)
 rename iceoryx_posh/include/iceoryx_posh/popo/{modern_api => }/untyped_subscriber.hpp (94%)

diff --git a/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp b/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp
index b344b2445d..f79c881e9a 100644
--- a/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp
+++ b/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp
@@ -19,7 +19,7 @@
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_config.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 
 namespace iox
 {
diff --git a/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp b/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp
index 70221e935c..3a49b8da22 100644
--- a/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp
+++ b/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp
@@ -18,7 +18,7 @@
 #include "iceoryx_dds/dds/dds_types.hpp"
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 namespace iox
 {
diff --git a/iceoryx_dds/test/mocks/google_mocks.hpp b/iceoryx_dds/test/mocks/google_mocks.hpp
index e01c2ac735..79b2e06bd8 100644
--- a/iceoryx_dds/test/mocks/google_mocks.hpp
+++ b/iceoryx_dds/test/mocks/google_mocks.hpp
@@ -20,8 +20,8 @@
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/function_ref.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
diff --git a/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp b/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
index 5ff596c0b7..643d7c39fb 100644
--- a/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
+++ b/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>
diff --git a/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp b/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
index 0d9d259d0a..1f017a57a3 100644
--- a/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
+++ b/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>
diff --git a/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp b/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp
index 10a3f72d4e..35092871b6 100644
--- a/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp
+++ b/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp b/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp
index bb0fccaec1..8116e50f24 100644
--- a/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp
+++ b/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/subscriber.hpp"
+#include "iceoryx_posh/popo/subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_examples/iceperf/iceoryx.hpp b/iceoryx_examples/iceperf/iceoryx.hpp
index 1c8b1c2972..60a7c03e98 100644
--- a/iceoryx_examples/iceperf/iceoryx.hpp
+++ b/iceoryx_examples/iceperf/iceoryx.hpp
@@ -16,8 +16,8 @@
 
 #include "base.hpp"
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 class Iceoryx : public IcePerfBase
 {
diff --git a/iceoryx_examples/singleprocess/single_process.cpp b/iceoryx_examples/singleprocess/single_process.cpp
index 29bef6841e..7de958017d 100644
--- a/iceoryx_examples/singleprocess/single_process.cpp
+++ b/iceoryx_examples/singleprocess/single_process.cpp
@@ -15,8 +15,8 @@
 #include "iceoryx_posh/iceoryx_posh_config.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/roudi/roudi.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/roudi/iceoryx_roudi_components.hpp"
 #include "iceoryx_posh/runtime/posh_runtime_single_process.hpp"
 #include "iceoryx_utils/log/logmanager.hpp"
diff --git a/iceoryx_examples/waitset/ice_waitset_gateway.cpp b/iceoryx_examples/waitset/ice_waitset_gateway.cpp
index af50190191..ed9a2024a6 100644
--- a/iceoryx_examples/waitset/ice_waitset_gateway.cpp
+++ b/iceoryx_examples/waitset/ice_waitset_gateway.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_examples/waitset/ice_waitset_grouping.cpp b/iceoryx_examples/waitset/ice_waitset_grouping.cpp
index 92f1adc3c8..edbb3d373e 100644
--- a/iceoryx_examples/waitset/ice_waitset_grouping.cpp
+++ b/iceoryx_examples/waitset/ice_waitset_grouping.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_examples/waitset/ice_waitset_individual.cpp b/iceoryx_examples/waitset/ice_waitset_individual.cpp
index 3026094bb3..36a6581d4c 100644
--- a/iceoryx_examples/waitset/ice_waitset_individual.cpp
+++ b/iceoryx_examples/waitset/ice_waitset_individual.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_examples/waitset/ice_waitset_publisher.cpp b/iceoryx_examples/waitset/ice_waitset_publisher.cpp
index d14aad0f04..b3183264b9 100644
--- a/iceoryx_examples/waitset/ice_waitset_publisher.cpp
+++ b/iceoryx_examples/waitset/ice_waitset_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 
diff --git a/iceoryx_examples/waitset/ice_waitset_sync.cpp b/iceoryx_examples/waitset/ice_waitset_sync.cpp
index 18ba6671bd..d819232974 100644
--- a/iceoryx_examples/waitset/ice_waitset_sync.cpp
+++ b/iceoryx_examples/waitset/ice_waitset_sync.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/base_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/sample.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/sample.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/typed_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/typed_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/typed_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/typed_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/untyped_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/untyped_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/untyped_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/untyped_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/base_publisher.hpp
similarity index 97%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/base_publisher.hpp
index 8b32dc0c42..94e37c3160 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/base_publisher.hpp
@@ -16,7 +16,7 @@
 #define IOX_POSH_POPO_BASE_PUBLISHER_HPP
 
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
 
@@ -148,6 +148,6 @@ class BasePublisher : public PublisherInterface<T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/base_publisher.inl"
+#include "iceoryx_posh/internal/popo/base_publisher.inl"
 
 #endif // IOX_POSH_POPO_BASE_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/base_subscriber.hpp
similarity index 98%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/base_subscriber.hpp
index 48f5519b5d..f067d149d5 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/base_subscriber.hpp
@@ -16,7 +16,7 @@
 #define IOX_POSH_POPO_BASE_SUBSCRIBER_HPP
 
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
@@ -174,6 +174,6 @@ class BaseSubscriber
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/base_subscriber.inl"
+#include "iceoryx_posh/internal/popo/base_subscriber.inl"
 
 #endif // IOX_POSH_POPO_BASE_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/publisher.hpp
similarity index 85%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/publisher.hpp
index 9f109fd136..ca25487aa4 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/publisher.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_PUBLISHER_HPP
 #define IOX_POSH_POPO_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 
 #endif // IOX_POSH_POPO_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp b/iceoryx_posh/include/iceoryx_posh/popo/sample.hpp
similarity index 98%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/sample.hpp
index d739b6b98e..a70bdb8486 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/sample.hpp
@@ -106,6 +106,6 @@ class Sample<const T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/sample.inl"
+#include "iceoryx_posh/internal/popo/sample.inl"
 
 #endif // IOX_POSH_POPO_SAMPLE_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp
similarity index 85%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp
index be2a454ae4..c98e19f0c6 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_SUBSCRIBER_HPP
 #define IOX_POSH_POPO_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 #endif // IOX_POSH_POPO_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/typed_publisher.hpp
similarity index 93%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/typed_publisher.hpp
index 944e3b37f1..0a50e14584 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/typed_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_POSH_POPO_TYPED_PUBLISHER_HPP
 #define IOX_POSH_POPO_TYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/type_traits.hpp"
 
 namespace iox
@@ -66,6 +66,6 @@ class TypedPublisher : public base_publisher_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/typed_publisher.inl"
+#include "iceoryx_posh/internal/popo/typed_publisher.inl"
 
 #endif // IOX_POSH_POPO_TYPED_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/typed_subscriber.hpp
similarity index 94%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/typed_subscriber.hpp
index e5e7549b69..1b9b285f4a 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/typed_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
 #define IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 
 namespace iox
 {
@@ -52,6 +52,6 @@ class TypedSubscriber : public base_subscriber_t<T, TypedSubscriber<T, base_subs
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl"
+#include "iceoryx_posh/internal/popo/typed_subscriber.inl"
 
 #endif // IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/untyped_publisher.hpp
similarity index 91%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/untyped_publisher.hpp
index c95d5ddb20..c1efacb617 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/untyped_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
 #define IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 
 namespace iox
 {
@@ -56,6 +56,6 @@ using UntypedPublisher = UntypedPublisherImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl"
+#include "iceoryx_posh/internal/popo/untyped_publisher.inl"
 
 #endif // IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/untyped_subscriber.hpp
similarity index 94%
rename from iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/untyped_subscriber.hpp
index d3b5b2b502..a6a2b22b0a 100644
--- a/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/untyped_subscriber.hpp
@@ -17,7 +17,7 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 
@@ -63,6 +63,6 @@ using UntypedSubscriber = UntypedSubscriberImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl"
+#include "iceoryx_posh/internal/popo/untyped_subscriber.inl"
 
 #endif // IOX_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/test/mocks/publisher_mock.hpp b/iceoryx_posh/test/mocks/publisher_mock.hpp
index 81f70f717d..541af894df 100644
--- a/iceoryx_posh/test/mocks/publisher_mock.hpp
+++ b/iceoryx_posh/test/mocks/publisher_mock.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/mocks/subscriber_mock.hpp b/iceoryx_posh/test/mocks/subscriber_mock.hpp
index 66dfa172e2..e355aa5009 100644
--- a/iceoryx_posh/test/mocks/subscriber_mock.hpp
+++ b/iceoryx_posh/test/mocks/subscriber_mock.hpp
@@ -14,8 +14,8 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_posh/popo/trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
index fb6808a0f9..0939847ab8 100644
--- a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 
diff --git a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
index 21b228bb4b..1ffb348767 100644
--- a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
@@ -14,7 +14,7 @@
 
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_sample.cpp b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
index 8731abb631..fd6db2cafc 100644
--- a/iceoryx_posh/test/moduletests/test_popo_sample.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 #include "test.hpp"
 
diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
index afe9743a08..1a93f06d7a 100644
--- a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 
diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
index bed4cfca03..0c6638f2cc 100644
--- a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
index 7ab286efbb..066ef3062c 100644
--- a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 
diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
index 707d3f4f5f..bc84d38875 100644
--- a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"
diff --git a/tools/introspection/include/iceoryx_introspection/introspection_app.hpp b/tools/introspection/include/iceoryx_introspection/introspection_app.hpp
index 21cd8a152a..1d0fec1fad 100644
--- a/tools/introspection/include/iceoryx_introspection/introspection_app.hpp
+++ b/tools/introspection/include/iceoryx_introspection/introspection_app.hpp
@@ -15,7 +15,7 @@
 #define IOX_TOOLS_ICEORYX_INTROSPECTION_INTROSPECTION_APP_HPP
 
 #include "iceoryx_introspection/introspection_types.hpp"
-#include "iceoryx_posh/popo/modern_api/subscriber.hpp"
+#include "iceoryx_posh/popo/subscriber.hpp"
 #include "iceoryx_utils/platform/getopt.hpp"
 
 #include <map>

From c51faaf806da12f441fce5076464512d26c3d578 Mon Sep 17 00:00:00 2001
From: Simon Hoinkis <simon.hoinkis@apex.ai>
Date: Thu, 17 Dec 2020 08:41:11 +0100
Subject: [PATCH 3/5] iox-#91 Address left-over review finding

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
---
 .../source/posix_wrapper/shared_memory_object/memory_map.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iceoryx_utils/source/posix_wrapper/shared_memory_object/memory_map.cpp b/iceoryx_utils/source/posix_wrapper/shared_memory_object/memory_map.cpp
index 34cb54af0f..cee7e90c38 100644
--- a/iceoryx_utils/source/posix_wrapper/shared_memory_object/memory_map.cpp
+++ b/iceoryx_utils/source/posix_wrapper/shared_memory_object/memory_map.cpp
@@ -47,7 +47,7 @@ MemoryMap::MemoryMap(const void* f_baseAddressHint,
                      const off_t f_offset)
     : m_length(f_length)
 {
-    int32_t l_memoryProtection{0};
+    int32_t l_memoryProtection{PROT_NONE};
     switch (f_accessMode)
     {
     case AccessMode::readOnly:

From d6e20380329737fd0525e790008020b7ba556051 Mon Sep 17 00:00:00 2001
From: Simon Hoinkis <simon.hoinkis@apex.ai>
Date: Thu, 17 Dec 2020 09:13:45 +0100
Subject: [PATCH 4/5] iox-#252 Fix includes in new example

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
---
 iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp | 2 +-
 iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp    | 2 +-
 iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp b/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp
index 66aad088e4..4e4632c126 100644
--- a/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp
+++ b/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 
diff --git a/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp b/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp
index 5ea7f4235c..fbc9246e87 100644
--- a/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp
+++ b/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 
diff --git a/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp b/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp
index 08b33b9e31..8b9ea32128 100644
--- a/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp
+++ b/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 

From a9db29bc38b4b7cbec63584fc0b6f442c48f2f95 Mon Sep 17 00:00:00 2001
From: Simon Hoinkis <simon.hoinkis@apex.ai>
Date: Thu, 17 Dec 2020 09:24:33 +0100
Subject: [PATCH 5/5] iox-#252 Fix Windows build

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
---
 .../platform/win/include/iceoryx_utils/platform/mman.hpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iceoryx_utils/platform/win/include/iceoryx_utils/platform/mman.hpp b/iceoryx_utils/platform/win/include/iceoryx_utils/platform/mman.hpp
index bb0c3c4651..7bb1093d44 100644
--- a/iceoryx_utils/platform/win/include/iceoryx_utils/platform/mman.hpp
+++ b/iceoryx_utils/platform/win/include/iceoryx_utils/platform/mman.hpp
@@ -24,9 +24,9 @@
 #include <string>
 #include <sys/stat.h>
 
-
 #define MAP_SHARED 0
 #define MAP_FAILED 1
+#define PROT_NONE 0
 #define PROT_READ 3
 #define PROT_WRITE 4