diff --git a/import/ecs/ecs.di b/import/ecs/ecs.di
deleted file mode 100644
index 13041de..0000000
--- a/import/ecs/ecs.di
+++ /dev/null
@@ -1,112 +0,0 @@
-// D import file generated from 'source\ecs\ecs.d'
-module ecs.ecs;
-import std.stdio;
-version (Design)
-{
-	alias SytemFuncType = void function(ref SystemCallData data, void* componentsStart);
-	struct HasComponentsStore
-	{
-		ulong[4] bits;
-		bool has(HasComponentsStore components);
-		bool notIn(HasComponentsStore components);
-		int length();
-	}
-	struct ComponentInfo
-	{
-		int size;
-		int aligment;
-		SerializeJSON funsSerJ;
-		SerializeBiN funcSerB;
-	}
-	struct System
-	{
-		HasComponentsStore requiredComponents;
-		HasComponentsStore absenComponents;
-		HasComponentsStore maybeComponents;
-		bool enabled;
-		int priority;
-		SytemFuncType func;
-	}
-	struct SystemCallData
-	{
-		System* system;
-		int[] componentsDt;
-	}
-	struct EntityTypeData
-	{
-		HasComponentsStore components;
-		int[] deltas;
-		int totalSize;
-		int totalAligment = 8;
-		SystemCallData[] systems;
-	}
-	struct EntitiesBlock
-	{
-		EntityTypeData* typeData;
-		Entity* freeEntitySlot;
-		EntitiesBlock* nextBlock;
-	}
-	struct EntityID
-	{
-		ulong id = (ulong).max;
-		static immutable notUsedValue = EntityID((ulong).max);
-	}
-	struct Entity
-	{
-		EntityID entityID = EntityID.notUsedValue;
-		union
-		{
-			string name;
-			Entity* nextFreeSlot;
-		}
-		uint group;
-		EntityID entityID;
-	}
-	struct Template
-	{
-		HasComponentsStore hasComp;
-		Entity* entity;
-	}
-	struct Manager
-	{
-		EntityAllocator entityArrayAllcoator;
-		ComponentInfo[] components;
-		System[] systems;
-		HashMap!(HasComponentsStore, EntitiesBlock*) entitiesDatas;
-		HashMapTwoWays!(string, Entity*) nameMap;
-		HashMapTwoWays!(EntityID, Entity*) idMap;
-		EntitiesBlock* getEntitiesBlock(HasComponentsStore hasComponents);
-		EntitiesBlock* addNewBlock(HasComponentsStore hasComponents, EntitiesBlock* firstBlock);
-		void alignNum(ref int num, int aligment);
-		EntityTypeData* newEntityTypeData(HasComponentsStore hasComponents);
-		void addEntity(Template* templ);
-		void addSystem(Func)(int priority)
-		{
-			HasComponentsStore requiredComponents;
-			HasComponentsStore absenComponents;
-			HasComponentsStore maybeComponents;
-			void systemCaller(ref SystemCallData data, void* componentsStart);
-			System* system = new System(&systemCaller, entTypeData);
-			systems ~= system;
-			foreach (ref entTypeData; entitiesDatas)
-			{
-				if (!entTypeData.hasComp.has(requiredComponents) || !entTypeData.hasComp.notIn(absenComponents))
-				{
-					continue;
-				}
-				entTypeData.systems ~= system;
-			}
-		}
-	}
-	void someSystem(CompA a, CompB b, CompC* c);
-	void main();
-	class System
-	{
-		void start();
-		void end();
-		void update(ref ObjRend a);
-		void useEvent(EventData evvv, ref ObjRend a);
-	}
-	alias SerializeVector = ubyte[];
-	__gshared EntityManager gEntityManager;
-}
diff --git a/import/ecs/entity.di b/import/ecs/entity.di
deleted file mode 100644
index db6208b..0000000
--- a/import/ecs/entity.di
+++ /dev/null
@@ -1,30 +0,0 @@
-// D import file generated from 'source\ecs\entity.d'
-module ecs.entity;
-import ecs.manager;
-struct EntityID
-{
-	uint id;
-	uint counter;
-}
-struct Entity
-{
-	EntityID id;
-	void updateID();
-	T* getComponent(T)()
-	{
-		EntityManager.EntitiesBlock* block = gEM.getMetaData(&this);
-		EntityManager.EntityInfo* info = block.type_data;
-		if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
-			return null;
-		return cast(T*)(cast(void*)&this + info.deltas[T.component_id]);
-	}
-}
-export struct EntityTemplate
-{
-	ubyte[] entity_data;
-	EntityManager.EntityInfo* info;
-	T* getComponent(T)()
-	{
-		return cast(T*)(entity_data.ptr + info.deltas[T.component_id]);
-	}
-}
diff --git a/import/ecs/entity_allocator.di b/import/ecs/entity_allocator.di
deleted file mode 100644
index 66472fd..0000000
--- a/import/ecs/entity_allocator.di
+++ /dev/null
@@ -1,11 +0,0 @@
-// D import file generated from 'source\ecs\entity_allocator.d'
-module ecs.entity_allocator;
-import ecs.manager;
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
-struct EntityAllocator
-{
-	void* next_block;
-	void* getBlock();
-	private void allocBlock();
-}
diff --git a/import/ecs/events.di b/import/ecs/events.di
deleted file mode 100644
index 73085c6..0000000
--- a/import/ecs/events.di
+++ /dev/null
@@ -1,9 +0,0 @@
-// D import file generated from 'source\ecs\events.d'
-module ecs.events;
-struct Event
-{
-	uint type;
-}
-class EventManager
-{
-}
diff --git a/import/ecs/hash_map.di b/import/ecs/hash_map.di
deleted file mode 100644
index d621ad8..0000000
--- a/import/ecs/hash_map.di
+++ /dev/null
@@ -1,328 +0,0 @@
-// D import file generated from 'source\ecs\hash_map.d'
-module ecs.hash_map;
-import std.traits;
-import ecs.vector;
-import ecs.traits;
-enum doNotInline = "version(DigitalMars)pragma(inline,false);version(LDC)pragma(LDC_never_inline);";
-private enum HASH_EMPTY = 0;
-private enum HASH_DELETED = 1;
-private enum HASH_FILLED_MARK = ulong(1) << 8 * (ulong).sizeof - 1;
-export ulong defaultHashFunc(T)(auto ref T t)
-{
-	static if (isIntegral!T)
-	{
-		return hashInt(t);
-	}
-	else
-	{
-		return hashInt(t.hashOf);
-	}
-}
-export nothrow @nogc @safe ulong hashInt(ulong x);
-struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc)
-{
-	alias Key = KeyPar;
-	alias Value = ValuePar;
-	enum rehashFactor = 0.75;
-	enum size_t getIndexEmptyValue = size_t.max;
-	static struct KeyVal
-	{
-		Key key;
-		Value value;
-	}
-	static struct Bucket
-	{
-		ulong hash;
-		KeyVal keyValue;
-	}
-	Vector!Bucket elements;
-	size_t length;
-	size_t markerdDeleted;
-	export void clear()
-	{
-		elements.clear();
-		length = 0;
-		markerdDeleted = 0;
-	}
-	export void reset()
-	{
-		elements.reset();
-		length = 0;
-		markerdDeleted = 0;
-	}
-	export bool isIn(ref Key el)
-	{
-		return getIndex(el) != getIndexEmptyValue;
-	}
-	export bool isIn(Key el)
-	{
-		return getIndex(el) != getIndexEmptyValue;
-	}
-	export Value* getPtr()(auto ref Key k)
-	{
-		size_t index = getIndex(k);
-		if (index == getIndexEmptyValue)
-		{
-			return null;
-		}
-		else
-		{
-			return &elements[index].keyValue.value;
-		}
-	}
-	export ref Value get()(auto ref Key k)
-	{
-		size_t index = getIndex(k);
-		assert(index != getIndexEmptyValue);
-		return elements[index].keyValue.value;
-	}
-	deprecated("Use get with second parameter.") export auto ref Value getDefault()(auto ref Key k, auto ref Value defaultValue)
-	{
-		return get(k, defaultValue);
-	}
-	export auto ref Value get()(auto ref Key k, auto ref Value defaultValue)
-	{
-		size_t index = getIndex(k);
-		if (index == getIndexEmptyValue)
-		{
-			return defaultValue;
-		}
-		else
-		{
-			return elements[index].keyValue.value;
-		}
-	}
-	export ref Value getInsertDefault()(auto ref Key k, auto ref Value defaultValue)
-	{
-		size_t index = getIndex(k);
-		if (index == getIndexEmptyValue)
-		{
-			add(k, defaultValue);
-		}
-		index = getIndex(k);
-		assert(index != getIndexEmptyValue);
-		return elements[index].keyValue.value;
-	}
-	export bool tryRemove(Key el)
-	{
-		size_t index = getIndex(el);
-		if (index == getIndexEmptyValue)
-		{
-			return false;
-		}
-		length--;
-		elements[index].hash = HASH_DELETED;
-		markerdDeleted++;
-		return true;
-	}
-	export void remove(Key el)
-	{
-		bool ok = tryRemove(el);
-		assert(ok);
-	}
-	export ref Value opIndex()(auto ref Key key)
-	{
-		return get(key);
-	}
-	export void opIndexAssign()(auto ref Value value, auto ref Key key)
-	{
-		add(key, value);
-	}
-	export void add()(auto ref Key key, auto ref Value value)
-	{
-		size_t index = getIndex(key);
-		if (index != getIndexEmptyValue)
-		{
-			elements[index].keyValue.value = value;
-			return ;
-		}
-		if (getLoadFactor(length + 1) > rehashFactor || getLoadFactor(length + markerdDeleted) > rehashFactor)
-		{
-			rehash();
-		}
-		length++;
-		immutable ulong hash = hashFunc(key) | HASH_FILLED_MARK;
-		immutable size_t rotateMask = elements.length - 1;
-		index = hash & rotateMask;
-		while (true)
-		{
-			Bucket* gr = &elements[index];
-			if ((gr.hash & HASH_FILLED_MARK) == 0)
-			{
-				if (gr.hash == HASH_DELETED)
-				{
-					markerdDeleted--;
-				}
-				gr.hash = hash;
-				gr.keyValue.key = key;
-				gr.keyValue.value = value;
-				return ;
-			}
-			index++;
-			index = index & rotateMask;
-		}
-	}
-	export size_t getIndex(Key el)
-	{
-		return getIndex(el);
-	}
-	export size_t getIndex(ref Key el)
-	{
-		mixin(doNotInline);
-		immutable size_t groupsLength = elements.length;
-		if (groupsLength == 0)
-		{
-			return getIndexEmptyValue;
-		}
-		immutable ulong hash = hashFunc(el) | HASH_FILLED_MARK;
-		immutable size_t rotateMask = groupsLength - 1;
-		size_t index = hash & rotateMask;
-		while (true)
-		{
-			Bucket* gr = &elements[index];
-			if (gr.hash == hash && (gr.keyValue.key == el))
-			{
-				return index;
-			}
-			if (gr.hash == HASH_EMPTY)
-			{
-				return getIndexEmptyValue;
-			}
-			index++;
-			index = index & rotateMask;
-		}
-	}
-	export float getLoadFactor(size_t forElementsNum)
-	{
-		if (elements.length == 0)
-		{
-			return 1;
-		}
-		return cast(float)forElementsNum / elements.length;
-	}
-	export void rehash()
-	{
-		mixin(doNotInline);
-		Vector!KeyVal allElements;
-		allElements.reserve(elements.length);
-		foreach (ref Bucket el; elements)
-		{
-			if ((el.hash & HASH_FILLED_MARK) == 0)
-			{
-				el.hash = HASH_EMPTY;
-				continue;
-			}
-			el.hash = HASH_EMPTY;
-			allElements ~= el.keyValue;
-		}
-		if (getLoadFactor(length + 1) > rehashFactor)
-		{
-			elements.length = (elements.length ? elements.length : 4) << 1;
-		}
-		foreach (i, ref el; allElements)
-		{
-			add(el.key, el.value);
-		}
-		length = allElements.length;
-		markerdDeleted = 0;
-	}
-	export int opApply(DG)(scope DG dg)
-	{
-		int result;
-		foreach (ref Bucket gr; elements)
-		{
-			if ((gr.hash & HASH_FILLED_MARK) == 0)
-			{
-				continue;
-			}
-			static if (isForeachDelegateWithTypes!(DG, Key))
-			{
-				result = dg(gr.keyValue.key);
-			}
-			else
-			{
-				static if (isForeachDelegateWithTypes!(DG, Value))
-				{
-					result = dg(gr.keyValue.value);
-				}
-				else
-				{
-					static if (isForeachDelegateWithTypes!(DG, Key, Value))
-					{
-						result = dg(gr.keyValue.key, gr.keyValue.value);
-					}
-					else
-					{
-						static assert(0);
-					}
-				}
-			}
-			if (result)
-				break;
-		}
-		return result;
-	}
-	export int byKey(scope int delegate(Key k) dg)
-	{
-		int result;
-		foreach (ref Key k; this)
-		{
-			result = dg(k);
-			if (result)
-				break;
-		}
-		return result;
-	}
-	export int byValue(scope int delegate(ref Value k) dg)
-	{
-		int result;
-		foreach (ref Value v; this)
-		{
-			result = dg(v);
-			if (result)
-				break;
-		}
-		return result;
-	}
-	export int byKeyValue(scope int delegate(ref Key k, ref Value v) dg)
-	{
-		int result;
-		foreach (ref Key k, ref Value v; this)
-		{
-			result = dg(k, v);
-			if (result)
-				break;
-		}
-		return result;
-	}
-	import std.format : FormatSpec, formatValue;
-	export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt)
-	{
-		formatValue(sink, '[', fmt);
-		foreach (ref k, ref v; &byKeyValue)
-		{
-			formatValue(sink, k, fmt);
-			formatValue(sink, ':', fmt);
-			formatValue(sink, v, fmt);
-			formatValue(sink, ", ", fmt);
-		}
-		formatValue(sink, ']', fmt);
-	}
-}
-static void dumpHashMapToJson(T)(ref T map, string path = "HashMapDump.json")
-{
-	Vector!char data;
-	import std.file;
-	import mutils.serializer.json;
-	JSONSerializer.instance.serialize!(Load.no)(map, data);
-	std.file.write(path, data[]);
-}
-static void printHashMap(T)(ref T map)
-{
-	import std.stdio;
-	writeln(T.stringof, " dump:\x0a");
-	foreach (k, v; &map.byKeyValue)
-	{
-		writefln("%20s : %20s", k, v);
-	}
-}
diff --git a/import/ecs/id_manager.di b/import/ecs/id_manager.di
deleted file mode 100644
index 55a00ef..0000000
--- a/import/ecs/id_manager.di
+++ /dev/null
@@ -1,20 +0,0 @@
-// D import file generated from 'source\ecs\id_manager.d'
-module ecs.id_manager;
-import ecs.entity;
-import ecs.vector;
-struct IDManager
-{
-	EntityID getNewID();
-	void releaseID(EntityID id);
-	void update(ref Entity entity);
-	Entity* getEntityPointer(EntityID id);
-	bool isExist(EntityID id);
-	struct Data
-	{
-		uint counter = 0;
-		uint next_id = (uint).max;
-		Entity* entity = null;
-	}
-	private uint m_next_id = 0;
-	Vector!Data m_ids_array;
-}
diff --git a/import/ecs/manager.di b/import/ecs/manager.di
deleted file mode 100644
index 801bc1d..0000000
--- a/import/ecs/manager.di
+++ /dev/null
@@ -1,287 +0,0 @@
-// D import file generated from 'source\ecs\manager.d'
-module ecs.manager;
-import std.algorithm : max;
-import std.conv : to;
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
-import std.traits;
-import core.stdc.stdlib;
-import core.stdc.string;
-import ecs.entity;
-import ecs.entity_allocator;
-import ecs.hash_map;
-import ecs.id_manager;
-import ecs.system;
-import ecs.vector;
-alias gEM = EntityManager.instance;
-alias SerializeVector = ecs.vector.Vector!ubyte;
-class EntityManager
-{
-	export static void initialize();
-	export static void destroy();
-	export void registerSystem(Sys)(int priority)
-	{
-		alias types = Parameters!(Sys.update);
-		alias storages = ParameterStorageClassTuple!(Sys.update);
-		alias STC = ParameterStorageClass;
-		System system;
-		static string genCall()()
-		{
-			string ret = "s.update(*cast(Entity*)data_pointer,";
-			uint i = 0;
-			uint req = 0;
-			uint opt = 0;
-			static foreach (param; Parameters!(Sys.update)[1..$])
-			{
-				i++;
-				if (isPointer!param)
-				{
-					ret ~= "cast(types[" ~ i.to!string ~ "])(optional_pointers[" ~ opt++.to!string ~ "]),";
-				}
-				else
-				{
-					ret ~= "*cast(types[" ~ i.to!string ~ "]*)(pointers[" ~ req++.to!string ~ "]),";
-				}
-			}
-			ret ~= ");";
-			return ret;
-		}
-		static string genCompList()()
-		{
-			string ret = "ushort comp;uint req;uint opt;";
-			foreach (i; 1 .. (Parameters!(Sys.update)).length)
-			{
-				ret ~= "\x0a                    static if(isPointer!(types[" ~ i.to!string ~ "]))opt++;\x0a                    else static if(storages[" ~ i.to!string ~ "] == STC.ref_)req++;\x0a\x0a                    else static assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\". Unsupported parameter type \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");";
-			}
-			ret ~= "system.m_components = Mallocator.instance.makeArray!ushort(req);";
-			ret ~= "system.m_optional_components = Mallocator.instance.makeArray!ushort(opt);";
-			ret ~= "opt = 0;req = 0;";
-			foreach (i; 1 .. (Parameters!(Sys.update)).length)
-			{
-				ret ~= "\x0a                    static if(isPointer!(types[" ~ i.to!string ~ "]))\x0a                    {\x0a                        comp = components_map.get(PointerTarget!(types[" ~ i.to!string ~ "]).stringof, ushort.max);\x0a\x0a                        if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\" due to non existing component \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");\x0a                        system.m_optional_components[opt++] = comp;\x0a                    }\x0a                    else static if(storages[" ~ i.to!string ~ "] == STC.ref_)\x0a                    {\x0a                        comp = components_map.get(types[" ~ i.to!string ~ "].stringof, ushort.max);\x0a\x0a                        if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\" due to non existing component \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");\x0a                        system.m_components[req++] = comp;\x0a                    }";
-			}
-			return ret;
-		}
-		static string catchFunc()(string member, string func)
-		{
-			string ret = "static if (hasMember!(Sys, \"" ~ func ~ "\"))\x0a            {\x0a                static void call" ~ func ~ "(void* system_pointer)\x0a                {\x0a\x0a                    Sys* s = cast(Sys*) system_pointer;\x0a                    s." ~ func ~ "();\x0a                }\x0a\x0a                system." ~ member ~ " = &call" ~ func ~ ";\x0a            }";
-			return ret;
-		}
-		static if (hasMember!(Sys, "update"))
-		{
-			static void callUpdate(ref CallData data, void* entity)
-            {
-                static if (hasMember!(Sys, "update"))
-                {
-                    Sys* s = cast(Sys*) data.system.m_system_pointer;
-
-                    void*[] pointers = (cast(void**) alloca(data.system.m_components.length * (void*)
-                            .sizeof))[0 .. data.system.m_components.length];
-                    void*[] optional_pointers = (cast(void**) alloca(
-                            data.system.m_optional_components.length * (void*).sizeof))[0
-                        .. data.system.m_optional_components.length];
-
-                    EntitiesBlock* block = data.info.first_block;
-                    while (block !is null)
-                    {
-                        uint size = block.type_data.size;
-                        void* data_pointer = block.dataBegin();
-                        foreach (i, ref pointer; pointers)
-                        {
-                            pointer = data_pointer + data.deltas[i];
-                        }
-                        foreach (i, ref pointer; optional_pointers)
-                        {
-                            uint ind = cast(uint)(i + pointers.length);
-                            if (data.deltas[ind] != uint.max)
-                                pointer = data_pointer + data.deltas[ind];
-                            else
-                                pointer = null;
-                        }
-                        foreach (i; 0 .. block.entities_count)
-                        {
-                            mixin(genCall());
-                            data_pointer += size; //data.info.size;
-                            foreach (ref pointer; pointers)
-                                pointer += size;
-                            foreach (ref pointer; optional_pointers)
-                                if (pointer != null)
-                                    pointer += size;
-                        }
-                        block = block.next_block;
-                    }
-
-                }
-            }
-			system.m_update = &callUpdate;
-		}
-
-		mixin(catchFunc("m_enable", "onEnable"));
-		mixin(catchFunc("m_disable", "onDisable"));
-		mixin(catchFunc("m_create", "onCreate"));
-		mixin(catchFunc("m_destroy", "onDestroy"));
-		mixin(catchFunc("m_begin", "onBegin"));
-		mixin(catchFunc("m_end", "onEnd"));
-		system.m_system_pointer = cast(void*)Mallocator.instance.make!Sys;
-		system.m_priority = priority;
-		mixin(genCompList());
-		ushort sys_id = systems_map.get(Sys.stringof, (ushort).max);
-		if (sys_id < systems.length)
-		{
-			system.enable();
-			systems[sys_id] = system;
-		}
-		else
-		{
-			systems_map.add(Sys.stringof, cast(ushort)systems.length);
-			systems.add(system);
-			if (system.m_create)
-				system.m_create(system.m_system_pointer);
-			systems[$ - 1].enable();
-			foreach (info; &entities_infos.byValue)
-			{
-				addEntityCaller(*info, cast(uint)systems.length - 1);
-			}
-		}
-		updateEntityCallers();
-	}
-	void registerComponent(Comp)()
-	{
-		ComponentInfo info;
-		static if (!hasMember!(Comp, "component_id") || !is(typeof(Comp.component_id) == ushort))
-		{
-			static assert(0, "Component should have \"__gshared ushort component_id");
-		}
-
-		static if (hasMember!(Comp, "onDestroy") && isFunction!(Comp.onDestroy) && is(ReturnType!(Comp.onDestroy) == void) && (Parameters!(Comp.onDestroy).length == 0))
-		{
-			static void callDestroy(void* pointer)
-            {
-                (cast(Comp*) pointer).onDestroy();
-            }
-			info.destroy_callback = &callDestroy;
-		}
-
-		info.size = Comp.sizeof;
-		info.aligment = Comp.alignof;
-		info.init_data = Mallocator.instance.makeArray!ubyte(Comp.sizeof);
-		*cast(Comp*)info.init_data.ptr = Comp.init;
-		ushort comp_id = components_map.get(Comp.stringof, (ushort).max);
-		if (comp_id < components.length)
-		{
-			Comp.component_id = comp_id;
-		}
-		else
-		{
-			components.add(info);
-			Comp.component_id = cast(ushort)(components.length - 1);
-			components_map.add(Comp.stringof, cast(ushort)(components.length - 1));
-		}
-	}
-	export void update();
-	static void alignNum(ref ushort num, ushort aligment);
-	extern (C) static int compareUShorts(const void* a, const void* b);
-	export EntityTemplate* allocateTemplate(ushort[] components_ids);
-	export EntityInfo* getEntityInfo(ushort[] ids);
-	export void updateEntityCallers();
-	export void addEntityCaller(ref EntityInfo entity, uint system_id);
-	export Entity* getEntity(EntityID id);
-	export void removeComponents(EntityID entity_id, ushort[] del_ids);
-	private void __removeComponents(EntityID entity_id, ushort[] del_ids);
-	void removeComponents(Components...)(EntityID entity_id)
-	{
-		const uint num = Components.length;
-		ushort[num] del_ids;
-		static foreach (i, comp; Components)
-		{
-			del_ids[i] = comp.component_id;
-		}
-		removeComponents(entity_id, del_ids);
-	}
-	private void __addComponents(EntityID entity_id, ushort[] new_ids, void*[] data_pointers);
-	void addComponents(Components...)(EntityID entity_id, Components comps)
-	{
-		const uint num = Components.length;
-		Entity* entity = id_manager.getEntityPointer(entity_id);
-		EntitiesBlock* block = getMetaData(entity);
-		EntityInfo* info = block.type_data;
-		ushort[] ids = (cast(ushort*)alloca((ushort).sizeof * (info.components.length + num)))[0..info.components.length + num];
-		ushort[num] new_ids;
-		static foreach (i, comp; Components)
-		{
-			new_ids[i] = comp.component_id;
-		}
-		change_entities_list.add(1);
-		change_entities_list.add((cast(ubyte*)&entity_id)[0..8]);
-		change_entities_list.add((cast(ubyte*)&num)[0..4]);
-		change_entities_list.add(cast(ubyte[])new_ids);
-		static foreach (i, comp; comps)
-		{
-			change_entities_list.add((cast(ubyte*)&comp)[0..comp.sizeof]);
-		}
-	}
-	export void freeTemplate(EntityTemplate* template_);
-	export ref Entity addEntity(EntityTemplate* tmpl);
-	private EntitiesBlock* findBlockWithFreeSpace(EntityInfo* info);
-	export void removeEntity(EntityID id);
-	private void __removeEntity(EntityID id);
-	private void removeEntityNoID(Entity* entity, EntitiesBlock* block, bool call_destructors = false);
-	export EntitiesBlock* getMetaData(void* pointer);
-	private void changeEntites();
-	private void updateBlocks();
-	private void removeEntities();
-	export void begin();
-	export void end();
-	struct ComponentInfo
-	{
-		ushort size;
-		ushort aligment;
-		ubyte[] init_data;
-		void function(void* pointer) destroy_callback;
-	}
-	struct EntityInfo
-	{
-		ushort[] components;
-		ushort[] deltas;
-		ushort alignment;
-		ushort size;
-		EntitiesBlock* first_block;
-		EntitiesBlock* first_with_free_space;
-		Vector!CallData callers;
-	}
-	struct EntitiesBlock
-	{
-		uint dataDelta();
-		void* dataBegin();
-		EntityInfo* type_data;
-		ushort entities_count;
-		ushort added_count;
-		uint id;
-		EntitiesBlock* next_block;
-	}
-	struct CallData
-	{
-		uint system_id;
-		System* system;
-		EntityManager.EntityInfo* info;
-		ushort[] deltas;
-	}
-	alias SytemFuncType = void function(ref EntityManager.CallData data, void* entity);
-	enum page_size = 4096;
-	enum pages_in_block = 128;
-	IDManager id_manager;
-	EntityAllocator allocator;
-	Vector!EntityID entities_to_remove;
-	Vector!(EntitiesBlock*) blocks_to_update;
-	Vector!ubyte change_entities_list;
-	HashMap!(ushort[], EntityInfo*) entities_infos;
-	HashMap!(string, ushort) systems_map;
-	HashMap!(string, ushort) components_map;
-	Vector!System systems;
-	Vector!ComponentInfo components;
-	__gshared EntityManager instance;
-}
-version (Windows)
-{
-	extern (Windows) bool DllMain(void* hInstance, uint ulReason, void*);
-}
diff --git a/import/ecs/package.di b/import/ecs/package.di
deleted file mode 100644
index 41d9943..0000000
--- a/import/ecs/package.di
+++ /dev/null
@@ -1,7 +0,0 @@
-// D import file generated from 'source\ecs\package.d'
-module ecs;
-public import ecs.manager;
-public import ecs.entity;
-public import ecs.system;
-import ecs.id_manager;
-import ecs.events;
diff --git a/import/ecs/string_intern.di b/import/ecs/string_intern.di
deleted file mode 100644
index 665bfc5..0000000
--- a/import/ecs/string_intern.di
+++ /dev/null
@@ -1,31 +0,0 @@
-// D import file generated from 'source\ecs\string_intern.d'
-module ecs.string_intern;
-import ecs.hash_map;
-import ecs.traits : isForeachDelegateWithI;
-import std.experimental.allocator;
-import std.experimental.allocator.mallocator;
-import std.traits : Parameters;
-private static __gshared HashMap!(const(char)[], StringIntern) gStringInterns;
-struct StringIntern
-{
-	private const(char)* strPtr;
-	this(const(char)[] fromStr)
-	{
-		opAssign(fromStr);
-	}
-	void reset();
-	size_t length();
-	const(char)[] str();
-	const(char)[] cstr();
-	bool opEquals()(auto ref const StringIntern s)
-	{
-		return strPtr == s.strPtr;
-	}
-	bool opEquals()(auto ref const(char[]) s)
-	{
-		return str() == s;
-	}
-	void opAssign(const(char)[] fromStr);
-	const(char)[] opSlice();
-	private const(char)[] allocStr(const(char)[] fromStr);
-}
diff --git a/import/ecs/system.di b/import/ecs/system.di
deleted file mode 100644
index fd28e8a..0000000
--- a/import/ecs/system.di
+++ /dev/null
@@ -1,26 +0,0 @@
-// D import file generated from 'source\ecs\system.d'
-module ecs.system;
-import ecs.entity;
-import ecs.manager;
-struct System
-{
-	export bool enabled();
-	export void enable();
-	export void disable();
-	export int priority();
-	package 
-	{
-		bool m_enabled = false;
-		int m_priority;
-		void* m_system_pointer;
-		ushort[] m_components;
-		ushort[] m_optional_components;
-		void* m_update;
-		void function(void* system_pointer) m_enable;
-		void function(void* system_pointer) m_disable;
-		void function(void* system_pointer) m_create;
-		void function(void* system_pointer) m_destroy;
-		void function(void* system_pointer) m_begin;
-		void function(void* system_pointer) m_end;
-	}
-}
diff --git a/import/ecs/traits.di b/import/ecs/traits.di
deleted file mode 100644
index 7eef028..0000000
--- a/import/ecs/traits.di
+++ /dev/null
@@ -1,20 +0,0 @@
-// D import file generated from 'source\ecs\traits.d'
-module ecs.traits;
-import std.traits;
-bool isForeachDelegateWithI(DG)()
-{
-	return is(DG == delegate) && is(ReturnType!DG == int) && (Parameters!DG.length == 2) && isIntegral!(Parameters!DG[0]);
-}
-bool isForeachDelegateWithoutI(DG)()
-{
-	return is(DG == delegate) && is(ReturnType!DG == int) && (Parameters!DG.length == 1);
-}
-bool isForeachDelegateWithTypes(DG, Types...)()
-{
-	return is(DG == delegate) && is(ReturnType!DG == int) && is(Parameters!DG == Types);
-}
-auto assumeNoGC(T)(T t) if (isFunctionPointer!T || isDelegate!T)
-{
-	enum attrs = functionAttributes!T | FunctionAttribute.nogc;
-	return cast(SetFunctionAttributes!(T, functionLinkage!T, attrs))t;
-}
diff --git a/import/ecs/vector.di b/import/ecs/vector.di
deleted file mode 100644
index cb0917e..0000000
--- a/import/ecs/vector.di
+++ /dev/null
@@ -1,274 +0,0 @@
-// D import file generated from 'source\ecs\vector.d'
-module ecs.vector;
-import core.bitop;
-import core.stdc.stdlib : free, malloc;
-import core.stdc.string : memcpy, memset;
-import std.algorithm : swap;
-import std.conv : emplace;
-import std.traits : hasMember, isCopyable, TemplateOf, Unqual;
-export pure nothrow @nogc @safe size_t nextPow2(size_t num);
-__gshared size_t gVectorsCreated = 0;
-__gshared size_t gVectorsDestroyed = 0;
-struct Vector(T)
-{
-	T[] array;
-	size_t used;
-	public 
-	{
-		export this()(T t)
-		{
-			add(t);
-		}
-		export this(X)(X[] t) if (is(Unqual!X == Unqual!T))
-		{
-			add(t);
-		}
-		static if (isCopyable!T)
-		{
-			export this(this)
-			{
-				T[] tmp = array[0..used];
-				array = null;
-				used = 0;
-				add(tmp);
-			}
-		}
-		else
-		{
-			@disable this(this);
-		}
-		export ~this()
-		{
-			clear();
-		}
-		export void clear()
-		{
-			removeAll();
-		}
-		export void removeAll()
-		{
-			if (array !is null)
-			{
-				foreach (ref el; array[0..used])
-				{
-					destroy(el);
-				}
-				freeData(cast(void[])array);
-				gVectorsDestroyed++;
-			}
-			array = null;
-			used = 0;
-		}
-		export bool empty()
-		{
-			return used == 0;
-		}
-		export size_t length()
-		{
-			return used;
-		}
-		export void length(size_t newLength)
-		{
-			if (newLength > used)
-			{
-				reserve(newLength);
-				foreach (ref el; array[used..newLength])
-				{
-					emplace(&el);
-				}
-			}
-			else
-			{
-				foreach (ref el; array[newLength..used])
-				{
-					destroy(el);
-				}
-			}
-			used = newLength;
-		}
-		export void reset()
-		{
-			used = 0;
-		}
-		export void reserve(size_t numElements)
-		{
-			if (numElements > array.length)
-			{
-				extend(numElements);
-			}
-		}
-		export size_t capacity()
-		{
-			return array.length - used;
-		}
-		export void extend(size_t newNumOfElements)
-		{
-			auto oldArray = manualExtend(array, newNumOfElements);
-			if (oldArray !is null)
-			{
-				freeData(oldArray);
-			}
-		}
-		export @nogc void freeData(void[] data)
-		{
-			memset(data.ptr, 15, data.length);
-			free(data.ptr);
-		}
-		export static void[] manualExtend(ref T[] array, size_t newNumOfElements = 0)
-		{
-			if (newNumOfElements == 0)
-				newNumOfElements = 2;
-			if (array.length == 0)
-				gVectorsCreated++;
-			T[] oldArray = array;
-			size_t oldSize = oldArray.length * T.sizeof;
-			size_t newSize = newNumOfElements * T.sizeof;
-			T* memory = cast(T*)malloc(newSize);
-			memcpy(cast(void*)memory, cast(void*)oldArray.ptr, oldSize);
-			array = memory[0..newNumOfElements];
-			return cast(void[])oldArray;
-		}
-		export Vector!T copy()()
-		{
-			Vector!T duplicate;
-			duplicate.reserve(used);
-			duplicate ~= array[0..used];
-			return duplicate;
-		}
-		export bool canAddWithoutRealloc(uint elemNum = 1)
-		{
-			return used + elemNum <= array.length;
-		}
-		export void add()(T t)
-		{
-			if (used >= array.length)
-			{
-				extend(nextPow2(used + 1));
-			}
-			emplace(&array[used], t);
-			used++;
-		}
-		export void add()(T t, size_t pos)
-		{
-			assert(pos <= used);
-			if (used >= array.length)
-			{
-				extend(array.length * 2);
-			}
-			foreach_reverse (size_t i; pos .. used)
-			{
-				array[i + 1] = array[i];
-			}
-			emplace(&array[pos], t);
-			used++;
-		}
-		export void add(X)(X[] t) if (is(Unqual!X == Unqual!T))
-		{
-			if (used + t.length > array.length)
-			{
-				extend(nextPow2(used + t.length));
-			}
-			foreach (i; 0 .. t.length)
-			{
-				emplace(&array[used + i], t[i]);
-			}
-			used += t.length;
-		}
-		export void remove(size_t elemNum)
-		{
-			destroy(array[elemNum]);
-			swap(array[elemNum], array[used - 1]);
-			used--;
-		}
-		export void removeStable()(size_t elemNum)
-		{
-			used--;
-			foreach (i; 0 .. used)
-			{
-				array[i] = array[i + 1];
-			}
-		}
-		export bool tryRemoveElement()(T elem)
-		{
-			foreach (i, ref el; array[0..used])
-			{
-				if (el == elem)
-				{
-					remove(i);
-					return true;
-				}
-			}
-			return false;
-		}
-		export void removeElement()(T elem)
-		{
-			bool ok = tryRemoveElement(elem);
-			assert(ok, "There is no such an element in vector");
-		}
-		export ref T opIndex(size_t elemNum)
-		{
-			assert(elemNum < used, "Range violation [index]");
-			return array.ptr[elemNum];
-		}
-		export auto opSlice()
-		{
-			return array.ptr[0..used];
-		}
-		export T[] opSlice(size_t x, size_t y)
-		{
-			assert(y <= used);
-			return array.ptr[x..y];
-		}
-		export size_t opDollar()
-		{
-			return used;
-		}
-		export void opAssign(X)(X[] slice)
-		{
-			reset();
-			this ~= slice;
-		}
-		export void opOpAssign(string op)(T obj)
-		{
-			static assert(op == "~");
-			add(obj);
-		}
-		export void opOpAssign(string op, X)(X[] obj)
-		{
-			static assert(op == "~");
-			add(obj);
-		}
-		export void opIndexAssign()(T obj, size_t elemNum)
-		{
-			assert(elemNum < used, "Range viloation");
-			array[elemNum] = obj;
-		}
-		export void opSliceAssign()(T[] obj, size_t a, size_t b)
-		{
-			assert(b <= used && (a <= b), "Range viloation");
-			array.ptr[a..b] = obj;
-		}
-		export const bool opEquals()(auto ref const Vector!T r)
-		{
-			return used == r.used && (array.ptr[0..used] == r.array.ptr[0..r.used]);
-		}
-		export const nothrow @trusted size_t toHash()
-		{
-			return hashOf(cast(Unqual!T[])array.ptr[0..used]);
-		}
-		import std.format : FormatSpec, formatValue;
-		export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt)
-		{
-			static if (__traits(compiles, formatValue(sink, array[0..used], fmt)))
-			{
-				formatValue(sink, array[0..used], fmt);
-			}
-
-		}
-	}
-}
-private pure nothrow @nogc @safe T[n] s(T, size_t n)(auto ref T[n] array)
-{
-	return array;
-}
-enum string checkVectorAllocations = "\x0a//assert(gVectorsCreated==gVectorsDestroyed);\x0agVectorsCreated=gVectorsDestroyed=0;\x0ascope(exit){if(gVectorsCreated!=gVectorsDestroyed){\x09\x0a\x09import std.stdio : writefln;\x0a\x09writefln(\"created==destroyed  %s==%s\", gVectorsCreated, gVectorsDestroyed);\x0a\x09assert(gVectorsCreated==gVectorsDestroyed, \"Vector memory leak\");\x0a}}\x0a";