diff --git a/medcat-service/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
similarity index 100%
rename from medcat-service/.devcontainer/devcontainer.json
rename to .devcontainer/devcontainer.json
diff --git a/medcat-service/.github/dependabot.yml b/.github/dependabot.yml
similarity index 100%
rename from medcat-service/.github/dependabot.yml
rename to .github/dependabot.yml
diff --git a/medcat-service/.github/workflows/docker.yml b/.github/workflows/medcat-service_docker.yml
similarity index 95%
rename from medcat-service/.github/workflows/docker.yml
rename to .github/workflows/medcat-service_docker.yml
index 476d36a99..dfe1be570 100755
--- a/medcat-service/.github/workflows/docker.yml
+++ b/.github/workflows/medcat-service_docker.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: medcat-service - Build Images
 
 on:
   push:
@@ -11,9 +11,14 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
+defaults:
+  run:
+    working-directory: ./medcat-service
 jobs:
+
   build:
+    # DIsable the build temporarily
+    if: false 
     runs-on: ubuntu-latest
     outputs:
       image_version: ${{ steps.meta.outputs.version }}
diff --git a/medcat-service/.github/workflows/run_tests.yml b/.github/workflows/medcat-service_run-tests.yml
similarity index 94%
rename from medcat-service/.github/workflows/run_tests.yml
rename to .github/workflows/medcat-service_run-tests.yml
index 3c82261b9..9cdda0e4d 100755
--- a/medcat-service/.github/workflows/run_tests.yml
+++ b/.github/workflows/medcat-service_run-tests.yml
@@ -1,4 +1,4 @@
-name: Run tests
+name: medcat-service - Test
 
 on:
 
@@ -13,6 +13,10 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+defaults:
+  run:
+    working-directory: ./medcat-service
+
 jobs:
 
   build:
diff --git a/medcat-v2-tutorials/.github/workflows/main.yml b/.github/workflows/medcat-v2-tutorials_main.yml
similarity index 96%
rename from medcat-v2-tutorials/.github/workflows/main.yml
rename to .github/workflows/medcat-v2-tutorials_main.yml
index 851581f5e..de8b0b806 100644
--- a/medcat-v2-tutorials/.github/workflows/main.yml
+++ b/.github/workflows/medcat-v2-tutorials_main.yml
@@ -1,4 +1,4 @@
-name: build
+name: medcat-v2-tutorials - Test
 
 on:
   push:
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ main ]
 
+defaults:
+  run:
+    working-directory: ./medcat-v2-tutorials
+
 jobs:
   basic-and-meta:
     runs-on: ubuntu-latest
diff --git a/medcat-v2/.github/workflows/main.yml b/.github/workflows/medcat-v2_main.yml
similarity index 93%
rename from medcat-v2/.github/workflows/main.yml
rename to .github/workflows/medcat-v2_main.yml
index fdc81319d..08d633948 100644
--- a/medcat-v2/.github/workflows/main.yml
+++ b/.github/workflows/medcat-v2_main.yml
@@ -1,11 +1,13 @@
-name: build
+name: medcat-v2 - Test
 
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-
+defaults:
+  run:
+    working-directory: ./medcat-v2
 jobs:
   build:
 
diff --git a/medcat-v2/.github/workflows/release.yml b/.github/workflows/medcat-v2_release.yml
similarity index 94%
rename from medcat-v2/.github/workflows/release.yml
rename to .github/workflows/medcat-v2_release.yml
index f76c73215..35c54b418 100644
--- a/medcat-v2/.github/workflows/release.yml
+++ b/.github/workflows/medcat-v2_release.yml
@@ -1,4 +1,4 @@
-name: Release
+name: medcat-v2 - Build Python Package
 
 on:
   push:
@@ -8,6 +8,10 @@ on:
 permissions:
   contents: write
 
+defaults:
+  run:
+    working-directory: ./medcat-v2
+
 jobs:
   build:
     name: Build and release
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..809108b85
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,93 @@
+Elastic License 2.0
+
+URL: https://www.elastic.co/licensing/elastic-license
+
+## Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+## Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide,
+non-sublicensable, non-transferable license to use, copy, distribute, make
+available, and prepare derivative works of the software, in each case subject to
+the limitations and conditions below.
+
+## Limitations
+
+You may not provide the software to third parties as a hosted or managed
+service, where the service provides users with access to any substantial set of
+the features or functionality of the software.
+
+You may not move, change, disable, or circumvent the license key functionality
+in the software, and you may not remove or obscure any functionality in the
+software that is protected by the license key.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices
+of the licensor in the software. Any use of the licensor’s trademarks is subject
+to applicable law.
+
+## Patents
+
+The licensor grants you a license, under any patent claims the licensor can
+license, or becomes able to license, to make, have made, use, sell, offer for
+sale, import and have imported the software, in each case subject to the
+limitations and conditions in this license. This license does not cover any
+patent claims that you cause to be infringed by modifications or additions to
+the software. If you or your company make any written claim that the software
+infringes or contributes to infringement of any patent, your patent license for
+the software granted under these terms ends immediately. If your company makes
+such a claim, your patent license ends immediately for work on behalf of your
+company.
+
+## Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you
+also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the
+software prominent notices stating that you have modified the software.
+
+## No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in
+these terms.
+
+## Termination
+
+If you use the software in violation of these terms, such use is not licensed,
+and your licenses will automatically terminate. If the licensor provides you
+with a notice of your violation, and you cease all violation of this license no
+later than 30 days after you receive that notice, your licenses will be
+reinstated retroactively. However, if you violate these terms after such
+reinstatement, any additional violation of these terms will cause your licenses
+to terminate automatically and permanently.
+
+## No Liability
+
+*As far as the law allows, the software comes as is, without any warranty or
+condition, and the licensor will not be liable to you for any damages arising
+out of these terms or the use or nature of the software, under any kind of
+legal claim.*
+
+## Definitions
+
+The **licensor** is the entity offering these terms, and the **software** is the
+software the licensor makes available under these terms, including any portion
+of it.
+
+**you** refers to the individual or entity agreeing to these terms.
+
+**your company** is any legal entity, sole proprietorship, or other kind of
+organization that you work for, plus all organizations that have control over,
+are under the control of, or are under common control with that
+organization. **control** means ownership of substantially all the assets of an
+entity, or the power to direct its management and policies by vote, contract, or
+otherwise. Control can be direct or indirect.
+
+**your licenses** are all the licenses granted to you for the software under
+these terms.
+
+**use** means anything you do with the software requiring one of your licenses.
+
+**trademark** means trademarks, service marks, and similar rights.
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..ec07a0d33
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+# Cogstack NLP
+
+[![Build Status](https://github.com/CogStack/cogstack-nlp/actions/workflows/medcat-v2-main.yml/badge.svg?branch=main)](https://github.com/CogStack/MedCAT2/actions/workflows/main.yml?query=branch%3main)
+[![Documentation Status](https://readthedocs.org/projects/medcat2/badge/?version=latest)](https://medcat2.readthedocs.io/en/latest/?badge=latest)
+[![Latest release](https://img.shields.io/github/v/release/CogStack/MedCAT2)](https://github.com/CogStack/MedCAT2/releases/latest)
+
+Cogstack Natural Language Processing is for analysing clinical data using AI to draw insights from text in or documents in an Electronic Health Records.
+
+
+**Official Docs [here](https://medcat2.readthedocs.io/en/latest/)**
+**Discussion Forum [discourse](https://discourse.cogstack.org/)**
+