diff --git a/components/orchestration/.gitignore b/components/entitiy_ident/.gitignore
similarity index 100%
rename from components/orchestration/.gitignore
rename to components/entitiy_ident/.gitignore
diff --git a/components/orchestration/.run/createsuperuser.run.xml b/components/entitiy_ident/.run/createsuperuser.run.xml
similarity index 100%
rename from components/orchestration/.run/createsuperuser.run.xml
rename to components/entitiy_ident/.run/createsuperuser.run.xml
diff --git a/components/orchestration/.run/makemigrations.run.xml b/components/entitiy_ident/.run/makemigrations.run.xml
similarity index 100%
rename from components/orchestration/.run/makemigrations.run.xml
rename to components/entitiy_ident/.run/makemigrations.run.xml
diff --git a/components/orchestration/.run/migrate.run.xml b/components/entitiy_ident/.run/migrate.run.xml
similarity index 100%
rename from components/orchestration/.run/migrate.run.xml
rename to components/entitiy_ident/.run/migrate.run.xml
diff --git a/components/orchestration/.run/runserver.run.xml b/components/entitiy_ident/.run/runserver.run.xml
similarity index 100%
rename from components/orchestration/.run/runserver.run.xml
rename to components/entitiy_ident/.run/runserver.run.xml
diff --git a/components/orchestration/Dockerfile b/components/entitiy_ident/Dockerfile
similarity index 100%
rename from components/orchestration/Dockerfile
rename to components/entitiy_ident/Dockerfile
diff --git a/components/entitiy_ident/README.md b/components/entitiy_ident/README.md
index 5681d10..274fb7c 100644
--- a/components/entitiy_ident/README.md
+++ b/components/entitiy_ident/README.md
@@ -1,6 +1,20 @@
-# Super Lightweight Flask Web Server
-* `pip install requirements.txt`
-* `python entitiy_ident_service.py`
-* `http://127.0.0.1:5000` -> `Hello World`
-* `http://127.0.0.1:5000/api1` -> `api1`
-* `http://127.0.0.1:5000/api2` -> `api2`
+# AIC Django Middleware
+
+## Tips
+* use Jetbrains Pycharm IDE
+* create and use a virtual environment
+
+## Setup
+    $ cd ./middleware
+    
+    $ pip install -r requirements.txt
+    
+    $ python manage.py makemigrations
+    $ python manage.py migrate
+    $ python manage.py createsuperuser
+    
+    $ python mangge.py runserver
+
+## ERROR handling
+<em>Microsoft Visual C++ 14.0 or greater is required. Get it with "Microsoft C++ Build Tools"</em>
+<br>Install missing deps https://visualstudio.microsoft.com/visual-cpp-build-tools/
diff --git a/components/orchestration/__init__.py b/components/entitiy_ident/__init__.py
similarity index 100%
rename from components/orchestration/__init__.py
rename to components/entitiy_ident/__init__.py
diff --git a/components/orchestration/app_be/__init__.py b/components/entitiy_ident/app_be/__init__.py
similarity index 100%
rename from components/orchestration/app_be/__init__.py
rename to components/entitiy_ident/app_be/__init__.py
diff --git a/components/orchestration/app_be/admin.py b/components/entitiy_ident/app_be/admin.py
similarity index 100%
rename from components/orchestration/app_be/admin.py
rename to components/entitiy_ident/app_be/admin.py
diff --git a/components/orchestration/app_be/apps.py b/components/entitiy_ident/app_be/apps.py
similarity index 100%
rename from components/orchestration/app_be/apps.py
rename to components/entitiy_ident/app_be/apps.py
diff --git a/components/orchestration/app_be/models.py b/components/entitiy_ident/app_be/models.py
similarity index 100%
rename from components/orchestration/app_be/models.py
rename to components/entitiy_ident/app_be/models.py
diff --git a/components/orchestration/app_be/routing.py b/components/entitiy_ident/app_be/routing.py
similarity index 100%
rename from components/orchestration/app_be/routing.py
rename to components/entitiy_ident/app_be/routing.py
diff --git a/components/orchestration/app_be/serializers.py b/components/entitiy_ident/app_be/serializers.py
similarity index 100%
rename from components/orchestration/app_be/serializers.py
rename to components/entitiy_ident/app_be/serializers.py
diff --git a/components/orchestration/app_be/services/data_factory.py b/components/entitiy_ident/app_be/services/data_factory.py
similarity index 100%
rename from components/orchestration/app_be/services/data_factory.py
rename to components/entitiy_ident/app_be/services/data_factory.py
diff --git a/components/orchestration/app_be/services/tests/test_data_factory.py b/components/entitiy_ident/app_be/services/tests/test_data_factory.py
similarity index 100%
rename from components/orchestration/app_be/services/tests/test_data_factory.py
rename to components/entitiy_ident/app_be/services/tests/test_data_factory.py
diff --git a/components/orchestration/app_be/settings.py b/components/entitiy_ident/app_be/settings.py
similarity index 100%
rename from components/orchestration/app_be/settings.py
rename to components/entitiy_ident/app_be/settings.py
diff --git a/components/orchestration/app_be/tests.py b/components/entitiy_ident/app_be/tests.py
similarity index 100%
rename from components/orchestration/app_be/tests.py
rename to components/entitiy_ident/app_be/tests.py
diff --git a/components/orchestration/app_be/urls.py b/components/entitiy_ident/app_be/urls.py
similarity index 100%
rename from components/orchestration/app_be/urls.py
rename to components/entitiy_ident/app_be/urls.py
diff --git a/components/orchestration/app_be/views/__init__.py b/components/entitiy_ident/app_be/views/__init__.py
similarity index 100%
rename from components/orchestration/app_be/views/__init__.py
rename to components/entitiy_ident/app_be/views/__init__.py
diff --git a/components/orchestration/app_be/views/rest_api.py b/components/entitiy_ident/app_be/views/rest_api.py
similarity index 100%
rename from components/orchestration/app_be/views/rest_api.py
rename to components/entitiy_ident/app_be/views/rest_api.py
diff --git a/components/orchestration/app_be/views/tests/__init__.py b/components/entitiy_ident/app_be/views/tests/__init__.py
similarity index 100%
rename from components/orchestration/app_be/views/tests/__init__.py
rename to components/entitiy_ident/app_be/views/tests/__init__.py
diff --git a/components/orchestration/app_be/views/tests/test_rest_api.py b/components/entitiy_ident/app_be/views/tests/test_rest_api.py
similarity index 100%
rename from components/orchestration/app_be/views/tests/test_rest_api.py
rename to components/entitiy_ident/app_be/views/tests/test_rest_api.py
diff --git a/components/orchestration/app_be/views/tests/test_ws_api.py b/components/entitiy_ident/app_be/views/tests/test_ws_api.py
similarity index 100%
rename from components/orchestration/app_be/views/tests/test_ws_api.py
rename to components/entitiy_ident/app_be/views/tests/test_ws_api.py
diff --git a/components/orchestration/app_be/views/ws_api.py b/components/entitiy_ident/app_be/views/ws_api.py
similarity index 100%
rename from components/orchestration/app_be/views/ws_api.py
rename to components/entitiy_ident/app_be/views/ws_api.py
diff --git a/components/orchestration/app_be/wsgi.py b/components/entitiy_ident/app_be/wsgi.py
similarity index 100%
rename from components/orchestration/app_be/wsgi.py
rename to components/entitiy_ident/app_be/wsgi.py
diff --git a/components/orchestration/manage.py b/components/entitiy_ident/manage.py
similarity index 100%
rename from components/orchestration/manage.py
rename to components/entitiy_ident/manage.py
diff --git a/components/entitiy_ident/requirements.txt b/components/entitiy_ident/requirements.txt
index 8ab6294..bffbb4c 100644
--- a/components/entitiy_ident/requirements.txt
+++ b/components/entitiy_ident/requirements.txt
@@ -1 +1,10 @@
-flask
\ No newline at end of file
+# install setup.py in dev mode
+-e .
+
+Django==3.0.5
+djangorestframework==3.12.1
+djangorestframework-jwt==1.11.0
+django-cors-headers==3.5.0
+channels==3.0.1
+channels_redis==3.2.0
+whitenoise==5.2.0
diff --git a/components/orchestration/setup.py b/components/entitiy_ident/setup.py
similarity index 58%
rename from components/orchestration/setup.py
rename to components/entitiy_ident/setup.py
index 47df6b4..1bb48c6 100644
--- a/components/orchestration/setup.py
+++ b/components/entitiy_ident/setup.py
@@ -9,15 +9,6 @@ setup(
     version='0.0.0',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=[
-        'Django==3.0.5',
-        'djangorestframework==3.12.1',
-        'djangorestframework-jwt==1.11.0',
-        'django-cors-headers==3.5.0',
-        'channels==3.0.1',
-        'channels_redis==3.2.0',
-        'whitenoise==5.2.0',
-    ],
     license='BSD License',  # example license
     description='DESCRIPTION'
 )
diff --git a/components/event_store/requirements.txt b/components/event_store/requirements.txt
index f8fbb87..bffbb4c 100644
--- a/components/event_store/requirements.txt
+++ b/components/event_store/requirements.txt
@@ -1,2 +1,10 @@
 # install setup.py in dev mode
 -e .
+
+Django==3.0.5
+djangorestframework==3.12.1
+djangorestframework-jwt==1.11.0
+django-cors-headers==3.5.0
+channels==3.0.1
+channels_redis==3.2.0
+whitenoise==5.2.0
diff --git a/components/event_store/setup.py b/components/event_store/setup.py
index 47df6b4..1bb48c6 100644
--- a/components/event_store/setup.py
+++ b/components/event_store/setup.py
@@ -9,15 +9,6 @@ setup(
     version='0.0.0',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=[
-        'Django==3.0.5',
-        'djangorestframework==3.12.1',
-        'djangorestframework-jwt==1.11.0',
-        'django-cors-headers==3.5.0',
-        'channels==3.0.1',
-        'channels_redis==3.2.0',
-        'whitenoise==5.2.0',
-    ],
     license='BSD License',  # example license
     description='DESCRIPTION'
 )
diff --git a/components/orchestration/README.md b/components/orchestration/README.md
index 274fb7c..5681d10 100644
--- a/components/orchestration/README.md
+++ b/components/orchestration/README.md
@@ -1,20 +1,6 @@
-# AIC Django Middleware
-
-## Tips
-* use Jetbrains Pycharm IDE
-* create and use a virtual environment
-
-## Setup
-    $ cd ./middleware
-    
-    $ pip install -r requirements.txt
-    
-    $ python manage.py makemigrations
-    $ python manage.py migrate
-    $ python manage.py createsuperuser
-    
-    $ python mangge.py runserver
-
-## ERROR handling
-<em>Microsoft Visual C++ 14.0 or greater is required. Get it with "Microsoft C++ Build Tools"</em>
-<br>Install missing deps https://visualstudio.microsoft.com/visual-cpp-build-tools/
+# Super Lightweight Flask Web Server
+* `pip install requirements.txt`
+* `python entitiy_ident_service.py`
+* `http://127.0.0.1:5000` -> `Hello World`
+* `http://127.0.0.1:5000/api1` -> `api1`
+* `http://127.0.0.1:5000/api2` -> `api2`
diff --git a/components/entitiy_ident/entitiy_ident_service.py b/components/orchestration/entitiy_ident_service.py
similarity index 100%
rename from components/entitiy_ident/entitiy_ident_service.py
rename to components/orchestration/entitiy_ident_service.py
diff --git a/components/orchestration/requirements.txt b/components/orchestration/requirements.txt
index f8fbb87..8ab6294 100644
--- a/components/orchestration/requirements.txt
+++ b/components/orchestration/requirements.txt
@@ -1,2 +1 @@
-# install setup.py in dev mode
--e .
+flask
\ No newline at end of file
diff --git a/components/x_way/README.md b/components/x_way/README.md
new file mode 100644
index 0000000..5681d10
--- /dev/null
+++ b/components/x_way/README.md
@@ -0,0 +1,6 @@
+# Super Lightweight Flask Web Server
+* `pip install requirements.txt`
+* `python entitiy_ident_service.py`
+* `http://127.0.0.1:5000` -> `Hello World`
+* `http://127.0.0.1:5000/api1` -> `api1`
+* `http://127.0.0.1:5000/api2` -> `api2`
diff --git a/components/x_way/entitiy_ident_service.py b/components/x_way/entitiy_ident_service.py
new file mode 100644
index 0000000..3dfc734
--- /dev/null
+++ b/components/x_way/entitiy_ident_service.py
@@ -0,0 +1,22 @@
+from flask import Flask
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def hello_world():
+    return 'Hello World'
+
+
+@app.route('/api1')
+def api1():
+    return 'api1'
+
+
+@app.route('/api2')
+def api2():
+    return 'api2'
+
+
+if __name__ == '__main__':
+    app.run()
diff --git a/components/x_way/requirements.txt b/components/x_way/requirements.txt
new file mode 100644
index 0000000..8ab6294
--- /dev/null
+++ b/components/x_way/requirements.txt
@@ -0,0 +1 @@
+flask
\ No newline at end of file