diff --git a/documentation/classDiagram.puml b/documentation/classDiagram.puml
index b7b0ff6..46e7b66 100644
--- a/documentation/classDiagram.puml
+++ b/documentation/classDiagram.puml
@@ -12,21 +12,16 @@ class Match {
     Match constructor(tournament_id: Integer, team_ids: Integer[])
     void setScore(team_id: Integer, score: Integer)
     void setWinner(winner_id: Integer)
-    Integer getWinner()
 }
 class Team {
     *team_id: Integer
     name: String
     tournament_ids: Integer[]
-    player_ids: Integer[]
-    match_ids: Integer[]
 
     Team constructor(name: String)
     void joinTournament(tournament_id: Integer)
     void addPlayer(player_id: Integer)
-    void addMatch(match_id: Integer)
     void removePlayer(player_id: Integer)
-    void removeMatch(match_id: Integer)
     void leaveTournament(tournament_id: Integer)
 }
 class Player {
@@ -45,6 +40,7 @@ class Tournament {
     name: String
     start_date: Date
     end_date: Date
+    manager_ids: Integer[]
     team_ids: Integer[]
 
     Tournament constructor(name: String, start_date: Date, end_date: Date)
@@ -53,10 +49,10 @@ class Tournament {
 }
 
 
-Tournament "1" --> "2..*" Team : contains
-Tournament "1" --> "*" Match : contains
-Player "1..*" --> "1" Team : belongsTo
-Match "*" ---> "2" Team : contains
+Team "2..*" -- "1..*" Tournament : "Plays in"
+Tournament "1" -- "1..*" Match : contains
+Player "1..*" -- "1..1" Team : "Belongs to"
+Team "2..2" -- "1..*" Match : "Competes in"
 
 
 @enduml
\ No newline at end of file
diff --git a/src/server/.gitignore b/src/server/.gitignore
new file mode 100644
index 0000000..c6bba59
--- /dev/null
+++ b/src/server/.gitignore
@@ -0,0 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
diff --git a/src/server/package-lock.json b/src/server/package-lock.json
new file mode 100644
index 0000000..983a3af
--- /dev/null
+++ b/src/server/package-lock.json
@@ -0,0 +1,13 @@
+{
+  "name": "tournament-server",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "tournament-server",
+      "version": "1.0.0",
+      "license": "ISC"
+    }
+  }
+}
diff --git a/src/server/package.json b/src/server/package.json
new file mode 100644
index 0000000..846289f
--- /dev/null
+++ b/src/server/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "tournament-server",
+  "version": "1.0.0",
+  "description": "DCST1008 Project - Asura Tournament Management System",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "felixalb, kristoju, jonajha, krisleri",
+  "license": "ISC"
+}