diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..f7210bb
Binary files /dev/null and b/.DS_Store differ
diff --git a/.vscode/launch.json b/.vscode/launch.json
index f28f2c3..a34174e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,22 +9,22 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Dev",
+            "name": "server-dev",
             "runtimeExecutable": "npm",
             "runtimeArgs": [
                 "run-script", "dev"
             ],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceRoot}/server/",
         },
         {
             "type": "node",
             "request": "launch",
-            "name": "Test watch",
+            "name": "server-test-watch",
             "runtimeExecutable": "npm",
             "runtimeArgs": [
-                "run-script", "watch"
+                "run-script", "test:watch"
             ],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceRoot}/server/",
         }
     ]
 }
\ No newline at end of file
diff --git a/.eslintrc.cjs b/server/.eslintrc.cjs
similarity index 100%
rename from .eslintrc.cjs
rename to server/.eslintrc.cjs
diff --git a/.gitignore b/server/.gitignore
similarity index 100%
rename from .gitignore
rename to server/.gitignore
diff --git a/.npmignore b/server/.npmignore
similarity index 100%
rename from .npmignore
rename to server/.npmignore
diff --git a/README.md b/server/README.md
similarity index 100%
rename from README.md
rename to server/README.md
diff --git a/package.json b/server/package.json
similarity index 90%
rename from package.json
rename to server/package.json
index e3be52d..3a35aae 100644
--- a/package.json
+++ b/server/package.json
@@ -6,8 +6,8 @@
   "main": "index.js",
   "scripts": {
     "pretest": "tsc",
-    "test": "tsc && node ./test/test.js",
-    "watch": "tsc-watch --onSuccess 'node ./test/test.js'"
+    "test": "node ./test/test.js",
+    "test:watch": "tsc-watch --onSuccess 'node ./test/test.js'"
   },
   "author": "IDONTSUDO",
   "devDependencies": {
diff --git a/src/core/di/env.ts b/server/src/core/di/env.ts
similarity index 100%
rename from src/core/di/env.ts
rename to server/src/core/di/env.ts
diff --git a/src/core/di/register_di.ts b/server/src/core/di/register_di.ts
similarity index 100%
rename from src/core/di/register_di.ts
rename to server/src/core/di/register_di.ts
diff --git a/src/core/helper/cancelable_promise.ts b/server/src/core/helper/cancelable_promise.ts
similarity index 100%
rename from src/core/helper/cancelable_promise.ts
rename to server/src/core/helper/cancelable_promise.ts
diff --git a/src/core/helper/delay.ts b/server/src/core/helper/delay.ts
similarity index 100%
rename from src/core/helper/delay.ts
rename to server/src/core/helper/delay.ts
diff --git a/src/core/helper/result.ts b/server/src/core/helper/result.ts
similarity index 100%
rename from src/core/helper/result.ts
rename to server/src/core/helper/result.ts
diff --git a/src/core/helper/typed_event.ts b/server/src/core/helper/typed_event.ts
similarity index 100%
rename from src/core/helper/typed_event.ts
rename to server/src/core/helper/typed_event.ts
diff --git a/src/core/helper/worker_computed.ts b/server/src/core/helper/worker_computed.ts
similarity index 100%
rename from src/core/helper/worker_computed.ts
rename to server/src/core/helper/worker_computed.ts
diff --git a/src/core/model/exec_error_model.ts b/server/src/core/model/exec_error_model.ts
similarity index 100%
rename from src/core/model/exec_error_model.ts
rename to server/src/core/model/exec_error_model.ts
diff --git a/src/core/model/executor_result.ts b/server/src/core/model/executor_result.ts
similarity index 100%
rename from src/core/model/executor_result.ts
rename to server/src/core/model/executor_result.ts
diff --git a/src/core/model/meta_data_file_manager_model.ts b/server/src/core/model/meta_data_file_manager_model.ts
similarity index 100%
rename from src/core/model/meta_data_file_manager_model.ts
rename to server/src/core/model/meta_data_file_manager_model.ts
diff --git a/src/core/model/process_model.ts b/server/src/core/model/process_model.ts
similarity index 100%
rename from src/core/model/process_model.ts
rename to server/src/core/model/process_model.ts
diff --git a/src/core/services/executor_program_service.ts b/server/src/core/services/executor_program_service.ts
similarity index 100%
rename from src/core/services/executor_program_service.ts
rename to server/src/core/services/executor_program_service.ts
diff --git a/src/core/services/files_change_notifier_service.ts b/server/src/core/services/files_change_notifier_service.ts
similarity index 100%
rename from src/core/services/files_change_notifier_service.ts
rename to server/src/core/services/files_change_notifier_service.ts
diff --git a/src/index.ts b/server/src/index.ts
similarity index 100%
rename from src/index.ts
rename to server/src/index.ts
diff --git a/test/context/test.txt b/server/test/context/test.txt
similarity index 100%
rename from test/context/test.txt
rename to server/test/context/test.txt
diff --git a/test/core/test_core.ts b/server/test/core/test_core.ts
similarity index 100%
rename from test/core/test_core.ts
rename to server/test/core/test_core.ts
diff --git a/test/executor_program_service_test.ts b/server/test/executor_program_service_test.ts
similarity index 100%
rename from test/executor_program_service_test.ts
rename to server/test/executor_program_service_test.ts
diff --git a/test/files_change_notifier_service_test.ts b/server/test/files_change_notifier_service_test.ts
similarity index 100%
rename from test/files_change_notifier_service_test.ts
rename to server/test/files_change_notifier_service_test.ts
diff --git a/test/mocks/log_code.ts b/server/test/mocks/log_code.ts
similarity index 100%
rename from test/mocks/log_code.ts
rename to server/test/mocks/log_code.ts
diff --git a/test/mocks/long_code.ts b/server/test/mocks/long_code.ts
similarity index 100%
rename from test/mocks/long_code.ts
rename to server/test/mocks/long_code.ts
diff --git a/test/test.ts b/server/test/test.ts
similarity index 100%
rename from test/test.ts
rename to server/test/test.ts
diff --git a/tsconfig.json b/server/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to server/tsconfig.json
diff --git a/tslint.json b/server/tslint.json
similarity index 100%
rename from tslint.json
rename to server/tslint.json