diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 00000000..cdf90154
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,5 @@
+ignore:
+  - "*/untests/*"
+  - "*/samples/*"
+  - "*/3rdparty/*"
+  - "*/modules/*"
diff --git a/README.md b/README.md
index 3e3085d8..a2054cb8 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@
 [![license][badge.license]][license]
 [![paypal][badge.paypal]][paypal]
 
-[badge.travis]: https://img.shields.io/travis/enduro2d/enduro2d/master.svg?logo=travis&style=for-the-badge
-[badge.appveyor]: https://img.shields.io/appveyor/ci/BlackMATov/enduro2d/master.svg?logo=appveyor&style=for-the-badge
+[badge.travis]: https://img.shields.io/travis/enduro2d/enduro2d/master.svg?logo=travis
+[badge.appveyor]: https://img.shields.io/appveyor/ci/BlackMATov/enduro2d/master.svg?logo=appveyor
 [badge.codecov]: https://img.shields.io/codecov/c/github/enduro2d/enduro2d/master.svg?logo=codecov
-[badge.language]: https://img.shields.io/badge/language-C%2B%2B14-red.svg?style=for-the-badge
-[badge.license]: https://img.shields.io/badge/license-MIT-blue.svg?style=for-the-badge
-[badge.paypal]: https://img.shields.io/badge/donate-PayPal-orange.svg?logo=paypal&colorA=00457C&style=for-the-badge
+[badge.language]: https://img.shields.io/badge/language-C%2B%2B14-red.svg
+[badge.license]: https://img.shields.io/badge/license-MIT-blue.svg
+[badge.paypal]: https://img.shields.io/badge/donate-PayPal-orange.svg?logo=paypal&colorA=00457C
 
 [travis]: https://travis-ci.org/enduro2d/enduro2d
 [appveyor]: https://ci.appveyor.com/project/BlackMATov/enduro2d
diff --git a/headers/enduro2d/base/_base.hpp b/headers/enduro2d/base/_base.hpp
index b183f366..15a0b513 100644
--- a/headers/enduro2d/base/_base.hpp
+++ b/headers/enduro2d/base/_base.hpp
@@ -43,6 +43,7 @@
 #include <functional>
 #include <type_traits>
 
+#include <3rdparty/ecs.hpp/ecs.hpp>
 #include <3rdparty/variant/variant.hpp>
 #include <3rdparty/promise.hpp/invoke.hpp>
 #include <3rdparty/promise.hpp/jobber.hpp>
diff --git a/headers/enduro2d/base/stdex.hpp b/headers/enduro2d/base/stdex.hpp
index 5dd6b629..25efc9bc 100644
--- a/headers/enduro2d/base/stdex.hpp
+++ b/headers/enduro2d/base/stdex.hpp
@@ -17,6 +17,15 @@ namespace e2d { namespace stdex
     using namespace mpark;
 }}
 
+//
+// https://github.com/blackmatov/ecs.hpp
+//
+
+namespace e2d { namespace stdex
+{
+    using namespace ecs_hpp;
+}}
+
 //
 // https://github.com/blackmatov/promise.hpp
 //
diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 4e7ce918..198351a8 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -13,3 +13,4 @@
 #include "library.inl"
 #include "scene.hpp"
 #include "starter.hpp"
+#include "world.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index e37bb868..e862d884 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -31,4 +31,5 @@ namespace e2d
     class node;
     class scene;
     class starter;
+    class world;
 }
diff --git a/headers/enduro2d/high/world.hpp b/headers/enduro2d/high/world.hpp
new file mode 100644
index 00000000..cac936b3
--- /dev/null
+++ b/headers/enduro2d/high/world.hpp
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018 Matvey Cherevko
+ ******************************************************************************/
+
+#pragma once
+
+#include "_high.hpp"
+
+namespace e2d
+{
+    class world final : public module<world> {
+    public:
+        world();
+        ~world() noexcept final;
+    };
+}
diff --git a/scripts/upload_coverage.sh b/scripts/upload_coverage.sh
index cb5e7fb8..c49c8de9 100755
--- a/scripts/upload_coverage.sh
+++ b/scripts/upload_coverage.sh
@@ -11,7 +11,7 @@ lcov -d . -z
 ctest --verbose
 
 lcov -d . -c -o "coverage.info"
-lcov -r "coverage.info" "*/usr/*" "*/Xcode.app/*" "*/untests/*" "*/3rdparty/*" "*/modules/*" -o "coverage.info"
+lcov -r "coverage.info" "*/usr/*" "*/Xcode.app/*" "*/untests/*" "*/samples/*" "*/3rdparty/*" "*/modules/*" -o "coverage.info"
 lcov -l "coverage.info"
 
 bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/sources/enduro2d/high/world.cpp b/sources/enduro2d/high/world.cpp
new file mode 100644
index 00000000..1eaafda3
--- /dev/null
+++ b/sources/enduro2d/high/world.cpp
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018 Matvey Cherevko
+ ******************************************************************************/
+
+#include <enduro2d/high/world.hpp>
+
+namespace
+{
+    using namespace e2d;
+}
+
+namespace e2d
+{
+    world::world() = default;
+    world::~world() noexcept = default;
+}
diff --git a/untests/sources/untests_high/scene.cpp b/untests/sources/untests_high/scene.cpp
new file mode 100644
index 00000000..94e6f74b
--- /dev/null
+++ b/untests/sources/untests_high/scene.cpp
@@ -0,0 +1,11 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018 Matvey Cherevko
+ ******************************************************************************/
+
+#include "_high.hpp"
+using namespace e2d;
+
+TEST_CASE("scene"){
+}
diff --git a/untests/sources/untests_high/world.cpp b/untests/sources/untests_high/world.cpp
new file mode 100644
index 00000000..6de7463d
--- /dev/null
+++ b/untests/sources/untests_high/world.cpp
@@ -0,0 +1,11 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018 Matvey Cherevko
+ ******************************************************************************/
+
+#include "_high.hpp"
+using namespace e2d;
+
+TEST_CASE("world"){
+}