diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1710e4a..a2d26ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+default:
+  artifacts:
+    expire_in: 1 day
+    
 stages:
   - build
   - test
diff --git a/README.md b/README.md
index 400b0a1..b223f72 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,11 @@ ninja
 python compile_wasm.py -opt
 ```
 
+##### Documentation
+```shell
+adrdox -i source/bubel/ecs/ -o docs/ -s skeleton.html
+```
+
 For more detailed build options please check documentation for used build system.
 
 ## Demos
diff --git a/demos/external/sources/mmutils/thread_pool.d b/demos/external/sources/mmutils/thread_pool.d
index 374fbc1..161eb22 100644
--- a/demos/external/sources/mmutils/thread_pool.d
+++ b/demos/external/sources/mmutils/thread_pool.d
@@ -1,6 +1,6 @@
 module mmutils.thread_pool;
 
-import ecs.atomic;
+import bubel.ecs.atomic;
 
 //import core.stdc.stdio;
 //import core.stdc.stdlib : free, malloc, realloc;
@@ -32,7 +32,7 @@ else
 
 version (D_BetterC)
 {
-	import ecs.std;
+	import bubel.ecs.std;
 	extern (C) __gshared int _d_eh_personality(int, int, size_t, void*, void*)
 	{
 		return 0;
diff --git a/demos/source/app.d b/demos/source/app.d
index 150d653..acdc385 100644
--- a/demos/source/app.d
+++ b/demos/source/app.d
@@ -6,9 +6,9 @@ import cimgui.cimgui;
 
 import game_core.job_updater;
 
-import ecs.manager;
-import ecs.core;
-import ecs.std;
+import bubel.ecs.manager;
+import bubel.ecs.core;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.renderer;
 import ecs_utils.imgui_bind;
diff --git a/demos/source/demos/bullet_madnes.d b/demos/source/demos/bullet_madnes.d
index 0996e2e..420d6a3 100644
--- a/demos/source/demos/bullet_madnes.d
+++ b/demos/source/demos/bullet_madnes.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/chipmunk2d.d b/demos/source/demos/chipmunk2d.d
index 25b9c66..96e5fa6 100644
--- a/demos/source/demos/chipmunk2d.d
+++ b/demos/source/demos/chipmunk2d.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/events.d b/demos/source/demos/events.d
index 620ff4d..6215160 100644
--- a/demos/source/demos/events.d
+++ b/demos/source/demos/events.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/flag_component.d b/demos/source/demos/flag_component.d
index a1863b9..392164e 100644
--- a/demos/source/demos/flag_component.d
+++ b/demos/source/demos/flag_component.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/physics.d b/demos/source/demos/physics.d
index 6e9ba4a..5fccc0b 100644
--- a/demos/source/demos/physics.d
+++ b/demos/source/demos/physics.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/simple.d b/demos/source/demos/simple.d
index edd20c6..89fe801 100644
--- a/demos/source/demos/simple.d
+++ b/demos/source/demos/simple.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/snake.d b/demos/source/demos/snake.d
index 6bb8cef..c4123ba 100644
--- a/demos/source/demos/snake.d
+++ b/demos/source/demos/snake.d
@@ -6,12 +6,12 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
-import ecs.vector;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
+import bubel.ecs.vector;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/demos/space_invaders.d b/demos/source/demos/space_invaders.d
index bddf53c..92c4e15 100644
--- a/demos/source/demos/space_invaders.d
+++ b/demos/source/demos/space_invaders.d
@@ -6,11 +6,11 @@ import bindbc.sdl;
 
 import cimgui.cimgui;
 
-import ecs.attributes;
-import ecs.core;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.texture;
 import ecs_utils.math.vector;
diff --git a/demos/source/game_core/job_updater.d b/demos/source/game_core/job_updater.d
index 46cd609..6c20a83 100644
--- a/demos/source/game_core/job_updater.d
+++ b/demos/source/game_core/job_updater.d
@@ -1,13 +1,13 @@
 module game_core.job_updater;
 
-import ecs.std;
-import ecs.vector;
-import ecs.atomic;
+import bubel.ecs.std;
+import bubel.ecs.vector;
+import bubel.ecs.atomic;
 
 import ecs_utils.utils;
 
 //import core.time;
-import ecs.manager;
+import bubel.ecs.manager;
 import mmutils.thread_pool;
 
 version(LDC)
diff --git a/demos/source/gui/manager.d b/demos/source/gui/manager.d
index 8a46a92..185fcd1 100644
--- a/demos/source/gui/manager.d
+++ b/demos/source/gui/manager.d
@@ -4,10 +4,10 @@ import app;
 
 import cimgui.cimgui;
 
-import ecs.std;
-import ecs.system;
-import ecs.vector;
-import ecs.entity;
+import bubel.ecs.std;
+import bubel.ecs.system;
+import bubel.ecs.vector;
+import bubel.ecs.entity;
 
 import gui.system;
 import gui.template_;
diff --git a/demos/source/gui/system.d b/demos/source/gui/system.d
index bbee409..112bed3 100644
--- a/demos/source/gui/system.d
+++ b/demos/source/gui/system.d
@@ -1,6 +1,6 @@
 module gui.system;
 
-import ecs.system;
+import bubel.ecs.system;
 
 struct SystemGUI
 {
diff --git a/demos/source/gui/template_.d b/demos/source/gui/template_.d
index 2aa1833..4d3de11 100644
--- a/demos/source/gui/template_.d
+++ b/demos/source/gui/template_.d
@@ -1,6 +1,6 @@
 module gui.template_;
 
-import ecs.entity;
+import bubel.ecs.entity;
 
 struct TemplateGUI
 {
diff --git a/demos/utils/source/ecs_utils/gfx/buffer.d b/demos/utils/source/ecs_utils/gfx/buffer.d
index 2c25324..b11cb85 100644
--- a/demos/utils/source/ecs_utils/gfx/buffer.d
+++ b/demos/utils/source/ecs_utils/gfx/buffer.d
@@ -1,6 +1,6 @@
 module ecs_utils.gfx.buffer;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import glad.gl.gl;
 import glad.gl.gles2;
diff --git a/demos/utils/source/ecs_utils/gfx/config.d b/demos/utils/source/ecs_utils/gfx/config.d
index de5528a..0683647 100644
--- a/demos/utils/source/ecs_utils/gfx/config.d
+++ b/demos/utils/source/ecs_utils/gfx/config.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.config;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.material;
 import ecs_utils.gfx.mesh;
@@ -18,7 +18,7 @@ enum LayerType
     sorted
 }
 
-import ecs.vector;
+import bubel.ecs.vector;
 
 static struct GfxConfig
 {
diff --git a/demos/utils/source/ecs_utils/gfx/material.d b/demos/utils/source/ecs_utils/gfx/material.d
index b697992..fbd88b9 100644
--- a/demos/utils/source/ecs_utils/gfx/material.d
+++ b/demos/utils/source/ecs_utils/gfx/material.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.material;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.shader;
 
diff --git a/demos/utils/source/ecs_utils/gfx/mesh.d b/demos/utils/source/ecs_utils/gfx/mesh.d
index 346226f..20d5855 100644
--- a/demos/utils/source/ecs_utils/gfx/mesh.d
+++ b/demos/utils/source/ecs_utils/gfx/mesh.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.mesh;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import ecs_utils.gfx.buffer;
 
diff --git a/demos/utils/source/ecs_utils/gfx/renderer.d b/demos/utils/source/ecs_utils/gfx/renderer.d
index 2a04c57..d56b5c8 100644
--- a/demos/utils/source/ecs_utils/gfx/renderer.d
+++ b/demos/utils/source/ecs_utils/gfx/renderer.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.renderer;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 //import ecs_utils.core : Backend;
 import ecs_utils.gfx.buffer;
diff --git a/demos/utils/source/ecs_utils/gfx/shader.d b/demos/utils/source/ecs_utils/gfx/shader.d
index 7749013..5e24d9a 100644
--- a/demos/utils/source/ecs_utils/gfx/shader.d
+++ b/demos/utils/source/ecs_utils/gfx/shader.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.shader;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import glad.gl.gl;
 
diff --git a/demos/utils/source/ecs_utils/gfx/texture.d b/demos/utils/source/ecs_utils/gfx/texture.d
index bb4c62a..05e2fd9 100644
--- a/demos/utils/source/ecs_utils/gfx/texture.d
+++ b/demos/utils/source/ecs_utils/gfx/texture.d
@@ -2,7 +2,7 @@ module ecs_utils.gfx.texture;
 
 import bindbc.sdl;
 
-import ecs.std;
+import bubel.ecs.std;
 
 import ecs_utils.math.vector;
 
diff --git a/demos/utils/source/ecs_utils/gfx/vertex.d b/demos/utils/source/ecs_utils/gfx/vertex.d
index 1d11fdd..b63803c 100644
--- a/demos/utils/source/ecs_utils/gfx/vertex.d
+++ b/demos/utils/source/ecs_utils/gfx/vertex.d
@@ -1,6 +1,6 @@
 module ecs_utils.gfx.vertex;
 
-import ecs.std;
+import bubel.ecs.std;
 
 struct Vertex 
 {
diff --git a/meson.build b/meson.build
index 3317d5c..c31b93a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,21 +1,21 @@
 project('DECS', 'd')
 
 src = [
-	'source/ecs/atomic.d',
-	'source/ecs/attributes.d',
-	'source/ecs/block_allocator.d',
-	'source/ecs/core.d',
-	'source/ecs/entity.d',
-	'source/ecs/events.d',
-	'source/ecs/hash_map.d',
-	'source/ecs/id_manager.d',
-	'source/ecs/manager.d',
-	'source/ecs/package.d',
-	'source/ecs/simple_vector.d',
-	'source/ecs/std.d',
-	'source/ecs/system.d',
-	'source/ecs/traits.d',
-	'source/ecs/vector.d'
+	'source/bubel/ecs/atomic.d',
+	'source/bubel/ecs/attributes.d',
+	'source/bubel/ecs/block_allocator.d',
+	'source/bubel/ecs/core.d',
+	'source/bubel/ecs/entity.d',
+	'source/bubel/ecs/events.d',
+	'source/bubel/ecs/hash_map.d',
+	'source/bubel/ecs/id_manager.d',
+	'source/bubel/ecs/manager.d',
+	'source/bubel/ecs/package.d',
+	'source/bubel/ecs/simple_vector.d',
+	'source/bubel/ecs/std.d',
+	'source/bubel/ecs/system.d',
+	'source/bubel/ecs/traits.d',
+	'source/bubel/ecs/vector.d'
 ]
 
 tests_src = [
diff --git a/source/ecs/atomic.d b/source/bubel/ecs/atomic.d
similarity index 99%
rename from source/ecs/atomic.d
rename to source/bubel/ecs/atomic.d
index 5e5f447..9155c8f 100644
--- a/source/ecs/atomic.d
+++ b/source/bubel/ecs/atomic.d
@@ -7,7 +7,7 @@ Emscripten functions are contained in API similar to druntime.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.atomic;
+module bubel.ecs.atomic;
 
 version(Emscripten)version = ECSEmscripten;
 
diff --git a/source/ecs/attributes.d b/source/bubel/ecs/attributes.d
similarity index 97%
rename from source/ecs/attributes.d
rename to source/bubel/ecs/attributes.d
index 20d0f60..2bc0aec 100644
--- a/source/ecs/attributes.d
+++ b/source/bubel/ecs/attributes.d
@@ -20,7 +20,7 @@ Struct EntitiesData
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.attributes;
+module bubel.ecs.attributes;
 
 ///Used to mark optional components for system.
 enum optional = "optional";
diff --git a/source/ecs/block_allocator.d b/source/bubel/ecs/block_allocator.d
similarity index 97%
rename from source/ecs/block_allocator.d
rename to source/bubel/ecs/block_allocator.d
index d9f08ca..740b762 100644
--- a/source/ecs/block_allocator.d
+++ b/source/bubel/ecs/block_allocator.d
@@ -6,10 +6,10 @@ Module contain memory allocator.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.block_allocator;
+module bubel.ecs.block_allocator;
 
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 /************************************************************************************************************************
 Allocator allocate large blocks and return smaller blocks. When there is no more blocks then next large block is allocated.
diff --git a/source/ecs/core.d b/source/bubel/ecs/core.d
similarity index 96%
rename from source/ecs/core.d
rename to source/bubel/ecs/core.d
index c346c9f..ccdf3e2 100644
--- a/source/ecs/core.d
+++ b/source/bubel/ecs/core.d
@@ -49,10 +49,10 @@ Struct System1
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.core;
+module bubel.ecs.core;
 
-public import ecs.manager;
-public import ecs.entity;
+public import bubel.ecs.manager;
+public import bubel.ecs.entity;
 
 /************************************************************************************************************************
 Main struct used as namespace for templates.
diff --git a/source/ecs/entity.d b/source/bubel/ecs/entity.d
similarity index 97%
rename from source/ecs/entity.d
rename to source/bubel/ecs/entity.d
index 0bd2dea..441f412 100644
--- a/source/ecs/entity.d
+++ b/source/bubel/ecs/entity.d
@@ -4,10 +4,10 @@ Entity module.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.entity;
+module bubel.ecs.entity;
 
-import ecs.system;
-import ecs.manager;
+import bubel.ecs.system;
+import bubel.ecs.manager;
 
 /************************************************************************************************************************
 Entity ID structure. Used as reference to Entity. Pointer to entity should be ever used to store entity reference!
diff --git a/source/ecs/events.d b/source/bubel/ecs/events.d
similarity index 97%
rename from source/ecs/events.d
rename to source/bubel/ecs/events.d
index ac7e185..772d5b5 100644
--- a/source/ecs/events.d
+++ b/source/bubel/ecs/events.d
@@ -1,9 +1,9 @@
-module ecs.events;
+module bubel.ecs.events;
 
-import ecs.block_allocator;
-import ecs.entity;
-import ecs.manager;
-import ecs.std;
+import bubel.ecs.block_allocator;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
+import bubel.ecs.std;
 
 import std.algorithm.comparison : max;
 
diff --git a/source/ecs/hash_map.d b/source/bubel/ecs/hash_map.d
similarity index 98%
rename from source/ecs/hash_map.d
rename to source/bubel/ecs/hash_map.d
index 5a8b253..1f7a1f8 100755
--- a/source/ecs/hash_map.d
+++ b/source/bubel/ecs/hash_map.d
@@ -1,9 +1,9 @@
-module ecs.hash_map;
+module bubel.ecs.hash_map;
 
 import std.traits;
 
-import ecs.vector;
-import ecs.traits;
+import bubel.ecs.vector;
+import bubel.ecs.traits;
 
 enum doNotInline = "version(DigitalMars)pragma(inline,false);version(LDC)pragma(LDC_never_inline);";
 
diff --git a/source/ecs/id_manager.d b/source/bubel/ecs/id_manager.d
similarity index 98%
rename from source/ecs/id_manager.d
rename to source/bubel/ecs/id_manager.d
index 1ab8465..c8eadec 100644
--- a/source/ecs/id_manager.d
+++ b/source/bubel/ecs/id_manager.d
@@ -1,10 +1,10 @@
-module ecs.id_manager;
+module bubel.ecs.id_manager;
 
-import ecs.entity;
-import ecs.std;
-import ecs.vector;
+import bubel.ecs.entity;
+import bubel.ecs.std;
+import bubel.ecs.vector;
 
-import ecs.atomic;
+import bubel.ecs.atomic;
 import core.stdc.string : memcpy;
 
 /************************************************************************************************************************
diff --git a/source/ecs/manager.d b/source/bubel/ecs/manager.d
similarity index 99%
rename from source/ecs/manager.d
rename to source/bubel/ecs/manager.d
index aca7f53..be4f37a 100644
--- a/source/ecs/manager.d
+++ b/source/bubel/ecs/manager.d
@@ -4,7 +4,7 @@ Most important module. Almost every function is called from EntityManager.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.manager;
+module bubel.ecs.manager;
 
 import std.algorithm : max;
 import std.conv : to;
@@ -14,21 +14,21 @@ import std.traits;
 //import core.stdc.stdlib : qsort;
 //import core.stdc.string;
 
-import ecs.system; //not ordered as forward reference bug workaround
-import ecs.block_allocator;
-import ecs.entity;
-import ecs.events;
-import ecs.hash_map;
-import ecs.id_manager;
-import ecs.simple_vector;
-import ecs.std;
-import ecs.traits;
-import ecs.vector;
-import ecs.atomic;
+import bubel.ecs.system; //not ordered as forward reference bug workaround
+import bubel.ecs.block_allocator;
+import bubel.ecs.entity;
+import bubel.ecs.events;
+import bubel.ecs.hash_map;
+import bubel.ecs.id_manager;
+import bubel.ecs.simple_vector;
+import bubel.ecs.std;
+import bubel.ecs.traits;
+import bubel.ecs.vector;
+import bubel.ecs.atomic;
 
 export alias gEM = EntityManager.instance;
 export alias gEntityManager = EntityManager.instance;
-alias SerializeVector = ecs.vector.Vector!ubyte;
+alias SerializeVector = bubel.ecs.vector.Vector!ubyte;
 
 /************************************************************************************************************************
 Entity manager is responsible for everything.
diff --git a/source/bubel/ecs/package.d b/source/bubel/ecs/package.d
new file mode 100644
index 0000000..ee3f62b
--- /dev/null
+++ b/source/bubel/ecs/package.d
@@ -0,0 +1,10 @@
+module ecs;
+
+public import bubel.ecs.core;
+public import bubel.ecs.entity;
+public import bubel.ecs.manager;
+public import bubel.ecs.system;
+
+import bubel.ecs.events;
+import bubel.ecs.id_manager;
+import bubel.ecs.std;
\ No newline at end of file
diff --git a/source/ecs/simple_vector.d b/source/bubel/ecs/simple_vector.d
similarity index 95%
rename from source/ecs/simple_vector.d
rename to source/bubel/ecs/simple_vector.d
index 175c015..28d4707 100644
--- a/source/ecs/simple_vector.d
+++ b/source/bubel/ecs/simple_vector.d
@@ -1,6 +1,6 @@
-module ecs.simple_vector;
+module bubel.ecs.simple_vector;
 
-import ecs.std;
+import bubel.ecs.std;
 
 //import core.stdc.string;
 
diff --git a/source/ecs/std.d b/source/bubel/ecs/std.d
similarity index 99%
rename from source/ecs/std.d
rename to source/bubel/ecs/std.d
index c027fd5..4cec197 100644
--- a/source/ecs/std.d
+++ b/source/bubel/ecs/std.d
@@ -5,7 +5,7 @@ This module contain implementation of standard functionality.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.std;
+module bubel.ecs.std;
 
 version(Emscripten)version = ECSEmscripten;
 
diff --git a/source/ecs/system.d b/source/bubel/ecs/system.d
similarity index 98%
rename from source/ecs/system.d
rename to source/bubel/ecs/system.d
index 22a3955..6452e6c 100644
--- a/source/ecs/system.d
+++ b/source/bubel/ecs/system.d
@@ -4,10 +4,10 @@ System module.
 Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
-module ecs.system;
+module bubel.ecs.system;
 
-import ecs.entity;
-import ecs.manager;
+import bubel.ecs.entity;
+import bubel.ecs.manager;
 
 /************************************************************************************************************************
 System contain data required to proper glue EntityManager with Systems.
diff --git a/source/ecs/traits.d b/source/bubel/ecs/traits.d
similarity index 97%
rename from source/ecs/traits.d
rename to source/bubel/ecs/traits.d
index d19259f..7043b2e 100644
--- a/source/ecs/traits.d
+++ b/source/bubel/ecs/traits.d
@@ -1,4 +1,4 @@
-module ecs.traits;
+module bubel.ecs.traits;
 
 import std.traits;
 
diff --git a/source/ecs/vector.d b/source/bubel/ecs/vector.d
similarity index 99%
rename from source/ecs/vector.d
rename to source/bubel/ecs/vector.d
index 84ecc51..3334be2 100644
--- a/source/ecs/vector.d
+++ b/source/bubel/ecs/vector.d
@@ -1,8 +1,8 @@
-module ecs.vector;
+module bubel.ecs.vector;
 
 import core.bitop;
 //import core.stdc.stdlib : free, malloc;
-import ecs.std;
+import bubel.ecs.std;
 //import core.stdc.string : memcpy, memset;
 //import std.algorithm : swap;
 import std.conv : emplace;
diff --git a/source/ecs/package.d b/source/ecs/package.d
deleted file mode 100644
index eda440d..0000000
--- a/source/ecs/package.d
+++ /dev/null
@@ -1,10 +0,0 @@
-module ecs;
-
-public import ecs.core;
-public import ecs.entity;
-public import ecs.manager;
-public import ecs.system;
-
-import ecs.events;
-import ecs.id_manager;
-import ecs.std;
\ No newline at end of file
diff --git a/tests/basic.d b/tests/basic.d
index f3f2832..653575f 100644
--- a/tests/basic.d
+++ b/tests/basic.d
@@ -1,9 +1,9 @@
 module tests.basic;
 
-import ecs.core;
-import ecs.manager;
-import ecs.system;
-import ecs.attributes;
+import bubel.ecs.core;
+import bubel.ecs.manager;
+import bubel.ecs.system;
+import bubel.ecs.attributes;
 
 import std.array : staticArray;
 
diff --git a/tests/id_manager.d b/tests/id_manager.d
index afaafe5..b0f97d5 100644
--- a/tests/id_manager.d
+++ b/tests/id_manager.d
@@ -1,7 +1,7 @@
 module tests.id_manager;
 
-import ecs.id_manager;
-import ecs.entity;
+import bubel.ecs.id_manager;
+import bubel.ecs.entity;
 
 unittest
 {
diff --git a/tests/runner.d b/tests/runner.d
index 5eaf99b..7b8f6b5 100644
--- a/tests/runner.d
+++ b/tests/runner.d
@@ -5,9 +5,9 @@ import core.stdc.stdio;
 import core.stdc.string;
 import core.sys.posix.setjmp;
 
-import ecs.vector;
-import ecs.simple_vector;
-import ecs.std;
+import bubel.ecs.vector;
+import bubel.ecs.simple_vector;
+import bubel.ecs.std;
 
 enum int ASSERTED = 123;
 enum string OUT_FILE = "test_report.xml";
diff --git a/tests/tests.d b/tests/tests.d
index ea554d1..d923116 100644
--- a/tests/tests.d
+++ b/tests/tests.d
@@ -3,12 +3,12 @@ module tests.tests;
 import std.experimental.allocator;
 import std.experimental.allocator.mallocator;*/
 
-import ecs.entity;
-import ecs.events;
-import ecs.manager;
-import ecs.system;
-import ecs.attributes;
-import ecs.core;
+import bubel.ecs.entity;
+import bubel.ecs.events;
+import bubel.ecs.manager;
+import bubel.ecs.system;
+import bubel.ecs.attributes;
+import bubel.ecs.core;
 
 version (WebAssembly)
 {
@@ -714,7 +714,7 @@ else:
 
 	//foreach(i; 0..1_000_000)gEM.removeEntity(gEM.addEntity(tmpl).id);
 
-	import ecs.std;
+	import bubel.ecs.std;
 
 	EntityID[] idss = Mallocator.makeArray!EntityID(5000); //[5000]
 	//scope(exit)Mallocator.dispose(idss);
diff --git a/tests/vector.d b/tests/vector.d
index 4b2ad5b..d733f0f 100644
--- a/tests/vector.d
+++ b/tests/vector.d
@@ -1,7 +1,7 @@
 module tests.vector;
 
-import ecs.simple_vector;
-//import ecs.vector;
+import bubel.ecs.simple_vector;
+//import bubel.ecs.vector;
 
 @("simple-vector")
 unittest