diff --git a/p2p/api.py b/app/api.py
similarity index 100%
rename from p2p/api.py
rename to app/api.py
diff --git a/p2p/persona.py b/app/persona.py
similarity index 100%
rename from p2p/persona.py
rename to app/persona.py
diff --git a/requirements.txt b/requirements.txt
index 32764e1..0f01493 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,14 +2,20 @@ astroid==2.4.2
 certifi==2020.6.20
 cffi==1.14.2
 chardet==3.0.4
+click==7.1.2
 cryptography==3.0
 docutils==0.16
+Flask==1.1.2
+Flask-Classful==0.14.2
 idna==2.10
 isort==5.4.2
+itsdangerous==1.1.0
+Jinja2==2.11.2
 Kivy @ git+http://github.com/kivy/kivy@f34c43f235f35767ed04765a90d68b23807436ba
 Kivy-Garden==0.1.4
 kivymd==0.104.1
 lazy-object-proxy==1.4.3
+MarkupSafe==1.1.1
 mccabe==0.6.1
 numpy==1.19.1
 pathtools==0.1.2
@@ -18,6 +24,7 @@ plyer==1.4.3
 pycparser==2.20
 Pygments==2.6.1
 pylint==2.6.0
+pythemis==0.13.0
 requests==2.24.0
 rpcudp==4.0.1
 six==1.15.0
@@ -27,4 +34,5 @@ typed-ast==1.4.1
 u-msgpack-python==2.7.0
 urllib3==1.25.10
 watchdog==0.10.3
+Werkzeug==1.0.1
 wrapt==1.12.1
diff --git a/operator/caller.py b/server/caller.py
similarity index 100%
rename from operator/caller.py
rename to server/caller.py
diff --git a/operator/ether.py b/server/ether.py
similarity index 100%
rename from operator/ether.py
rename to server/ether.py
diff --git a/operator/operator.py b/server/keyserver0.py
similarity index 100%
rename from operator/operator.py
rename to server/keyserver0.py
diff --git a/server/storage.py b/server/storage.py
new file mode 100644
index 0000000..283e48e
--- /dev/null
+++ b/server/storage.py
@@ -0,0 +1,5 @@
+"""
+Storage for both keys and data
+"""
+
+pass
\ No newline at end of file
diff --git a/server/the_operator.py b/server/the_operator.py
new file mode 100644
index 0000000..c788e38
--- /dev/null
+++ b/server/the_operator.py
@@ -0,0 +1,85 @@
+"""
+There is only one operator!
+Running on node prime.
+"""
+import os
+from flask import Flask
+from flask import request
+import asyncio
+from pythemis.skeygen import KEY_PAIR_TYPE, GenerateKeyPair
+from pythemis.smessage import SMessage, ssign, sverify
+from pythemis.exception import ThemisError
+from base64 import b64encode,b64decode
+BSEP=b'||||||||||'
+BSEP2=b'@@@@@@@@@@'
+BSEP3=b'##########'
+
+HOME_OPERATOR = os.path.abspath(__file__)
+PATH_DB_KEYS = os.path.join(HOME_OPERATOR, '.keydb')
+
+
+keyhome = os.path.join(os.path.expanduser('~'),'.komrade','.keyserver')
+if not os.path.exists(keyhome): os.makedirs(keyhome)
+
+keyserver = 'komrade.app'
+keyserver_port = 5566
+
+app = Flask(__name__)
+
+async def init():
+    from api import Api
+    api = Api()
+    # keyserver = await api.personate('keyserver')
+
+    keypair = GenerateKeyPair(KEY_PAIR_TYPE.EC)
+    privkey = keypair.export_private_key()
+    pubkey = keypair.export_public_key()
+
+    print('pubkey:',pubkey)
+    with open('.keyserver.loc','wb') as of: of.write(b64encode(pubkey))
+    with open(os.path.join(keyhome,'.keyserver.key'),'wb') as of: of.write(b64encode(privkey))    
+
+## load pubkey
+PATH_PUBKEY = os.path.join(os.path.dirname(__file__),'.keyserver.loc')
+PATH_PRIVKEY = os.path.join(keyhome,'.keyserver.key')
+if not os.path.exists(PATH_PRIVKEY) or not os.path.exists(PATH_PUBKEY):
+    asyncio.run(init())
+
+with open(PATH_PUBKEY) as f:
+    PUBKEY_b64 = f.read()
+    PUBKEY = b64decode(PUBKEY_b64)
+with open(PATH_PRIVKEY) as f:
+    PRIVKEY_b64 = f.read()
+    PRIVKEY = b64decode(PRIVKEY_b64)
+
+@app.route('/pub')
+def pubkey():
+    return PUBKEY_b64
+
+@app.route('/add/<name>',methods=['POST'])
+def add(name):
+    key_fn = os.path.join(keyhome,name+'.loc')
+    if not os.path.exists(key_fn):
+        with open(key_fn,'wb') as of:
+            pubkey,signed_pubkey=request.data.split(BSEP)
+            server_signed_pubkey = b64encode(ssign(PRIVKEY,pubkey))
+            package = pubkey + BSEP + signed_pubkey + BSEP + server_signed_pubkey
+            package_b64 = b64encode(package)
+            print('add package -->',package)     
+            print('add package_b64 -->',package_b64)
+            of.write(package_b64)
+            return package_b64
+    return None
+
+@app.route('/get/<name>')
+def get(name):
+    key_fn = os.path.join(keyhome,name+'.loc')
+    if os.path.exists(key_fn):
+        with open(key_fn,'rb') as f:
+            signed_key=f.read()
+            return signed_key
+    return b''
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0',port=keyserver_port)
+    # asyncio.run(init())
\ No newline at end of file